Merge tag 'for-f2fs-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

Pull f2fs updates from Jaegeuk Kim:
 "New features:
   - in-memory extent_cache
   - fs_shutdown to test power-off-recovery
   - use inline_data to store symlink path
   - show f2fs as a non-misc filesystem

  Major fixes:
   - avoid CPU stalls on sync_dirty_dir_inodes
   - fix some power-off-recovery procedure
   - fix handling of broken symlink correctly
   - fix missing dot and dotdot made by sudden power cuts
   - handle wrong data index during roll-forward recovery
   - preallocate data blocks for direct_io

  ... and a bunch of minor bug fixes and cleanups"

* tag 'for-f2fs-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (71 commits)
  f2fs: pass checkpoint reason on roll-forward recovery
  f2fs: avoid abnormal behavior on broken symlink
  f2fs: flush symlink path to avoid broken symlink after POR
  f2fs: change 0 to false for bool type
  f2fs: do not recover wrong data index
  f2fs: do not increase link count during recovery
  f2fs: assign parent's i_mode for empty dir
  f2fs: add F2FS_INLINE_DOTS to recover missing dot dentries
  f2fs: fix mismatching lock and unlock pages for roll-forward recovery
  f2fs: fix sparse warnings
  f2fs: limit b_size of mapped bh in f2fs_map_bh
  f2fs: persist system.advise into on-disk inode
  f2fs: avoid NULL pointer dereference in f2fs_xattr_advise_get
  f2fs: preallocate fallocated blocks for direct IO
  f2fs: enable inline data by default
  f2fs: preserve extent info for extent cache
  f2fs: initialize extent tree with on-disk extent info of inode
  f2fs: introduce __{find,grab}_extent_tree
  f2fs: split set_data_blkaddr from f2fs_update_extent_cache
  f2fs: enable fast symlink by utilizing inline data
  ...

1 files changed, 161 insertions, 1 deletions

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 36f4536b6149..e202dec22e1d 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -44,7 +44,11 @@ TRACE_DEFINE_ENUM(CP_DISCARD);
                 { NODE,         "NODE" },                               \
                 { DATA,         "DATA" },                               \
                 { META,         "META" },                               \
-                { META_FLUSH,   "META_FLUSH" })
+                { META_FLUSH,   "META_FLUSH" },                         \
+                { INMEM,        "INMEM" },                              \
+                { INMEM_DROP,   "INMEM_DROP" },                         \
+                { IPU,          "IN-PLACE" },                           \
+                { OPU,          "OUT-OF-PLACE" })
 
 #define F2FS_BIO_MASK(t)        (t & (READA | WRITE_FLUSH_FUA))
 #define F2FS_BIO_EXTRA_MASK(t)  (t & (REQ_META | REQ_PRIO))
@@ -104,6 +108,7 @@ TRACE_DEFINE_ENUM(CP_DISCARD);
                 { CP_UMOUNT,    "Umount" },                             \
                 { CP_FASTBOOT,  "Fastboot" },                           \
                 { CP_SYNC,      "Sync" },                               \
+                { CP_RECOVERY,  "Recovery" },                           \
                 { CP_DISCARD,   "Discard" })
 
 struct victim_sel_policy;
@@ -884,6 +889,13 @@ DEFINE_EVENT(f2fs__page, f2fs_writepage,
         TP_ARGS(page, type)
 );
 
+DEFINE_EVENT(f2fs__page, f2fs_do_write_data_page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
 DEFINE_EVENT(f2fs__page, f2fs_readpage,
 
         TP_PROTO(struct page *page, int type),
@@ -905,6 +917,20 @@ DEFINE_EVENT(f2fs__page, f2fs_vm_page_mkwrite,
         TP_ARGS(page, type)
 );
 
+DEFINE_EVENT(f2fs__page, f2fs_register_inmem_page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_commit_inmem_page,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
 TRACE_EVENT(f2fs_writepages,
 
         TP_PROTO(struct inode *inode, struct writeback_control *wbc, int type),
@@ -1041,6 +1067,140 @@ TRACE_EVENT(f2fs_issue_flush,
                 __entry->nobarrier ? "skip (nobarrier)" : "issue",
                 __entry->flush_merge ? " with flush_merge" : "")
 );
+
+TRACE_EVENT(f2fs_lookup_extent_tree_start,
+
+        TP_PROTO(struct inode *inode, unsigned int pgofs),
+
+        TP_ARGS(inode, pgofs),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, pgofs)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->pgofs = pgofs;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u",
+                show_dev_ino(__entry),
+                __entry->pgofs)
+);
+
+TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end,
+
+        TP_PROTO(struct inode *inode, unsigned int pgofs,
+                                                struct extent_node *en),
+
+        TP_ARGS(inode, pgofs, en),
+
+        TP_CONDITION(en),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, pgofs)
+                __field(unsigned int, fofs)
+                __field(u32, blk)
+                __field(unsigned int, len)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->pgofs = pgofs;
+                __entry->fofs = en->ei.fofs;
+                __entry->blk = en->ei.blk;
+                __entry->len = en->ei.len;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+                "ext_info(fofs: %u, blk: %u, len: %u)",
+                show_dev_ino(__entry),
+                __entry->pgofs,
+                __entry->fofs,
+                __entry->blk,
+                __entry->len)
+);
+
+TRACE_EVENT(f2fs_update_extent_tree,
+
+        TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr),
+
+        TP_ARGS(inode, pgofs, blkaddr),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, pgofs)
+                __field(u32, blk)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->pgofs = pgofs;
+                __entry->blk = blkaddr;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, blkaddr = %u",
+                show_dev_ino(__entry),
+                __entry->pgofs,
+                __entry->blk)
+);
+
+TRACE_EVENT(f2fs_shrink_extent_tree,
+
+        TP_PROTO(struct f2fs_sb_info *sbi, unsigned int node_cnt,
+                                                unsigned int tree_cnt),
+
+        TP_ARGS(sbi, node_cnt, tree_cnt),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(unsigned int, node_cnt)
+                __field(unsigned int, tree_cnt)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = sbi->sb->s_dev;
+                __entry->node_cnt = node_cnt;
+                __entry->tree_cnt = tree_cnt;
+        ),
+
+        TP_printk("dev = (%d,%d), shrunk: node_cnt = %u, tree_cnt = %u",
+                show_dev(__entry),
+                __entry->node_cnt,
+                __entry->tree_cnt)
+);
+
+TRACE_EVENT(f2fs_destroy_extent_tree,
+
+        TP_PROTO(struct inode *inode, unsigned int node_cnt),
+
+        TP_ARGS(inode, node_cnt),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(unsigned int, node_cnt)
+        ),
+
+        TP_fast_assign(
+                __entry->dev = inode->i_sb->s_dev;
+                __entry->ino = inode->i_ino;
+                __entry->node_cnt = node_cnt;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, destroyed: node_cnt = %u",
+                show_dev_ino(__entry),
+                __entry->node_cnt)
+);
+
 #endif /* _TRACE_F2FS_H */
 
  /* This part must be outside protection */