mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NFSv4.2 add tracepoint to COPY 

Add a tracepoint to the COPY operation.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Olga Kornievskaia 2021-11-04 10:57:10 -04:00 committed by Trond Myklebust
parent 40a8241771
commit ce7cea1ba7
2 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfs/nfs42proc.c
View File

@ -367,6 +367,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,
status = nfs4_call_sync(dst_server->client, dst_server, &msg,
&args->seq_args, &res->seq_res, 0);
trace_nfs4_copy(src_inode, dst_inode, args, res, nss, status);
if (status == -ENOTSUPP)
dst_server->caps &= ~NFS_CAP_COPY;
if (status)

107
fs/nfs/nfs4trace.h
View File

@ -2183,6 +2183,113 @@ DECLARE_EVENT_CLASS(nfs4_sparse_event,
TP_ARGS(inode, args, error))
DEFINE_NFS4_SPARSE_EVENT(nfs4_fallocate);
DEFINE_NFS4_SPARSE_EVENT(nfs4_deallocate);
TRACE_EVENT(nfs4_copy,
TP_PROTO(
const struct inode *src_inode,
const struct inode *dst_inode,
const struct nfs42_copy_args *args,
const struct nfs42_copy_res *res,
const struct nl4_server *nss,
int error
),
TP_ARGS(src_inode, dst_inode, args, res, nss, error),
TP_STRUCT__entry(
__field(unsigned long, error)
__field(u32, src_fhandle)
__field(u32, src_fileid)
__field(u32, dst_fhandle)
__field(u32, dst_fileid)
__field(dev_t, src_dev)
__field(dev_t, dst_dev)
__field(int, src_stateid_seq)
__field(u32, src_stateid_hash)
__field(int, dst_stateid_seq)
__field(u32, dst_stateid_hash)
__field(loff_t, src_offset)
__field(loff_t, dst_offset)
__field(bool, sync)
__field(loff_t, len)
__field(int, res_stateid_seq)
__field(u32, res_stateid_hash)
__field(loff_t, res_count)
__field(bool, res_sync)
__field(bool, res_cons)
__field(bool, intra)
),
TP_fast_assign(
const struct nfs_inode *src_nfsi = NFS_I(src_inode);
const struct nfs_inode *dst_nfsi = NFS_I(dst_inode);
__entry->src_fileid = src_nfsi->fileid;
__entry->src_dev = src_inode->i_sb->s_dev;
__entry->src_fhandle = nfs_fhandle_hash(args->src_fh);
__entry->src_offset = args->src_pos;
__entry->dst_fileid = dst_nfsi->fileid;
__entry->dst_dev = dst_inode->i_sb->s_dev;
__entry->dst_fhandle = nfs_fhandle_hash(args->dst_fh);
__entry->dst_offset = args->dst_pos;
__entry->len = args->count;
__entry->sync = args->sync;
__entry->src_stateid_seq =
be32_to_cpu(args->src_stateid.seqid);
__entry->src_stateid_hash =
nfs_stateid_hash(&args->src_stateid);
__entry->dst_stateid_seq =
be32_to_cpu(args->dst_stateid.seqid);
__entry->dst_stateid_hash =
nfs_stateid_hash(&args->dst_stateid);
__entry->intra = nss ? 0 : 1;
if (error) {
__entry->error = -error;
__entry->res_stateid_seq = 0;
__entry->res_stateid_hash = 0;
__entry->res_count = 0;
__entry->res_sync = 0;
__entry->res_cons = 0;
} else {
__entry->error = 0;
__entry->res_stateid_seq =
be32_to_cpu(res->write_res.stateid.seqid);
__entry->res_stateid_hash =
nfs_stateid_hash(&res->write_res.stateid);
__entry->res_count = res->write_res.count;
__entry->res_sync = res->synchronous;
__entry->res_cons = res->consecutive;
}
),
TP_printk(
"error=%ld (%s) intra=%d src_fileid=%02x:%02x:%llu "
"src_fhandle=0x%08x dst_fileid=%02x:%02x:%llu "
"dst_fhandle=0x%08x src_stateid=%d:0x%08x "
"dst_stateid=%d:0x%08x src_offset=%llu dst_offset=%llu "
"len=%llu sync=%d cb_stateid=%d:0x%08x res_sync=%d "
"res_cons=%d res_count=%llu",
-__entry->error,
show_nfs4_status(__entry->error),
__entry->intra,
MAJOR(__entry->src_dev), MINOR(__entry->src_dev),
(unsigned long long)__entry->src_fileid,
__entry->src_fhandle,
MAJOR(__entry->dst_dev), MINOR(__entry->dst_dev),
(unsigned long long)__entry->dst_fileid,
__entry->dst_fhandle,
__entry->src_stateid_seq, __entry->src_stateid_hash,
__entry->dst_stateid_seq, __entry->dst_stateid_hash,
__entry->src_offset,
__entry->dst_offset,
__entry->len,
__entry->sync,
__entry->res_stateid_seq, __entry->res_stateid_hash,
__entry->res_sync,
__entry->res_cons,
__entry->res_count
)
);
#endif /* CONFIG_NFS_V4_2 */
#endif /* CONFIG_NFS_V4_1 */