Use f2fs_{down,up}_read_trace for node_write to trace lock elapsed time.
Signed-off-by: Chao Yu <[email protected]>
---
fs/f2fs/compress.c | 6 +++---
fs/f2fs/data.c | 6 ++++--
fs/f2fs/f2fs.h | 1 +
fs/f2fs/node.c | 9 +++++----
fs/f2fs/super.c | 2 +-
include/trace/events/f2fs.h | 3 ++-
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 3155d30b2448..316bc3e6d2d4 100644
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1309,7 +1309,7 @@ static int f2fs_write_compressed_pages(struct
compress_ctx *cc,
* checkpoint. This can only happen to quota writes which can
cause
* the below discard race condition.
*/
- f2fs_down_read(&sbi->node_write);
+ f2fs_down_read_trace(&sbi->node_write, &lc);
} else if (!f2fs_trylock_op(sbi, &lc)) {
goto out_free;
}
@@ -1434,7 +1434,7 @@ static int f2fs_write_compressed_pages(struct
compress_ctx *cc,
f2fs_put_dnode(&dn);
if (quota_inode)
- f2fs_up_read(&sbi->node_write);
+ f2fs_up_read_trace(&sbi->node_write, &lc);
else
f2fs_unlock_op(sbi, &lc);
@@ -1463,7 +1463,7 @@ static int f2fs_write_compressed_pages(struct
compress_ctx *cc,
f2fs_put_dnode(&dn);
out_unlock_op:
if (quota_inode)
- f2fs_up_read(&sbi->node_write);
+ f2fs_up_read_trace(&sbi->node_write, &lc);
else
f2fs_unlock_op(sbi, &lc);
out_free:
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5469547142e7..79455d7acba5 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3064,19 +3064,21 @@ int f2fs_write_single_data_page(struct folio *folio,
int *submitted,
write:
/* Dentry/quota blocks are controlled by checkpoint */
if (S_ISDIR(inode->i_mode) || quota_inode) {
+ struct f2fs_lock_context lc;
+
/*
* We need to wait for node_write to avoid block allocation
during
* checkpoint. This can only happen to quota writes which can
cause
* the below discard race condition.
*/
if (quota_inode)
- f2fs_down_read(&sbi->node_write);
+ f2fs_down_read_trace(&sbi->node_write, &lc);
fio.need_lock = LOCK_DONE;
err = f2fs_do_write_data_page(&fio);
if (quota_inode)
- f2fs_up_read(&sbi->node_write);
+ f2fs_up_read_trace(&sbi->node_write, &lc);
goto done;
}
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 972cff745e63..3f6278ba620d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -177,6 +177,7 @@ enum f2fs_lock_name {
LOCK_NAME_NONE,
LOCK_NAME_CP_RWSEM,
LOCK_NAME_NODE_CHANGE,
+ LOCK_NAME_NODE_WRITE,
};
/*
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index ecba9b0836eb..99e425e8c00a 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1738,6 +1738,7 @@ static bool __write_node_folio(struct folio *folio, bool
atomic, bool *submitted
.io_type = io_type,
.io_wbc = wbc,
};
+ struct f2fs_lock_context lc;
unsigned int seq;
trace_f2fs_writepage(folio, NODE);
@@ -1767,13 +1768,13 @@ static bool __write_node_folio(struct folio *folio,
bool atomic, bool *submitted
if (f2fs_get_node_info(sbi, nid, &ni, !do_balance))
goto redirty_out;
- f2fs_down_read(&sbi->node_write);
+ f2fs_down_read_trace(&sbi->node_write, &lc);
/* This page is already truncated */
if (unlikely(ni.blk_addr == NULL_ADDR)) {
folio_clear_uptodate(folio);
dec_page_count(sbi, F2FS_DIRTY_NODES);
- f2fs_up_read(&sbi->node_write);
+ f2fs_up_read_trace(&sbi->node_write, &lc);
folio_unlock(folio);
return true;
}
@@ -1781,7 +1782,7 @@ static bool __write_node_folio(struct folio *folio, bool
atomic, bool *submitted
if (__is_valid_data_blkaddr(ni.blk_addr) &&
!f2fs_is_valid_blkaddr(sbi, ni.blk_addr,
DATA_GENERIC_ENHANCE)) {
- f2fs_up_read(&sbi->node_write);
+ f2fs_up_read_trace(&sbi->node_write, &lc);
goto redirty_out;
}
@@ -1806,7 +1807,7 @@ static bool __write_node_folio(struct folio *folio, bool
atomic, bool *submitted
f2fs_do_write_node_page(nid, &fio);
set_node_addr(sbi, &ni, fio.new_blkaddr, is_fsync_dnode(folio));
dec_page_count(sbi, F2FS_DIRTY_NODES);
- f2fs_up_read(&sbi->node_write);
+ f2fs_up_read_trace(&sbi->node_write, &lc);
folio_unlock(folio);
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 0d406fc8bc22..d8e5e8652d97 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4896,7 +4896,7 @@ static int f2fs_fill_super(struct super_block *sb, struct
fs_context *fc)
init_f2fs_rwsem(&sbi->gc_lock);
mutex_init(&sbi->writepages);
init_f2fs_rwsem(&sbi->cp_global_sem);
- init_f2fs_rwsem(&sbi->node_write);
+ init_f2fs_rwsem_trace(&sbi->node_write, sbi, LOCK_NAME_NODE_WRITE);
init_f2fs_rwsem_trace(&sbi->node_change, sbi, LOCK_NAME_NODE_CHANGE);
spin_lock_init(&sbi->stat_lock);
init_f2fs_rwsem_trace(&sbi->cp_rwsem, sbi, LOCK_NAME_CP_RWSEM);
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index d472f47eedec..e5cfb8ad0d5e 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -187,7 +187,8 @@ TRACE_DEFINE_ENUM(CP_PHASE_FINISH_CHECKPOINT);
#define show_lock_name(lock) \
__print_symbolic(lock, \
{ LOCK_NAME_CP_RWSEM, "cp_rwsem" }, \
- { LOCK_NAME_NODE_CHANGE, "node_change" })
+ { LOCK_NAME_NODE_CHANGE, "node_change" }, \
+ { LOCK_NAME_NODE_WRITE, "node_write" })
struct f2fs_sb_info;
struct f2fs_io_info;
--
2.49.0
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
