pNFS: Add prepare commit trace to block/scsi layout

Replace dprintk with trace event in ext_tree_prepare_commit() function.

Co-developed-by: Konstantin Evtushenko <koevtushenko@yandex.com>
Signed-off-by: Konstantin Evtushenko <koevtushenko@yandex.com>
Signed-off-by: Sergey Bashirov <sergeybashirov@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20250630183537.196479-4-sergeybashirov@gmail.com
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c
index faccd5caa1492f65d6b9556bf79dad56b6bcbea9..315949a7e92deab5d5c7c44cc860b6ed709e40d6 100644 (file)
--- a/fs/nfs/blocklayout/extent_tree.c
+++ b/fs/nfs/blocklayout/extent_tree.c
@@ -6,6 +6,7 @@
 #include <linux/vmalloc.h>
 
 #include "blocklayout.h"
+#include "../nfs4trace.h"
 
 #define NFSDBG_FACILITY                NFSDBG_PNFS_LD
 
@@ -637,8 +638,6 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)
        __be32 *start_p;
        int ret;
 
-       dprintk("%s enter\n", __func__);
-
        arg->layoutupdate_page = alloc_page(GFP_NOFS);
        if (!arg->layoutupdate_page)
                return -ENOMEM;
@@ -685,7 +684,8 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg)
                }
        }
 
-       dprintk("%s found %zu ranges\n", __func__, count);
+       trace_bl_ext_tree_prepare_commit(ret, count,
+                       arg->lastbytewritten, !!ret);
        return ret;
 }
 

diff --git a/fs/nfs/nfs4trace.c b/fs/nfs/nfs4trace.c
index 436763a559cd964c7d3e34b49c414467e5d838e0..987c92d6364bb5c9921445e779a82181d7f06c5e 100644 (file)
--- a/fs/nfs/nfs4trace.c
+++ b/fs/nfs/nfs4trace.c
@@ -32,6 +32,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(ff_layout_read_error);
 EXPORT_TRACEPOINT_SYMBOL_GPL(ff_layout_write_error);
 EXPORT_TRACEPOINT_SYMBOL_GPL(ff_layout_commit_error);
 
+EXPORT_TRACEPOINT_SYMBOL_GPL(bl_ext_tree_prepare_commit);
 EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_reg);
 EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_reg_err);
 EXPORT_TRACEPOINT_SYMBOL_GPL(bl_pr_key_unreg);

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index fe419147f60f1b5a5ac3c24f0532eb24a801ee9f..9776d220cec33f7e30679504d576c51bca41cde4 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -2295,6 +2295,40 @@ TRACE_EVENT(ff_layout_commit_error,
                )
 );
 
+TRACE_EVENT(bl_ext_tree_prepare_commit,
+               TP_PROTO(
+                       int ret,
+                       size_t count,
+                       u64 lwb,
+                       bool not_all_ranges
+               ),
+
+               TP_ARGS(ret, count, lwb, not_all_ranges),
+
+               TP_STRUCT__entry(
+                       __field(int, ret)
+                       __field(size_t, count)
+                       __field(u64, lwb)
+                       __field(bool, not_all_ranges)
+               ),
+
+               TP_fast_assign(
+                       __entry->ret = ret;
+                       __entry->count = count;
+                       __entry->lwb = lwb;
+                       __entry->not_all_ranges = not_all_ranges;
+               ),
+
+               TP_printk(
+                       "ret=%d, found %zu ranges, lwb=%llu%s",
+                       __entry->ret,
+                       __entry->count,
+                       __entry->lwb,
+                       __entry->not_all_ranges ? ", not all ranges encoded" :
+                                                 ""
+               )
+);
+
 DECLARE_EVENT_CLASS(pnfs_bl_pr_key_class,
        TP_PROTO(
                const struct block_device *bdev,