NFS: Improve write error tracing
Subsystems (2)
[email protected]
maintainerPATCH 1/3 NFS: Improve write error tracing
From: Trond Myklebust <[email protected]>
Don't leak request pointers, but use the "device:inode" labelling that is used by all the other trace points. Furthermore, replace use of page indexes with an offset, again in order to align behaviour with other NFS trace points.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfstrace.h | 36 +++++++++++++++++++++--------------- fs/nfs/write.c | 8 +++++--- include/linux/nfs_page.h | 3 +-- 3 files changed, 27 insertions(+), 20 deletions(-)
fs/nfs/nfstrace.h +21 -15
@@ -1447,44 +1447,50 @@ TRACE_EVENT(nfs_writeback_done,DECLARE_EVENT_CLASS (nfs_page_error_class,TP_PROTO ( + const struct inode *inode, const struct nfs_page *req, int error ), -TP_ARGS (req, error), +TP_ARGS (inode, req, error),TP_STRUCT__entry ( - __field(const void *, req) - __field(pgoff_t, index) - __field(unsigned int, offset) - __field(unsigned int, pgbase) - __field(unsigned int, bytes) + __field(dev_t, dev) + __field(u32, fhandle) + __field(u64, fileid) + __field(loff_t, offset) + __field(unsigned int, count)__field (int, error) ),TP_fast_assign ( - __entry->req = req; - __entry->index = req->wb_index; - __entry->offset = req->wb_offset; - __entry->pgbase = req->wb_pgbase; - __entry->bytes = req->wb_bytes; + const struct nfs_inode *nfsi = NFS_I(inode); + __entry->dev = inode->i_sb->s_dev; + __entry->fileid = nfsi->fileid; + __entry->fhandle = nfs_fhandle_hash(&nfsi->fh); + __entry->offset = req_offset(req); + __entry->count = req->wb_bytes; __entry->error = error; ),TP_printk ( -"req=%p index=%lu offset=%u pgbase=%u bytes=%u error=%d" , - __entry->req, __entry->index, __entry->offset, - __entry->pgbase, __entry->bytes, __entry->error +"error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld count=%u" , __entry->error, +MAJOR (__entry->dev),MINOR (__entry->dev), + (unsigned long long )__entry->fileid, + __entry->fhandle, __entry->offset, + __entry->count ) );#define DEFINE_NFS_PAGEERR_EVENT (name) \ DEFINE_EVENT(nfs_page_error_class, name, \ TP_PROTO( \ + const struct inode *inode, \ const struct nfs_page *req, \ int error \ ), \ - TP_ARGS(req, error)) + TP_ARGS(inode, req, error))DEFINE_NFS_PAGEERR_EVENT (nfs_write_error);DEFINE_NFS_PAGEERR_EVENT (nfs_comp_error);
fs/nfs/write.c +5 -3
@@ -592,7 +592,8 @@ nfs_lock_and_join_requests(struct page *page)static void nfs_write_error (struct nfs_page *req,int error) { -trace_nfs_write_error (req, error); +trace_nfs_write_error (page_file_mapping (req->wb_page)->host, req, + error);nfs_mapping_set_error (req->wb_page, error);nfs_inode_remove_request (req);nfs_end_page_writeback (req);
@@ -1000,7 +1001,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)nfs_list_remove_request (req);if (test_bit (NFS_IOHDR_ERROR , &hdr->flags) && (hdr->good_bytes < bytes)) { -trace_nfs_comp_error (req, hdr->error); +trace_nfs_comp_error (hdr->inode, req, hdr->error);nfs_mapping_set_error (req->wb_page, hdr->error); goto remove_req; }
@@ -1882,7 +1883,8 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) (long long)req_offset(req));if (status <0 ) {if (req->wb_page) { -trace_nfs_commit_error (req, status); +trace_nfs_commit_error (data->inode, req, + status);nfs_mapping_set_error (req->wb_page, status);nfs_inode_remove_request (req); }
include/linux/nfs_page.h +1 -2
@@ -202,8 +202,7 @@ nfs_list_entry(struct list_head *head) return list_entry(head, struct nfs_page, wb_list); } -static inline -loff_t req_offset (struct nfs_page *req) +static inline loff_t req_offset (const struct nfs_page *req) {return (((loff_t )req->wb_index) <<PAGE_SHIFT ) + req->wb_offset; }
Signature · 1 line
2.37.1
[email protected]
maintainerPATCH 2/3 NFS: Improve O_DIRECT tracing
From: Trond Myklebust <[email protected]>
Switch the formatting to match the other NFS tracepoints.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfstrace.h | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
fs/nfs/nfstrace.h +9 -12
@@ -1597,12 +1597,10 @@ DECLARE_EVENT_CLASS(nfs_direct_req_class,TP_ARGS (dreq),TP_STRUCT__entry ( - __field(const struct nfs_direct_req *, dreq) __field(dev_t, dev) __field(u64, fileid) __field(u32, fhandle) - __field(int, ref) - __field(loff_t, io_start) + __field(loff_t, offset) __field(ssize_t, count) __field(ssize_t, bytes_left) __field(ssize_t, error)
@@ -1614,12 +1612,10 @@ DECLARE_EVENT_CLASS(nfs_direct_req_class,const struct nfs_inode *nfsi =NFS_I (inode);const struct nfs_fh *fh = &nfsi->fh; - __entry->dreq = dreq; __entry->dev = inode->i_sb->s_dev; __entry->fileid = nfsi->fileid; __entry->fhandle =nfs_fhandle_hash (fh); - __entry->ref =kref_read (&dreq->kref); - __entry->io_start = dreq->io_start; + __entry->offset = dreq->io_start; __entry->count = dreq->count; __entry->bytes_left = dreq->bytes_left; __entry->error = dreq->error;
@@ -1627,13 +1623,14 @@ DECLARE_EVENT_CLASS(nfs_direct_req_class, ),TP_printk ( -"dreq=%p fileid=%02x:%02x:%llu fhandle=0x%08x ref=%d " -"io_start=%lld count=%zd bytes_left=%zd error=%zd flags=%s" , - __entry->dreq,MAJOR (__entry->dev),MINOR (__entry->dev), +"error=%zd fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld count=%zd bytes_left=%zd flags=%s" , + __entry->error,MAJOR (__entry->dev), +MINOR (__entry->dev), (unsigned long long )__entry->fileid, - __entry->fhandle, __entry->ref, - __entry->io_start, __entry->count, __entry->bytes_left, - __entry->error,nfs_show_direct_req_flags (__entry->flags) + __entry->fhandle, __entry->offset, + __entry->count, __entry->bytes_left, +nfs_show_direct_req_flags (__entry->flags) ) );
Signature · 1 line
2.37.1
[email protected]
maintainerPATCH 3/3 NFS: Improve readpage/writepage tracing
From: Trond Myklebust <[email protected]>
Switch formatting to better match that used by other NFS tracepoints.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfstrace.h | 54 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 28 deletions(-)
fs/nfs/nfstrace.h +26 -28
@@ -1137,7 +1137,7 @@ TRACE_EVENT(nfs_readpage_done, __field(u32, arg_count) __field(u32, res_count) __field(bool, eof) -__field (int, status) +__field (int, error) ), TP_fast_assign(
@@ -1146,7 +1146,7 @@ TRACE_EVENT(nfs_readpage_done,const struct nfs_fh *fh = hdr->args.fh ? hdr->args.fh : &nfsi->fh; - __entry->status = task->tk_status; + __entry->error = task->tk_status; __entry->offset = hdr->args.offset; __entry->arg_count = hdr->args.count; __entry->res_count = hdr->res.count;
@@ -1157,14 +1157,13 @@ TRACE_EVENT(nfs_readpage_done, ),TP_printk ( -"fileid=%02x:%02x:%llu fhandle=0x%08x " -"offset=%lld count=%u res=%u status=%d%s" , +"error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld count=%u res=%u%s" , __entry->error,MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->fileid, __entry->fhandle, (long long )__entry->offset, __entry->arg_count, - __entry->res_count, __entry->status, - __entry->eof ?" eof" :"" + __entry->res_count, __entry->eof ?" eof" :"" ) );
@@ -1184,7 +1183,7 @@ TRACE_EVENT(nfs_readpage_short, __field(u32, arg_count) __field(u32, res_count) __field(bool, eof) -__field (int, status) +__field (int, error) ), TP_fast_assign(
@@ -1193,7 +1192,7 @@ TRACE_EVENT(nfs_readpage_short,const struct nfs_fh *fh = hdr->args.fh ? hdr->args.fh : &nfsi->fh; - __entry->status = task->tk_status; + __entry->error = task->tk_status; __entry->offset = hdr->args.offset; __entry->arg_count = hdr->args.count; __entry->res_count = hdr->res.count;
@@ -1204,14 +1203,13 @@ TRACE_EVENT(nfs_readpage_short, ),TP_printk ( -"fileid=%02x:%02x:%llu fhandle=0x%08x " -"offset=%lld count=%u res=%u status=%d%s" , +"error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld count=%u res=%u%s" , __entry->error,MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->fileid, __entry->fhandle, (long long )__entry->offset, __entry->arg_count, - __entry->res_count, __entry->status, - __entry->eof ?" eof" :"" + __entry->res_count, __entry->eof ?" eof" :"" ) );
@@ -1323,7 +1321,7 @@ TRACE_EVENT(nfs_pgio_error, __field(u32, arg_count) __field(u32, res_count) __field(loff_t, pos) -__field (int, status) +__field (int, error) ), TP_fast_assign(
@@ -1332,7 +1330,7 @@ TRACE_EVENT(nfs_pgio_error,const struct nfs_fh *fh = hdr->args.fh ? hdr->args.fh : &nfsi->fh; - __entry->status = error; + __entry->error = error; __entry->offset = hdr->args.offset; __entry->arg_count = hdr->args.count; __entry->res_count = hdr->res.count;
@@ -1341,12 +1339,12 @@ TRACE_EVENT(nfs_pgio_error, __entry->fhandle =nfs_fhandle_hash (fh); ), -TP_printk ("fileid=%02x:%02x:%llu fhandle=0x%08x " -"offset=%lld count=%u res=%u pos=%llu status=%d" , +TP_printk ("error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld count=%u res=%u pos=%llu" , __entry->error,MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->fileid, __entry->fhandle, (long long )__entry->offset, __entry->arg_count, __entry->res_count, - __entry->pos, __entry->status + __entry->pos ) );
@@ -1406,7 +1404,7 @@ TRACE_EVENT(nfs_writeback_done, __field(loff_t, offset) __field(u32, arg_count) __field(u32, res_count) - __field(int, status) + __field(int, error) __field(unsigned long, stable)__array (char , verifier, NFS4_VERIFIER_SIZE) ),
@@ -1418,7 +1416,7 @@ TRACE_EVENT(nfs_writeback_done, hdr->args.fh : &nfsi->fh;const struct nfs_writeverf *verf = hdr->res.verf; - __entry->status = task->tk_status; + __entry->error = task->tk_status; __entry->offset = hdr->args.offset; __entry->arg_count = hdr->args.count; __entry->res_count = hdr->res.count;
@@ -1432,14 +1430,14 @@ TRACE_EVENT(nfs_writeback_done, ),TP_printk ( -"fileid=%02x:%02x:%llu fhandle=0x%08x " -"offset=%lld count=%u res=%u status=%d stable=%s " -"verifier=%s" , +"error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld count=%u res=%u stable=%s " +"verifier=%s" , __entry->error,MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->fileid, __entry->fhandle, (long long )__entry->offset, __entry->arg_count, - __entry->res_count, __entry->status, + __entry->res_count,show_nfs_stable_how (__entry->stable),show_nfs4_verifier (__entry->verifier) )
@@ -1547,7 +1545,7 @@ TRACE_EVENT(nfs_commit_done, __field(u32, fhandle) __field(u64, fileid) __field(loff_t, offset) - __field(int, status) + __field(int, error) __field(unsigned long, stable)__array (char , verifier, NFS4_VERIFIER_SIZE) ),
@@ -1559,7 +1557,7 @@ TRACE_EVENT(nfs_commit_done, data->args.fh : &nfsi->fh;const struct nfs_writeverf *verf = data->res.verf; - __entry->status = task->tk_status; + __entry->error = task->tk_status; __entry->offset = data->args.offset; __entry->stable = verf->committed; memcpy(__entry->verifier,
@@ -1571,12 +1569,12 @@ TRACE_EVENT(nfs_commit_done, ),TP_printk ( -"fileid=%02x:%02x:%llu fhandle=0x%08x " -"offset=%lld status=%d stable=%s verifier=%s" , +"error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " +"offset=%lld stable=%s verifier=%s" , __entry->error,MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->fileid, __entry->fhandle, - (long long )__entry->offset, __entry->status, + (long long )__entry->offset,show_nfs_stable_how (__entry->stable),show_nfs4_verifier (__entry->verifier) )
Signature · 1 line
2.37.1