Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfs / nfs4trace.h

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index c83a7db91e49d5d1f8609fd7acb4d961764423dd..1e97e5e04cb43ba671c491b6433174e8c1552e0a 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -2152,6 +2152,115 @@ DEFINE_PNFS_LAYOUT_EVENT(pnfs_mds_fallback_write_done);
 DEFINE_PNFS_LAYOUT_EVENT(pnfs_mds_fallback_read_pagelist);
 DEFINE_PNFS_LAYOUT_EVENT(pnfs_mds_fallback_write_pagelist);
 
+DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,
+               TP_PROTO(
+                       const struct nfs_pgio_header *hdr
+               ),
+
+               TP_ARGS(hdr),
+
+               TP_STRUCT__entry(
+                       __field(unsigned long, error)
+                       __field(dev_t, dev)
+                       __field(u32, fhandle)
+                       __field(u64, fileid)
+                       __field(loff_t, offset)
+                       __field(u32, count)
+                       __field(int, stateid_seq)
+                       __field(u32, stateid_hash)
+                       __string(dstaddr, hdr->ds_clp ?
+                               rpc_peeraddr2str(hdr->ds_clp->cl_rpcclient,
+                                       RPC_DISPLAY_ADDR) : "unknown")
+               ),
+
+               TP_fast_assign(
+                       const struct inode *inode = hdr->inode;
+
+                       __entry->error = hdr->res.op_status;
+                       __entry->fhandle = nfs_fhandle_hash(hdr->args.fh);
+                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->dev = inode->i_sb->s_dev;
+                       __entry->offset = hdr->args.offset;
+                       __entry->count = hdr->args.count;
+                       __entry->stateid_seq =
+                               be32_to_cpu(hdr->args.stateid.seqid);
+                       __entry->stateid_hash =
+                               nfs_stateid_hash(&hdr->args.stateid);
+                       __assign_str(dstaddr, hdr->ds_clp ?
+                               rpc_peeraddr2str(hdr->ds_clp->cl_rpcclient,
+                                       RPC_DISPLAY_ADDR) : "unknown");
+               ),
+
+               TP_printk(
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "offset=%llu count=%u stateid=%d:0x%08x dstaddr=%s",
+                       -__entry->error,
+                       show_nfsv4_errors(__entry->error),
+                       MAJOR(__entry->dev), MINOR(__entry->dev),
+                       (unsigned long long)__entry->fileid,
+                       __entry->fhandle,
+                       __entry->offset, __entry->count,
+                       __entry->stateid_seq, __entry->stateid_hash,
+                       __get_str(dstaddr)
+               )
+);
+
+#define DEFINE_NFS4_FLEXFILES_IO_EVENT(name) \
+       DEFINE_EVENT(nfs4_flexfiles_io_event, name, \
+                       TP_PROTO( \
+                               const struct nfs_pgio_header *hdr \
+                       ), \
+                       TP_ARGS(hdr))
+DEFINE_NFS4_FLEXFILES_IO_EVENT(ff_layout_read_error);
+DEFINE_NFS4_FLEXFILES_IO_EVENT(ff_layout_write_error);
+
+TRACE_EVENT(ff_layout_commit_error,
+               TP_PROTO(
+                       const struct nfs_commit_data *data
+               ),
+
+               TP_ARGS(data),
+
+               TP_STRUCT__entry(
+                       __field(unsigned long, error)
+                       __field(dev_t, dev)
+                       __field(u32, fhandle)
+                       __field(u64, fileid)
+                       __field(loff_t, offset)
+                       __field(u32, count)
+                       __string(dstaddr, data->ds_clp ?
+                               rpc_peeraddr2str(data->ds_clp->cl_rpcclient,
+                                       RPC_DISPLAY_ADDR) : "unknown")
+               ),
+
+               TP_fast_assign(
+                       const struct inode *inode = data->inode;
+
+                       __entry->error = data->res.op_status;
+                       __entry->fhandle = nfs_fhandle_hash(data->args.fh);
+                       __entry->fileid = NFS_FILEID(inode);
+                       __entry->dev = inode->i_sb->s_dev;
+                       __entry->offset = data->args.offset;
+                       __entry->count = data->args.count;
+                       __assign_str(dstaddr, data->ds_clp ?
+                               rpc_peeraddr2str(data->ds_clp->cl_rpcclient,
+                                       RPC_DISPLAY_ADDR) : "unknown");
+               ),
+
+               TP_printk(
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "offset=%llu count=%u dstaddr=%s",
+                       -__entry->error,
+                       show_nfsv4_errors(__entry->error),
+                       MAJOR(__entry->dev), MINOR(__entry->dev),
+                       (unsigned long long)__entry->fileid,
+                       __entry->fhandle,
+                       __entry->offset, __entry->count,
+                       __get_str(dstaddr)
+               )
+);
+
+
 #endif /* CONFIG_NFS_V4_1 */
 
 #endif /* _TRACE_NFS4_H */