nfs: add tracepoints to nfs_file_read() and nfs_file_write()

Add some tracepoints to the I/O submission codepaths.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 8059ece82468d0ccb1dfb6562d7b57bc5e1a4bc5..d06603ed52ece4173b17cd26ac2b1a1f58818f9d 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -161,6 +161,8 @@ nfs_file_read(struct kiocb *iocb, struct iov_iter *to)
        struct inode *inode = file_inode(iocb->ki_filp);
        ssize_t result;
 
+       trace_nfs_file_read(iocb, to);
+
        if (iocb->ki_flags & IOCB_DIRECT)
                return nfs_file_direct_read(iocb, to, false);
 
@@ -690,6 +692,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
        errseq_t since;
        int error;
 
+       trace_nfs_file_write(iocb, from);
+
        result = nfs_key_timeout_notify(file, inode);
        if (result)
                return result;

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 627115179795fc4eb8e9807bbaca0232ca4a3b36..5adc2edce1350c38c3455a9a3f818ba48361c15f 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -1051,6 +1051,58 @@ DEFINE_NFS_FOLIO_EVENT_DONE(nfs_writeback_folio_done);
 DEFINE_NFS_FOLIO_EVENT(nfs_invalidate_folio);
 DEFINE_NFS_FOLIO_EVENT_DONE(nfs_launder_folio_done);
 
+DECLARE_EVENT_CLASS(nfs_kiocb_event,
+               TP_PROTO(
+                       const struct kiocb *iocb,
+                       const struct iov_iter *iter
+               ),
+
+               TP_ARGS(iocb, iter),
+
+               TP_STRUCT__entry(
+                       __field(dev_t, dev)
+                       __field(u32, fhandle)
+                       __field(u64, fileid)
+                       __field(u64, version)
+                       __field(loff_t, offset)
+                       __field(size_t, count)
+                       __field(int, flags)
+               ),
+
+               TP_fast_assign(
+                       const struct inode *inode = file_inode(iocb->ki_filp);
+                       const struct nfs_inode *nfsi = NFS_I(inode);
+
+                       __entry->dev = inode->i_sb->s_dev;
+                       __entry->fileid = nfsi->fileid;
+                       __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
+                       __entry->version = inode_peek_iversion_raw(inode);
+                       __entry->offset = iocb->ki_pos;
+                       __entry->count = iov_iter_count(iter);
+                       __entry->flags = iocb->ki_flags;
+               ),
+
+               TP_printk(
+                       "fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu offset=%lld count=%zu ki_flags=%s",
+                       MAJOR(__entry->dev), MINOR(__entry->dev),
+                       (unsigned long long)__entry->fileid,
+                       __entry->fhandle, __entry->version,
+                       __entry->offset, __entry->count,
+                       __print_flags(__entry->flags, "|", TRACE_IOCB_STRINGS)
+               )
+);
+
+#define DEFINE_NFS_KIOCB_EVENT(name) \
+       DEFINE_EVENT(nfs_kiocb_event, name, \
+                       TP_PROTO( \
+                               const struct kiocb *iocb, \
+                               const struct iov_iter *iter \
+                       ), \
+                       TP_ARGS(iocb, iter))
+
+DEFINE_NFS_KIOCB_EVENT(nfs_file_read);
+DEFINE_NFS_KIOCB_EVENT(nfs_file_write);
+
 TRACE_EVENT(nfs_aop_readahead,
                TP_PROTO(
                        const struct inode *inode,