diff options
author | Jaegeuk Kim <jaegeuk@google.com> | 2017-09-23 17:02:18 +0800 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 13:15:43 +0530 |
commit | 6522a6d452ae79d0b33a0e1c043dd5efd9aae120 (patch) | |
tree | 896f7a82cf00cbd5e47ce7cd8006401b094782a9 /include/trace | |
parent | 21622997771a8a48482fdb35cb59c4c7df8e2710 (diff) |
f2fs: updates on 4.15-rc1
Pull f2fs updates from Jaegeuk Kim:
"In this round, we introduce sysfile-based quota support which is
required for Android by default. In addition, we allow that users are
able to reserve some blocks in runtime to mitigate performance drops
in low free space.
Enhancements:
- assign proper data segments according to write_hints given by user
- issue cache_flush on dirty devices only among multiple devices
- exploit cp_error flag and add more faults to enhance fault
injection test
- conduct more readaheads during f2fs_readdir
- add a range for discard commands
Bug fixes:
- fix zero stat->st_blocks when inline_data is set
- drop crypto key and free stale memory pointer while evict_inode is
failing
- fix some corner cases in free space and segment management
- fix wrong last_disk_size
This series includes lots of clean-ups and code enhancement in terms
of xattr operations, discard/flush command control. In addition, it
adds versatile debugfs entries to monitor f2fs status"
Cherry-picked from origin/upstream-f2fs-stable-linux-4.4.y:
56a07b070510 f2fs: deny accessing encryption policy if encryption is off
c394842e26e5 f2fs: inject fault in inc_valid_node_count
926292251022 f2fs: fix to clear FI_NO_PREALLOC
e6cfc5de2d05 f2fs: expose quota information in debugfs
c4cd2efe835b f2fs: separate nat entry mem alloc from nat_tree_lock
48c72b4c8c50 f2fs: validate before set/clear free nat bitmap
baf9275a4bbd f2fs: avoid opened loop codes in __add_ino_entry
47af6c72d944 f2fs: apply write hints to select the type of segments for buffered write
ac9819160586 f2fs: introduce scan_curseg_cache for cleanup
ca28e9670e80 f2fs: optimize the way of traversing free_nid_bitmap
460688b59e8b f2fs: keep scanning until enough free nids are acquired
0186182c0c4d f2fs: trace checkpoint reason in fsync()
5d4b6efcfd09 f2fs: keep isize once block is reserved cross EOF
3c8f767e1374 f2fs: avoid race in between GC and block exchange
4423778adf0e f2fs: save a multiplication for last_nid calculation
3e3b40557525 f2fs: fix summary info corruption
44889e487981 f2fs: remove dead code in update_meta_page
55c7b9595bb9 f2fs: remove unneeded semicolon
8b92814117d5 f2fs: don't bother with inode->i_version
42c7c71824fc f2fs: check curseg space before foreground GC
c5470498e59b f2fs: use rw_semaphore to protect SIT cache
82750d346ab7 f2fs: support quota sys files
26dfec49b25a f2fs: add quota_ino feature infra
ddb8e2ae9811 f2fs: optimize __update_nat_bits
f46ae958c701 f2fs: modify for accurate fggc node io stat
c713fdb5a23c Revert "f2fs: handle dirty segments inside refresh_sit_entry"
873ec505cb07 f2fs: add a function to move nid
ae66786296b4 f2fs: export SSR allocation threshold
90c28a18d2a4 f2fs: give correct trimmed blocks in fstrim
5612922fb0ac f2fs: support bio allocation error injection
583b7a274c27 f2fs: support get_page error injection
09a073cc8c56 f2fs: add missing sysfs description
e945474a9c1b f2fs: support soft block reservation
b7b2e629b6f6 f2fs: handle error case when adding xattr entry
7368e30495c5 f2fs: support flexible inline xattr size
ada4061e191b f2fs: show current cp state
5b8ff1301a61 f2fs: add missing quota_initialize
46d4a691f035 f2fs: show # of dirty segments via sysfs
fc13f9d7ce1e f2fs: stop all the operations by cp_error flag
91bea0c391b3 f2fs: remove several redundant assignments
807486c79534 f2fs: avoid using timespec
03b1cb0bb4a2 f2fs: fix to correct no_fggc_candidate
5c15033ceaea Revert "f2fs: return wrong error number on f2fs_quota_write"
5f5f59322240 f2fs: remove obsolete pointer for truncate_xattr_node
032a6906825a f2fs: retry ENOMEM for quota_read|write
171b638fc49b f2fs: limit # of inmemory pages
83ed7a615f0a f2fs: update ctx->pos correctly when hitting hole in directory
4d6e68be2534 f2fs: relocate readahead codes in readdir()
c8be47b54018 f2fs: allow readdir() to be interrupted
2b903fe94cd0 f2fs: trace f2fs_readdir
bb0db666d4bc f2fs: trace f2fs_lookup
40d6250f046a f2fs: skip searching non-exist range in truncate_hole
8e84f379df61 f2fs: expose some sectors to user in inline data or dentry case
cb98f70dea02 f2fs: avoid stale fi->gdirty_list pointer
5562a3c53963 f2fs/crypto: drop crypto key at evict_inode only
85853e7e38d7 f2fs: fix to avoid race when accessing last_disk_size
0c47a892d555 f2fs: Fix bool initialization/comparison
68e801abc520 f2fs: give up CP_TRIMMED_FLAG if it drops discards
df74eacb2075 f2fs: trace f2fs_remove_discard
bd502c6e3e7a f2fs: reduce cmd_lock coverage in __issue_discard_cmd
a34ab5ca4f94 f2fs: split discard policy
1e65afd14d32 f2fs: wrap discard policy
684447dad138 f2fs: support issuing/waiting discard in range
27eaad09380f f2fs: fix to flush multiple device in checkpoint
08bb9d68d51b f2fs: enhance multiple device flush
9c2526ac2ecb f2fs: fix to show ino management cache size correctly
814b463d262f f2fs: drop FI_UPDATE_WRITE tag after f2fs_issue_flush
f555b0a117d3 f2fs: obsolete ALLOC_NID_LIST list
75d3164ae128 f2fs: convert inline data for direct I/O & FI_NO_PREALLOC
4de0ceb6b7ef f2fs: allow readpages with NULL file pointer
322a45d17212 f2fs: show flush list status in sysfs
6d625a93b4a8 f2fs: introduce read_xattr_block
8ea6e1c327c5 f2fs: introduce read_inline_xattr
dbce11e9ee5b Revert "f2fs: reuse nids more aggressively"
131bc9f6b7f9 Revert "f2fs: node segment is prior to data segment selected victim"
Change-Id: I93b9cd867b859a667a448b39299ff44a2b841b8c
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/f2fs.h | 116 |
1 files changed, 110 insertions, 6 deletions
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 7063bbcca03b..589df6f73789 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -128,6 +128,18 @@ TRACE_DEFINE_ENUM(CP_TRIMMED); { CP_DISCARD, "Discard" }, \ { CP_UMOUNT | CP_TRIMMED, "Umount,Trimmed" }) +#define show_fsync_cpreason(type) \ + __print_symbolic(type, \ + { CP_NO_NEEDED, "no needed" }, \ + { CP_NON_REGULAR, "non regular" }, \ + { CP_HARDLINK, "hardlink" }, \ + { CP_SB_NEED_CP, "sb needs cp" }, \ + { CP_WRONG_PINO, "wrong pino" }, \ + { CP_NO_SPC_ROLL, "no space roll forward" }, \ + { CP_NODE_NEED_CP, "node needs cp" }, \ + { CP_FASTBOOT_MODE, "fastboot mode" }, \ + { CP_SPEC_LOG_NUM, "log type is 2" }) + struct victim_sel_policy; struct f2fs_map_blocks; @@ -202,14 +214,14 @@ DEFINE_EVENT(f2fs__inode, f2fs_sync_file_enter, TRACE_EVENT(f2fs_sync_file_exit, - TP_PROTO(struct inode *inode, int need_cp, int datasync, int ret), + TP_PROTO(struct inode *inode, int cp_reason, int datasync, int ret), - TP_ARGS(inode, need_cp, datasync, ret), + TP_ARGS(inode, cp_reason, datasync, ret), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) - __field(int, need_cp) + __field(int, cp_reason) __field(int, datasync) __field(int, ret) ), @@ -217,15 +229,15 @@ TRACE_EVENT(f2fs_sync_file_exit, TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; - __entry->need_cp = need_cp; + __entry->cp_reason = cp_reason; __entry->datasync = datasync; __entry->ret = ret; ), - TP_printk("dev = (%d,%d), ino = %lu, checkpoint is %s, " + TP_printk("dev = (%d,%d), ino = %lu, cp_reason: %s, " "datasync = %d, ret = %d", show_dev_ino(__entry), - __entry->need_cp ? "needed" : "not needed", + show_fsync_cpreason(__entry->cp_reason), __entry->datasync, __entry->ret) ); @@ -716,6 +728,91 @@ TRACE_EVENT(f2fs_get_victim, __entry->free) ); +TRACE_EVENT(f2fs_lookup_start, + + TP_PROTO(struct inode *dir, struct dentry *dentry, unsigned int flags), + + TP_ARGS(dir, dentry, flags), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(const char *, name) + __field(unsigned int, flags) + ), + + TP_fast_assign( + __entry->dev = dir->i_sb->s_dev; + __entry->ino = dir->i_ino; + __entry->name = dentry->d_name.name; + __entry->flags = flags; + ), + + TP_printk("dev = (%d,%d), pino = %lu, name:%s, flags:%u", + show_dev_ino(__entry), + __entry->name, + __entry->flags) +); + +TRACE_EVENT(f2fs_lookup_end, + + TP_PROTO(struct inode *dir, struct dentry *dentry, nid_t ino, + int err), + + TP_ARGS(dir, dentry, ino, err), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(const char *, name) + __field(nid_t, cino) + __field(int, err) + ), + + TP_fast_assign( + __entry->dev = dir->i_sb->s_dev; + __entry->ino = dir->i_ino; + __entry->name = dentry->d_name.name; + __entry->cino = ino; + __entry->err = err; + ), + + TP_printk("dev = (%d,%d), pino = %lu, name:%s, ino:%u, err:%d", + show_dev_ino(__entry), + __entry->name, + __entry->cino, + __entry->err) +); + +TRACE_EVENT(f2fs_readdir, + + TP_PROTO(struct inode *dir, loff_t start_pos, loff_t end_pos, int err), + + TP_ARGS(dir, start_pos, end_pos, err), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(loff_t, start) + __field(loff_t, end) + __field(int, err) + ), + + TP_fast_assign( + __entry->dev = dir->i_sb->s_dev; + __entry->ino = dir->i_ino; + __entry->start = start_pos; + __entry->end = end_pos; + __entry->err = err; + ), + + TP_printk("dev = (%d,%d), ino = %lu, start_pos:%llu, end_pos:%llu, err:%d", + show_dev_ino(__entry), + __entry->start, + __entry->end, + __entry->err) +); + TRACE_EVENT(f2fs_fallocate, TP_PROTO(struct inode *inode, int mode, @@ -1274,6 +1371,13 @@ DEFINE_EVENT(f2fs_discard, f2fs_issue_discard, TP_ARGS(dev, blkstart, blklen) ); +DEFINE_EVENT(f2fs_discard, f2fs_remove_discard, + + TP_PROTO(struct block_device *dev, block_t blkstart, block_t blklen), + + TP_ARGS(dev, blkstart, blklen) +); + TRACE_EVENT(f2fs_issue_reset_zone, TP_PROTO(struct block_device *dev, block_t blkstart), |