Adding stateid information to tracepoints
Subsystems (2)
PATCH 1/1 Adding stateid information to tracepoints
Operations to which stateid information is added:
close, delegreturn, open, read, setattr, layoutget, layoutcommit, test_stateid, write, lock, locku, lockt
Format is "stateid=<seqid>:<crc32 hash stateid.other>", also "openstateid=", "layoutstateid=", and "lockstateid=" for open_file, layoutget, set_lock tracepoints.
New function is added to internal.h, nfs_stateid_hash(), to compute the hash
trace_nfs4_setattr() is moved from nfs4_do_setattr() to _nfs4_do_setattr() to get access to stateid.
trace_nfs4_setattr and trace_nfs4_delegreturn are changed from INODE_EVENT to new event type, INODE_STATEID_EVENT which is same as INODE_EVENT but adds stateid information
for locking tracepoints, moved trace_nfs4_set_lock() into _nfs4_do_setlk() to get access to stateid information, and removed trace_nfs4_lock_reclaim(), trace_nfs4_lock_expired() as they call into _nfs4_do_setlk() and both were previously same LOCK_EVENT type.
--- fs/nfs/internal.h | 9 ++ fs/nfs/nfs4proc.c | 13 ++- fs/nfs/nfs4trace.h | 255 +++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 245 insertions(+), 32 deletions(-)
fs/nfs/internal.h +9 -0
@@ -696,9 +696,18 @@ static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh) {return ~crc32_le (0xFFFFFFFF , &fh->data[0 ], fh->size); } +static inline u32 nfs_stateid_hash (const nfs4_stateid *stateid) +{ +return ~crc32_le (0xFFFFFFFF , &stateid->other[0 ], +NFS4_STATEID_OTHER_SIZE ); +}#else static inline u32 nfs_fhandle_hash (const struct nfs_fh *fh) {return 0 ; } +static inline u32 nfs_stateid_hash (nfs4_stateid *stateid) +{ +return 0 ; +}#endif
fs/nfs/nfs4proc.c +6 -7
@@ -2703,6 +2703,7 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, status =nfs4_call_sync (server->client, server, &msg, &arg.seq_args, &res.seq_res,1 );if (status ==0 && state !=NULL )renew_lease (server, timestamp); +trace_nfs4_setattr (inode, &arg.stateid, status);return status; }
@@ -2719,7 +2720,6 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,int err; do { err = _nfs4_do_setattr(inode, cred, fattr, sattr, state, ilabel, olabel); - trace_nfs4_setattr(inode, err); switch (err) { case -NFS4ERR_OPENMODE: if (!(sattr->ia_valid & ATTR_SIZE)) {
@@ -5426,7 +5426,7 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4int err; do { err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); - trace_nfs4_delegreturn(inode, err); + trace_nfs4_delegreturn(inode, stateid, err); switch (err) { case -NFS4ERR_STALE_STATEID: case -NFS4ERR_EXPIRED:
@@ -5947,6 +5947,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f data->cancelled =1 ;rpc_put_task (task);dprintk ("%s: done, ret = %d!\n" , __func__, ret); +trace_nfs4_set_lock (fl, state, &data->res.stateid, cmd, ret);return ret; }
@@ -5963,7 +5964,6 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *requestif (test_bit (NFS_DELEGATED_STATE , &state->flags) !=0 )return 0 ; err =_nfs4_do_setlk (state,F_SETLK , request,NFS_LOCK_RECLAIM ); -trace_nfs4_lock_reclaim (request, state,F_SETLK , err);if (err != -NFS4ERR_DELAY )break ;nfs4_handle_exception (server, err, &exception);
@@ -5990,7 +5990,6 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *requestif (test_bit (NFS_DELEGATED_STATE , &state->flags) !=0 )return 0 ; err =_nfs4_do_setlk (state,F_SETLK , request,NFS_LOCK_EXPIRED ); -trace_nfs4_lock_expired (request, state,F_SETLK , err);switch (err) {default : goto out;
@@ -6098,7 +6097,6 @@ static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock * do { err = _nfs4_proc_setlk(state, cmd, request); - trace_nfs4_set_lock(request, state, cmd, err); if (err == -NFS4ERR_DENIED) err = -EAGAIN; err = nfs4_handle_exception(NFS_SERVER(state->inode),
@@ -7999,6 +7997,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)trace_nfs4_layoutget (lgp->args.ctx, &lgp->args.range, &lgp->res.range, + &lgp->res.stateid, status);/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */ if (status ==0 && lgp->res.layoutp->len)
@@ -8106,7 +8105,7 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync)return PTR_ERR (task);if (sync) status = task->tk_status; -trace_nfs4_layoutreturn (lrp->args.inode, status); +trace_nfs4_layoutreturn (lrp->args.inode, &lrp->args.stateid, status);dprintk ("<-- %s status=%d\n" , __func__, status);rpc_put_task (task);return status;
@@ -8254,7 +8253,7 @@ nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, bool sync)return PTR_ERR (task);if (sync) status = task->tk_status; -trace_nfs4_layoutcommit (data->args.inode, status); +trace_nfs4_layoutcommit (data->args.inode, &data->args.stateid, status);dprintk ("%s: status %d\n" , __func__, status);rpc_put_task (task);return status;
fs/nfs/nfs4trace.h +230 -25
471 lines not on this page · raw message
Signature · 1 line
1.8.3.1