Skip to content

Commit

Permalink
NFSv4.2 add tracepoint to COPY_NOTIFY
Browse files Browse the repository at this point in the history
Add a tracepoint to COPY_NOTIFY operation.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
  • Loading branch information
Olga Kornievskaia authored and Trond Myklebust committed Nov 4, 2021
1 parent 8db744c commit 488b170
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 1 deletion.
1 change: 1 addition & 0 deletions fs/nfs/nfs42proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,

status = nfs4_call_sync(src_server->client, src_server, &msg,
&args->cna_seq_args, &res->cnr_seq_res, 0);
trace_nfs4_copy_notify(file_inode(src), args, res, status);
if (status == -ENOTSUPP)
src_server->caps &= ~NFS_CAP_COPY_NOTIFY;

Expand Down
58 changes: 57 additions & 1 deletion fs/nfs/nfs4trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ TRACE_EVENT(nfs4_cb_offload,
show_nfs_stable_how(__entry->cb_how)
)
);

#endif /* CONFIG_NFS_V4_1 */

TRACE_EVENT(nfs4_setup_sequence,
Expand Down Expand Up @@ -2407,6 +2406,63 @@ TRACE_EVENT(nfs4_clone,
__entry->len
)
);

TRACE_EVENT(nfs4_copy_notify,
TP_PROTO(
const struct inode *inode,
const struct nfs42_copy_notify_args *args,
const struct nfs42_copy_notify_res *res,
int error
),

TP_ARGS(inode, args, res, error),

TP_STRUCT__entry(
__field(unsigned long, error)
__field(u32, fhandle)
__field(u32, fileid)
__field(dev_t, dev)
__field(int, stateid_seq)
__field(u32, stateid_hash)
__field(int, res_stateid_seq)
__field(u32, res_stateid_hash)
),

TP_fast_assign(
const struct nfs_inode *nfsi = NFS_I(inode);

__entry->fileid = nfsi->fileid;
__entry->dev = inode->i_sb->s_dev;
__entry->fhandle = nfs_fhandle_hash(args->cna_src_fh);
__entry->stateid_seq =
be32_to_cpu(args->cna_src_stateid.seqid);
__entry->stateid_hash =
nfs_stateid_hash(&args->cna_src_stateid);
if (error) {
__entry->error = -error;
__entry->res_stateid_seq = 0;
__entry->res_stateid_hash = 0;
} else {
__entry->error = 0;
__entry->res_stateid_seq =
be32_to_cpu(res->cnr_stateid.seqid);
__entry->res_stateid_hash =
nfs_stateid_hash(&res->cnr_stateid);
}
),

TP_printk(
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"stateid=%d:0x%08x res_stateid=%d:0x%08x",
-__entry->error,
show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
__entry->stateid_seq, __entry->stateid_hash,
__entry->res_stateid_seq, __entry->res_stateid_hash
)
);
#endif /* CONFIG_NFS_V4_2 */

#endif /* CONFIG_NFS_V4_1 */
Expand Down

0 comments on commit 488b170

Please sign in to comment.