nfsd: Add I/O trace points in the NFSv4 read proc

NFSv4 read compound processing invokes nfsd_splice_read and
nfs_readv directly, so the trace points currently in nfsd_read are
not invoked for NFSv4 reads.

Move the NFSD READ trace points to common helpers so that NFSv4
reads are captured.

Also, record any local I/O error that occurs, the total count of
bytes that were actually returned, and whether splice or vectored
read was used.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index b773b314f599..250e0c550fd8 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -751,6 +751,9 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         if (read->rd_offset >= OFFSET_MAX)
                 return nfserr_inval;
 
+        trace_nfsd_read_start(rqstp, &cstate->current_fh,
+                              read->rd_offset, read->rd_length);
+
         /*
          * If we do a zero copy read, then a client will see read data
          * that reflects the state of the file *after* performing the
@@ -783,6 +786,8 @@ nfsd4_read_release(union nfsd4_op_u *u)
 {
         if (u->read.rd_filp)
                 fput(u->read.rd_filp);
+        trace_nfsd_read_done(u->read.rd_rqstp, u->read.rd_fhp,
+                             u->read.rd_offset, u->read.rd_length);
 }
 
 static __be32