for-5.3 patches for review
Subsystems (4)
v2 cover for-5.3 patches for review
This is a series of fixes and architectural changes that should improve robustness and result in better scalability of NFS/RDMA.
The fundamental observation is that the RPC work queues are BOUND, thus rescheduling work in the Receive completion handler to one of these work queues just forces it to run later on the same CPU. So try to do more work right in the Receive completion handler to reduce context switch overhead.
A secondary concern is that the average amount of wall-clock time it takes to handle a single Receive completion caps the IOPS rate (both per-xprt and per-NIC). In this patch series I've taken a few steps to reduce that latency, and I'm looking into a few others.
This series can be fetched from:
git://git.linux-nfs.org/projects/cel/cel-2.6.git
in topic branch "nfs-for-5.3".
Changes since RFC:
* Rebased on v5.2-rc4
* Clarified some patch descriptions and comments
* Addressed Anna's compiler warning in frwr_unmap_[a]sync
* Cross-ported recent xs_connect changes to xprt_rdma_connect
* Fixed several trace-event bugs
---
Chuck Lever (19):
xprtrdma: Fix a BUG when tracing is enabled with NFSv4.1 on RDMA
xprtrdma: Fix use-after-free in rpcrdma_post_recvs
xprtrdma: Replace use of xdr_stream_pos in rpcrdma_marshal_req
xprtrdma: Fix occasional transport deadlock
xprtrdma: Remove the RPCRDMA_REQ_F_PENDING flag
xprtrdma: Remove fr_state
xprtrdma: Add mechanism to place MRs back on the free list
xprtrdma: Reduce context switching due to Local Invalidation
xprtrdma: Wake RPCs directly in rpcrdma_wc_send path
xprtrdma: Simplify rpcrdma_rep_create
xprtrdma: Streamline rpcrdma_post_recvs
xprtrdma: Refactor chunk encoding
xprtrdma: Remove rpcrdma_req::rl_buffer
xprtrdma: Modernize ops->connect
NFS4: Add a trace event to record invalid CB sequence IDs
NFS: Fix show_nfs_errors macros again
NFS: Display symbolic status code names in trace log
NFS: Update symbolic flags displayed by trace events
NFS: Record task, client ID, and XID in xdr_status trace points
fs/nfs/callback_proc.c | 28 ++- fs/nfs/nfs2xdr.c | 2 fs/nfs/nfs3xdr.c | 2 fs/nfs/nfs4trace.h | 165 +++++++++++++------- fs/nfs/nfs4xdr.c | 2 fs/nfs/nfstrace.h | 181 ++++++++++++++++------ include/linux/sunrpc/xprt.h | 3 include/trace/events/rpcrdma.h | 90 ++++++++--- net/sunrpc/sched.c | 1 net/sunrpc/xprt.c | 32 ++++ net/sunrpc/xprtrdma/frwr_ops.c | 327 ++++++++++++++++++++++++++------------- net/sunrpc/xprtrdma/rpc_rdma.c | 148 ++++++++---------- net/sunrpc/xprtrdma/transport.c | 83 ++++++++-- net/sunrpc/xprtrdma/verbs.c | 115 ++++++-------- net/sunrpc/xprtrdma/xprt_rdma.h | 44 +---- net/sunrpc/xprtsock.c | 23 --- 16 files changed, 776 insertions(+), 470 deletions(-)
--
Chuck Lever
PATCH v2 1/19 xprtrdma: Fix a BUG when tracing is enabled with NFSv4.1 on RDMA
A backchannel reply does not set task->tk_client.
--- include/trace/events/rpcrdma.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/trace/events/rpcrdma.h +2 -1
@@ -559,7 +559,8 @@const struct rpc_rqst *rqst = &req->rl_slot; __entry->task_id = rqst->rq_task->tk_pid; - __entry->client_id = rqst->rq_task->tk_client->cl_clid; + __entry->client_id = rqst->rq_task->tk_client ? + rqst->rq_task->tk_client->cl_clid :-1 ; __entry->req = req; __entry->num_sge = req->rl_sendctx->sc_wr.num_sge; __entry->signaled = req->rl_sendctx->sc_wr.send_flags &
PATCH v2 2/19 xprtrdma: Fix use-after-free in rpcrdma_post_recvs
In reply to Chuck LeverDereference wr->next /before/ the memory backing wr has been released. This issue was found by code inspection. It is not expected to be a significant problem because it is in an error path that is almost never executed.
--- net/sunrpc/xprtrdma/verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sunrpc/xprtrdma/verbs.c +2 -1
@@ -1553,10 +1553,11 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb) rc =ib_post_recv (r_xprt->rx_ia.ri_id->qp, wr, (const struct ib_recv_wr **)&bad_wr);if (rc) { -for (wr = bad_wr; wr; wr = wr->next) { +for (wr = bad_wr; wr;) {struct rpcrdma_rep *rep; rep = container_of(wr, struct rpcrdma_rep, rr_recv_wr); + wr = wr->next;rpcrdma_recv_buffer_put (rep); --count; }
PATCH v2 3/19 xprtrdma: Replace use of xdr_stream_pos in rpcrdma_marshal_req
In reply to Chuck LeverThis is a latent bug. xdr_stream_pos works by subtracting xdr_stream::nwords from xdr_buf::len. But xdr_stream::nwords is not initialized by xdr_init_encode().
It works today only because all fields in rpcrdma_req::rl_stream are initialized to zero by rpcrdma_req_create, making the subtraction in xdr_stream_pos always a no-op.
I found this issue via code inspection. It was introduced by commit 39f4cd9e9982 ("xprtrdma: Harden chunk list encoding against send buffer overflow"), but the code has changed enough since then that this fix can't be automatically applied to stable.
--- include/trace/events/rpcrdma.h | 9 +++++---- net/sunrpc/xprtrdma/rpc_rdma.c | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-)
include/trace/events/rpcrdma.h +5 -4
@@ -470,13 +470,12 @@ TRACE_EVENT(xprtrdma_marshal, TP_PROTO( - const struct rpc_rqst *rqst, - unsigned int hdrlen, + const struct rpcrdma_req *req, unsigned int rtype, unsigned int wtype ), - TP_ARGS(rqst, hdrlen, rtype, wtype), + TP_ARGS(req, rtype, wtype), TP_STRUCT__entry( __field(unsigned int, task_id)
@@ -491,10 +490,12 @@ ),TP_fast_assign ( + const struct rpc_rqst *rqst = &req->rl_slot; + __entry->task_id = rqst->rq_task->tk_pid; __entry->client_id = rqst->rq_task->tk_client->cl_clid; __entry->xid =be32_to_cpu (rqst->rq_xid); - __entry->hdrlen = hdrlen; + __entry->hdrlen = req->rl_hdrbuf.len; __entry->headlen = rqst->rq_snd_buf.head[0 ].iov_len; __entry->pagelen = rqst->rq_snd_buf.page_len; __entry->taillen = rqst->rq_snd_buf.tail[0 ].iov_len;
net/sunrpc/xprtrdma/rpc_rdma.c +3 -3
@@ -867,12 +867,12 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt,if (ret) goto out_err; -trace_xprtrdma_marshal (rqst,xdr_stream_pos (xdr), rtype, wtype); - - ret =rpcrdma_prepare_send_sges (r_xprt, req,xdr_stream_pos (xdr), + ret =rpcrdma_prepare_send_sges (r_xprt, req, req->rl_hdrbuf.len, &rqst->rq_snd_buf, rtype);if (ret) goto out_err; + +trace_xprtrdma_marshal (req, rtype, wtype);return 0 ; out_err:
PATCH v2 4/19 xprtrdma: Fix occasional transport deadlock
In reply to Chuck LeverUnder high I/O workloads, I've noticed that an RPC/RDMA transport occasionally deadlocks (IOPS goes to zero, and doesn't recover). Diagnosis shows that the sendctx queue is empty, but when sendctxs are returned to the queue, the xprt_write_space wake-up never occurs. The wake-up logic in rpcrdma_sendctx_put_locked is racy.
I noticed that both EMPTY_SCQ and XPRT_WRITE_SPACE are implemented via an atomic bit. Just one of those is sufficient. Removing EMPTY_SCQ in favor of the generic bit mechanism makes the deadlock un-reproducible.
Without EMPTY_SCQ, rpcrdma_buffer::rb_flags is no longer used and is therefore removed.
Unfortunately this patch does not apply cleanly to stable. If needed, someone will have to port it and test it.
--- include/trace/events/rpcrdma.h | 27 +++++++++++++++++++++++++++ net/sunrpc/xprtrdma/frwr_ops.c | 6 +++++- net/sunrpc/xprtrdma/rpc_rdma.c | 26 ++++++++++++-------------- net/sunrpc/xprtrdma/verbs.c | 11 +++-------- net/sunrpc/xprtrdma/xprt_rdma.h | 6 ------ 5 files changed, 47 insertions(+), 29 deletions(-)
include/trace/events/rpcrdma.h +27 -0
@@ -539,6 +539,33 @@ ) ); +TRACE_EVENT (xprtrdma_prepsend_failed, + TP_PROTO(const struct rpc_rqst *rqst, + int ret + ), + +TP_ARGS (rqst, ret), + +TP_STRUCT__entry ( + __field(unsigned int, task_id) + __field(unsigned int, client_id) + __field(u32, xid) +__field (int, ret) + ), + +TP_fast_assign ( + __entry->task_id = rqst->rq_task->tk_pid; + __entry->client_id = rqst->rq_task->tk_client->cl_clid; + __entry->xid = be32_to_cpu(rqst->rq_xid); + __entry->ret = ret; + ), + +TP_printk ("task:%u@%u xid=0x%08x: ret=%d" , + __entry->task_id, __entry->client_id, __entry->xid, + __entry->ret + ) +); + TRACE_EVENT(xprtrdma_post_send, TP_PROTO( const struct rpcrdma_req *req,
net/sunrpc/xprtrdma/frwr_ops.c +5 -1
@@ -391,7 +391,7 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt,rpcrdma_mr_recycle (mr); mr =rpcrdma_mr_get (r_xprt);if (!mr) -return ERR_PTR (-EAGAIN ); + goto out_getmr_err; }while (mr->frwr.fr_state !=FRWR_IS_INVALID ); frwr = &mr->frwr; frwr->fr_state =FRWR_IS_VALID ;
@@ -448,6 +448,10 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt, *out = mr;return seg; +out_getmr_err: +xprt_wait_for_buffer_space (&r_xprt->rx_xprt); +return ERR_PTR (-EAGAIN ); + out_dmamap_err: mr->mr_dir =DMA_NONE ;trace_xprtrdma_frwr_sgerr (mr, i);
net/sunrpc/xprtrdma/rpc_rdma.c +12 -14
@@ -699,22 +699,28 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req, u32 hdrlen, struct xdr_buf *xdr, enum rpcrdma_chunktype rtype) { + int ret; + + ret = -EAGAIN ; req->rl_sendctx =rpcrdma_sendctx_get_locked (r_xprt);if (!req->rl_sendctx) -return -EAGAIN ; + goto err; req->rl_sendctx->sc_wr.num_sge =0 ; req->rl_sendctx->sc_unmap_count =0 ; req->rl_sendctx->sc_req = req;__clear_bit (RPCRDMA_REQ_F_TX_RESOURCES , &req->rl_flags); + ret = -EIO ;if (!rpcrdma_prepare_hdr_sge (r_xprt, req, hdrlen)) -return -EIO ; - + goto err;if (rtype != rpcrdma_areadch)if (!rpcrdma_prepare_msg_sges (r_xprt, req, xdr, rtype)) -return -EIO ; - + goto err;return 0 ; + +err: +trace_xprtrdma_prepsend_failed (&req->rl_slot, ret); +return ret; }/**
@@ -877,15 +883,7 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt, out_err:trace_xprtrdma_marshal_failed (rqst, ret); -switch (ret) { -case -EAGAIN : -xprt_wait_for_buffer_space (rqst->rq_xprt); -break ; -case -ENOBUFS : -break ; -default : - r_xprt->rx_stats.failed_marshal_count++; - } + r_xprt->rx_stats.failed_marshal_count++;return ret; }
net/sunrpc/xprtrdma/verbs.c +3 -8
@@ -901,7 +901,7 @@ struct rpcrdma_sendctx *rpcrdma_sendctx_get_locked(struct rpcrdma_xprt *r_xprt)* completions recently. This is a sign the Send Queue is * backing up. Cause the caller to pause and try again. */ -set_bit (RPCRDMA_BUF_F_EMPTY_SCQ , &buf->rb_flags); +xprt_wait_for_buffer_space (&r_xprt->rx_xprt); r_xprt->rx_stats.empty_sendctx_q++;return NULL ; }
@@ -936,10 +936,7 @@ struct rpcrdma_sendctx *rpcrdma_sendctx_get_locked(struct rpcrdma_xprt *r_xprt)/* Paired with READ_ONCE */ smp_store_release (&buf->rb_sc_tail, next_tail); -if (test_and_clear_bit (RPCRDMA_BUF_F_EMPTY_SCQ , &buf->rb_flags)) { -smp_mb__after_atomic (); -xprt_write_space (&sc->sc_xprt->rx_xprt); - } +xprt_write_space (&sc->sc_xprt->rx_xprt); } static void
@@ -977,8 +974,6 @@ struct rpcrdma_sendctx *rpcrdma_sendctx_get_locked(struct rpcrdma_xprt *r_xprt) r_xprt->rx_stats.mrs_allocated += count;spin_unlock (&buf->rb_mrlock);trace_xprtrdma_createmrs (r_xprt, count); - -xprt_write_space (&r_xprt->rx_xprt); } static void
@@ -990,6 +985,7 @@ struct rpcrdma_sendctx *rpcrdma_sendctx_get_locked(struct rpcrdma_xprt *r_xprt) rx_buf);rpcrdma_mrs_create (r_xprt); +xprt_write_space (&r_xprt->rx_xprt); }/**
@@ -1089,7 +1085,6 @@ int rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)struct rpcrdma_buffer *buf = &r_xprt->rx_buf;int i, rc; - buf->rb_flags =0 ; buf->rb_max_requests = r_xprt->rx_ep.rep_max_requests; buf->rb_bc_srv_max_requests =0 ;spin_lock_init (&buf->rb_mrlock);
net/sunrpc/xprtrdma/xprt_rdma.h +0 -6
@@ -391,7 +391,6 @@ struct rpcrdma_buffer {struct list_head rb_recv_bufs;struct list_head rb_allreqs; -unsigned long rb_flags;u32 rb_max_requests;u32 rb_credits;/* most recent credit grant */
@@ -402,11 +401,6 @@ struct rpcrdma_buffer {struct delayed_work rb_refresh_worker; }; -/* rb_flags */ -enum { -RPCRDMA_BUF_F_EMPTY_SCQ =0 , -}; -/* * Statistics for RPCRDMA */
PATCH v2 5/19 xprtrdma: Remove the RPCRDMA_REQ_F_PENDING flag
In reply to Chuck LeverCommit 9590d083c1bb ("xprtrdma: Use xprt_pin_rqst in rpcrdma_reply_handler") pins incoming RPC/RDMA replies so they can be left in the pending requests queue while they are being processed without introducing a race between ->buf_free and the transport's reply handler. Therefore RPCRDMA_REQ_F_PENDING is no longer necessary.
--- net/sunrpc/xprtrdma/rpc_rdma.c | 1 - net/sunrpc/xprtrdma/transport.c | 4 +--- net/sunrpc/xprtrdma/xprt_rdma.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
net/sunrpc/xprtrdma/rpc_rdma.c +0 -1
@@ -1371,7 +1371,6 @@ void rpcrdma_reply_handler(struct rpcrdma_rep *rep) } req->rl_reply = rep; rep->rr_rqst = rqst; -clear_bit (RPCRDMA_REQ_F_PENDING , &req->rl_flags);trace_xprtrdma_reply (rqst->rq_task, rep, req, credits);queue_work (buf->rb_completion_wq, &rep->rr_work);
net/sunrpc/xprtrdma/transport.c +1 -3
@@ -618,8 +618,7 @@ static bool rpcrdma_check_regbuf(struct rpcrdma_xprt *r_xprt,struct rpcrdma_xprt *r_xprt =rpcx_to_rdmax (rqst->rq_xprt);struct rpcrdma_req *req =rpcr_to_rdmar (rqst); -if (test_bit (RPCRDMA_REQ_F_PENDING , &req->rl_flags)) -rpcrdma_release_rqst (r_xprt, req); +rpcrdma_release_rqst (r_xprt, req);trace_xprtrdma_op_free (task, req); }
@@ -667,7 +666,6 @@ static bool rpcrdma_check_regbuf(struct rpcrdma_xprt *r_xprt, goto drop_connection; rqst->rq_xtime =ktime_get (); -__set_bit (RPCRDMA_REQ_F_PENDING , &req->rl_flags);if (rpcrdma_ep_post (&r_xprt->rx_ia, &r_xprt->rx_ep, req)) goto drop_connection;
net/sunrpc/xprtrdma/xprt_rdma.h +0 -1
@@ -344,7 +344,6 @@ struct rpcrdma_req {/* rl_flags */ enum { -RPCRDMA_REQ_F_PENDING =0 ,RPCRDMA_REQ_F_TX_RESOURCES , };
PATCH v2 6/19 xprtrdma: Remove fr_state
In reply to Chuck LeverNow that both the Send and Receive completions are handled in process context, it is safe to DMA unmap and return MRs to the free or recycle lists directly in the completion handlers.
Doing this means rpcrdma_frwr no longer needs to track the state of each MR, meaning that a VALID or FLUSHED MR can no longer appear on an xprt's MR free list. Thus there is no longer a need to track the MR's registration state in rpcrdma_frwr.
--- include/trace/events/rpcrdma.h | 19 ---- net/sunrpc/xprtrdma/frwr_ops.c | 204 ++++++++++++++++++--------------------- net/sunrpc/xprtrdma/rpc_rdma.c | 2 net/sunrpc/xprtrdma/xprt_rdma.h | 11 -- 4 files changed, 96 insertions(+), 140 deletions(-)
include/trace/events/rpcrdma.h +2 -17
@@ -181,18 +181,6 @@ ), \ TP_ARGS(task, mr, nsegs)) -TRACE_DEFINE_ENUM (FRWR_IS_INVALID ); -TRACE_DEFINE_ENUM (FRWR_IS_VALID ); -TRACE_DEFINE_ENUM (FRWR_FLUSHED_FR ); -TRACE_DEFINE_ENUM (FRWR_FLUSHED_LI ); - -#define xprtrdma_show_frwr_state (x) \ - __print_symbolic(x, \ - { FRWR_IS_INVALID, "INVALID" }, \ - { FRWR_IS_VALID, "VALID" }, \ - { FRWR_FLUSHED_FR, "FLUSHED_FR" }, \ - { FRWR_FLUSHED_LI, "FLUSHED_LI" }) - DECLARE_EVENT_CLASS(xprtrdma_frwr_done, TP_PROTO( const struct ib_wc *wc,
@@ -203,22 +191,19 @@TP_STRUCT__entry (__field (const void *,mr ) - __field(unsigned int, state) __field(unsigned int, status) __field(unsigned int, vendor_err) ),TP_fast_assign ( __entry->mr = container_of(frwr, struct rpcrdma_mr, frwr); - __entry->state = frwr->fr_state; __entry->status = wc->status; __entry->vendor_err = __entry->status ? wc->vendor_err :0 ; ),TP_printk ( -"mr=%p state=%s: %s (%u/0x%x)" , - __entry->mr,xprtrdma_show_frwr_state (__entry->state), -rdma_show_wc_status (__entry->status), +"mr=%p: %s (%u/0x%x)" , + __entry->mr,rdma_show_wc_status (__entry->status), __entry->status, __entry->vendor_err ) );
net/sunrpc/xprtrdma/frwr_ops.c +92 -112
300 lines not on this page · raw message
net/sunrpc/xprtrdma/rpc_rdma.c +1 -1
@@ -1277,7 +1277,7 @@ void rpcrdma_release_rqst(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)* RPC has relinquished all its Send Queue entries. */ if (!list_empty (&req->rl_registered)) -frwr_unmap_sync (r_xprt, &req->rl_registered); +frwr_unmap_sync (r_xprt, req);/* Ensure that any DMA mapped pages associated with * the Send of the RPC Call have been unmapped before
net/sunrpc/xprtrdma/xprt_rdma.h +1 -10
@@ -240,17 +240,9 @@ struct rpcrdma_sendctx {* An external memory region is any buffer or page that is registered * on the fly (ie, not pre-registered). */ -enum rpcrdma_frwr_state { -FRWR_IS_INVALID ,/* ready to be used */ -FRWR_IS_VALID ,/* in use */ -FRWR_FLUSHED_FR ,/* flushed FASTREG WR */ -FRWR_FLUSHED_LI ,/* flushed LOCALINV WR */ -}; -struct rpcrdma_frwr {struct ib_mr *fr_mr;struct ib_cqe fr_cqe; -enum rpcrdma_frwr_state fr_state;struct completion fr_linv_done;union {struct ib_reg_wr fr_regwr;
@@ -567,8 +559,7 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr **mr);int frwr_send (struct rpcrdma_ia *ia,struct rpcrdma_req *req);void frwr_reminv (struct rpcrdma_rep *rep,struct list_head *mrs); -void frwr_unmap_sync (struct rpcrdma_xprt *r_xprt, -struct list_head *mrs); +void frwr_unmap_sync (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req);/* * RPC/RDMA protocol calls - xprtrdma/rpc_rdma.c
PATCH v2 7/19 xprtrdma: Add mechanism to place MRs back on the free list
In reply to Chuck LeverWhen a marshal operation fails, any MRs that were already set up for that request are recycled. Recycling releases MRs and creates new ones, which is expensive.
Since commit f2877623082b ("xprtrdma: Chain Send to FastReg WRs") was merged, recycling FRWRs is unnecessary. This is because before that commit, frwr_map had already posted FAST_REG Work Requests, so ownership of the MRs had already been passed to the NIC and thus dealing with them had to be delayed until they completed.
Since that commit, however, FAST_REG WRs are posted at the same time as the Send WR. This means that if marshaling fails, we are certain the MRs are safe to simply unmap and place back on the free list because neither the Send nor the FAST_REG WRs have been posted yet. The kernel still has ownership of the MRs at this point.
This reduces the total number of MRs that the xprt has to create under heavy workloads and makes the marshaling logic less brittle.
--- net/sunrpc/xprtrdma/frwr_ops.c | 20 ++++++++++++++++++++ net/sunrpc/xprtrdma/rpc_rdma.c | 1 + net/sunrpc/xprtrdma/xprt_rdma.h | 1 + 3 files changed, 22 insertions(+)
net/sunrpc/xprtrdma/frwr_ops.c +20 -0
@@ -144,6 +144,26 @@ void frwr_release_mr(struct rpcrdma_mr *mr)frwr_release_mr (mr); } +/* frwr_reset - Place MRs back on the free list +* @req: request to reset +* +* Used after a failed marshal. For FRWR, this means the MRs +* don't have to be fully released and recreated. +* +* NB: This is safe only as long as none of @req's MRs are +* involved with an ongoing asynchronous FAST_REG or LOCAL_INV +* Work Request. +*/ +void frwr_reset (struct rpcrdma_req *req) +{ +while (!list_empty (&req->rl_registered)) { +struct rpcrdma_mr *mr; + + mr =rpcrdma_mr_pop (&req->rl_registered); +rpcrdma_mr_unmap_and_put (mr); + } +} +/** * frwr_init_mr - Initialize one MR * @ia: interface adapter
net/sunrpc/xprtrdma/rpc_rdma.c +1 -0
@@ -884,6 +884,7 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt, out_err:trace_xprtrdma_marshal_failed (rqst, ret); r_xprt->rx_stats.failed_marshal_count++; +frwr_reset (req);return ret; }
net/sunrpc/xprtrdma/xprt_rdma.h +1 -0
@@ -549,6 +549,7 @@ static inline bool rpcrdma_regbuf_dma_map(struct rpcrdma_xprt *r_xprt,/* Memory registration calls xprtrdma/frwr_ops.c */ bool frwr_is_supported (struct ib_device *device); +void frwr_reset (struct rpcrdma_req *req);int frwr_open (struct rpcrdma_ia *ia,struct rpcrdma_ep *ep);int frwr_init_mr (struct rpcrdma_ia *ia,struct rpcrdma_mr *mr);void frwr_release_mr (struct rpcrdma_mr *mr);
PATCH v2 8/19 xprtrdma: Reduce context switching due to Local Invalidation
In reply to Chuck LeverSince commit ba69cd122ece ("xprtrdma: Remove support for FMR memory registration"), FRWR is the only supported memory registration mode.
We can take advantage of the asynchronous nature of FRWR's LOCAL_INV Work Requests to get rid of the completion wait by having the LOCAL_INV completion handler take care of DMA unmapping MRs and waking the upper layer RPC waiter.
This eliminates two context switches when local invalidation is necessary. As a side benefit, we will no longer need the per-xprt deferred completion work queue.
--- include/trace/events/rpcrdma.h | 1 net/sunrpc/xprtrdma/frwr_ops.c | 103 +++++++++++++++++++++++++++++++++++++++ net/sunrpc/xprtrdma/rpc_rdma.c | 61 +++++++++++------------ net/sunrpc/xprtrdma/verbs.c | 17 ------ net/sunrpc/xprtrdma/xprt_rdma.h | 8 ++- 5 files changed, 137 insertions(+), 53 deletions(-)
include/trace/events/rpcrdma.h +1 -0
@@ -712,6 +712,7 @@DEFINE_FRWR_DONE_EVENT (xprtrdma_wc_fastreg);DEFINE_FRWR_DONE_EVENT (xprtrdma_wc_li);DEFINE_FRWR_DONE_EVENT (xprtrdma_wc_li_wake); +DEFINE_FRWR_DONE_EVENT (xprtrdma_wc_li_done); TRACE_EVENT(xprtrdma_frwr_alloc, TP_PROTO(
net/sunrpc/xprtrdma/frwr_ops.c +102 -1
112 lines not on this page · raw message
net/sunrpc/xprtrdma/rpc_rdma.c +30 -31
85 lines not on this page · raw message
net/sunrpc/xprtrdma/verbs.c +0 -17
@@ -89,14 +89,12 @@*/ static void rpcrdma_xprt_drain (struct rpcrdma_xprt *r_xprt) { -struct rpcrdma_buffer *buf = &r_xprt->rx_buf;struct rpcrdma_ia *ia = &r_xprt->rx_ia;/* Flush Receives, then wait for deferred Reply work * to complete. */ ib_drain_rq (ia->ri_id->qp); -drain_workqueue (buf->rb_completion_wq);/* Deferred Reply processing might have scheduled * local invalidations.
@@ -1056,7 +1054,6 @@ static bool rpcrdma_rep_create(struct rpcrdma_xprt *r_xprt, bool temp) rep->rr_cqe.done = rpcrdma_wc_receive; rep->rr_rxprt = r_xprt; -INIT_WORK (&rep->rr_work, rpcrdma_deferred_completion); rep->rr_recv_wr.next =NULL ; rep->rr_recv_wr.wr_cqe = &rep->rr_cqe; rep->rr_recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov;
@@ -1117,15 +1114,6 @@ int rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)if (rc) goto out; - buf->rb_completion_wq =alloc_workqueue ("rpcrdma-%s" , -WQ_MEM_RECLAIM |WQ_HIGHPRI , -0 , - r_xprt->rx_xprt.address_strings[RPC_DISPLAY_ADDR ]); -if (!buf->rb_completion_wq) { - rc = -ENOMEM ; - goto out; - } -return 0 ; out:rpcrdma_buffer_destroy (buf);
@@ -1199,11 +1187,6 @@ static void rpcrdma_rep_destroy(struct rpcrdma_rep *rep) {cancel_delayed_work_sync (&buf->rb_refresh_worker); -if (buf->rb_completion_wq) { -destroy_workqueue (buf->rb_completion_wq); - buf->rb_completion_wq =NULL ; - } -rpcrdma_sendctxs_destroy (buf);while (!list_empty (&buf->rb_recv_bufs)) {
net/sunrpc/xprtrdma/xprt_rdma.h +4 -4
@@ -202,10 +202,9 @@ struct rpcrdma_rep {bool rr_temp;struct rpcrdma_regbuf *rr_rdmabuf;struct rpcrdma_xprt *rr_rxprt; -struct work_struct rr_work; +struct rpc_rqst *rr_rqst;struct xdr_buf rr_hdrbuf;struct xdr_stream rr_stream; -struct rpc_rqst *rr_rqst;struct list_head rr_list;struct ib_recv_wr rr_recv_wr; };
@@ -240,10 +239,12 @@ struct rpcrdma_sendctx {* An external memory region is any buffer or page that is registered * on the fly (ie, not pre-registered). */ +struct rpcrdma_req ;struct rpcrdma_frwr {struct ib_mr *fr_mr;struct ib_cqe fr_cqe;struct completion fr_linv_done; +struct rpcrdma_req *fr_req;union {struct ib_reg_wr fr_regwr;struct ib_send_wr fr_invwr;
@@ -388,7 +389,6 @@ struct rpcrdma_buffer {u32 rb_bc_srv_max_requests;u32 rb_bc_max_requests; -struct workqueue_struct *rb_completion_wq;struct delayed_work rb_refresh_worker; };
@@ -561,6 +561,7 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt,int frwr_send (struct rpcrdma_ia *ia,struct rpcrdma_req *req);void frwr_reminv (struct rpcrdma_rep *rep,struct list_head *mrs);void frwr_unmap_sync (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req); +void frwr_unmap_async (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req);/* * RPC/RDMA protocol calls - xprtrdma/rpc_rdma.c
@@ -585,7 +586,6 @@ int rpcrdma_prepare_send_sges(struct rpcrdma_xprt *r_xprt,void rpcrdma_reply_handler (struct rpcrdma_rep *rep);void rpcrdma_release_rqst (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req); -void rpcrdma_deferred_completion (struct work_struct *work);static inline void rpcrdma_set_xdrlen (struct xdr_buf *xdr,size_t len) {
PATCH v2 9/19 xprtrdma: Wake RPCs directly in rpcrdma_wc_send path
In reply to Chuck LeverEliminate a context switch in the path that handles RPC wake-ups when a Receive completion has to wait for a Send completion.
--- net/sunrpc/xprtrdma/rpc_rdma.c | 61 +++++++++++++++------------------------ net/sunrpc/xprtrdma/transport.c | 10 ++++++ net/sunrpc/xprtrdma/verbs.c | 3 +- net/sunrpc/xprtrdma/xprt_rdma.h | 12 ++------ 4 files changed, 36 insertions(+), 50 deletions(-)
net/sunrpc/xprtrdma/rpc_rdma.c +23 -38
@@ -511,6 +511,16 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt,return 0 ; } +static void rpcrdma_sendctx_done (struct kref *kref) +{ +struct rpcrdma_req *req = + container_of(kref, struct rpcrdma_req, rl_kref); +struct rpcrdma_rep *rep = req->rl_reply; + +rpcrdma_complete_rqst (rep); + rep->rr_rxprt->rx_stats.reply_waits_for_send++; +} +/** * rpcrdma_sendctx_unmap - DMA-unmap Send buffer * @sc: sendctx containing SGEs to unmap
@@ -520,6 +530,9 @@ void rpcrdma_sendctx_unmap(struct rpcrdma_sendctx *sc) {struct ib_sge *sge; +if (!sc->sc_unmap_count) +return ; +/* The first two SGEs contain the transport header and * the inline buffer. These are always left mapped so * they can be cheaply re-used.
@@ -529,9 +542,7 @@ void rpcrdma_sendctx_unmap(struct rpcrdma_sendctx *sc)ib_dma_unmap_page (sc->sc_device, sge->addr, sge->length,DMA_TO_DEVICE ); -if (test_and_clear_bit (RPCRDMA_REQ_F_TX_RESOURCES , - &sc->sc_req->rl_flags)) -wake_up_bit (&sc->sc_req->rl_flags,RPCRDMA_REQ_F_TX_RESOURCES ); +kref_put (&sc->sc_req->rl_kref, rpcrdma_sendctx_done); }/* Prepare an SGE for the RPC-over-RDMA transport header.
@@ -666,7 +677,7 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt, out: sc->sc_wr.num_sge += sge_no;if (sc->sc_unmap_count) -__set_bit (RPCRDMA_REQ_F_TX_RESOURCES , &req->rl_flags); +kref_get (&req->rl_kref);return true; out_regbuf:
@@ -708,7 +719,7 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt, req->rl_sendctx->sc_wr.num_sge =0 ; req->rl_sendctx->sc_unmap_count =0 ; req->rl_sendctx->sc_req = req; -__clear_bit (RPCRDMA_REQ_F_TX_RESOURCES , &req->rl_flags); +kref_init (&req->rl_kref); ret = -EIO ;if (!rpcrdma_prepare_hdr_sge (r_xprt, req, hdrlen))
@@ -1268,36 +1279,12 @@ void rpcrdma_complete_rqst(struct rpcrdma_rep *rep) goto out; } -/* Ensure that any DMA mapped pages associated with -* the Send of the RPC Call have been unmapped before -* allowing the RPC to complete. This protects argument -* memory not controlled by the RPC client from being -* re-used before we're done with it. -*/ -static void rpcrdma_release_tx (struct rpcrdma_xprt *r_xprt, -struct rpcrdma_req *req) +static void rpcrdma_reply_done (struct kref *kref) { -if (test_bit (RPCRDMA_REQ_F_TX_RESOURCES , &req->rl_flags)) { - r_xprt->rx_stats.reply_waits_for_send++; -out_of_line_wait_on_bit (&req->rl_flags, -RPCRDMA_REQ_F_TX_RESOURCES , - bit_wait, -TASK_UNINTERRUPTIBLE ); - } -} +struct rpcrdma_req *req = + container_of(kref, struct rpcrdma_req, rl_kref); -/** -* rpcrdma_release_rqst - Release hardware resources -* @r_xprt: controlling transport instance -* @req: request with resources to release -* -*/ -void rpcrdma_release_rqst (struct rpcrdma_xprt *r_xprt,struct rpcrdma_req *req) -{ -if (!list_empty (&req->rl_registered)) -frwr_unmap_sync (r_xprt, req); - -rpcrdma_release_tx (r_xprt, req); +rpcrdma_complete_rqst (req->rl_reply); }/**
@@ -1367,13 +1354,11 @@ void rpcrdma_reply_handler(struct rpcrdma_rep *rep)if (rep->rr_wc_flags &IB_WC_WITH_INVALIDATE )frwr_reminv (rep, &req->rl_registered); -if (!list_empty (&req->rl_registered)) { +if (!list_empty (&req->rl_registered))frwr_unmap_async (r_xprt, req);/* LocalInv completion will complete the RPC */ - }else { -rpcrdma_release_tx (r_xprt, req); -rpcrdma_complete_rqst (rep); - } +else +kref_put (&req->rl_kref, rpcrdma_reply_done);return ; out_badversion:
net/sunrpc/xprtrdma/transport.c +9 -1
@@ -618,8 +618,16 @@ static bool rpcrdma_check_regbuf(struct rpcrdma_xprt *r_xprt,struct rpcrdma_xprt *r_xprt =rpcx_to_rdmax (rqst->rq_xprt);struct rpcrdma_req *req =rpcr_to_rdmar (rqst); -rpcrdma_release_rqst (r_xprt, req);trace_xprtrdma_op_free (task, req); + +if (!list_empty (&req->rl_registered)) +frwr_unmap_sync (r_xprt, req); + +/* XXX: If the RPC is completing because of a signal and +* not because a reply was received, we ought to ensure +* that the Send completion has fired, so that memory +* involved with the Send is not still visible to the NIC. +*/ }/**
net/sunrpc/xprtrdma/verbs.c +1 -2
@@ -1462,8 +1462,7 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb)struct ib_send_wr *send_wr = &req->rl_sendctx->sc_wr;int rc; -if (!ep->rep_send_count || -test_bit (RPCRDMA_REQ_F_TX_RESOURCES , &req->rl_flags)) { +if (!ep->rep_send_count ||kref_read (&req->rl_kref) >1 ) { send_wr->send_flags |=IB_SEND_SIGNALED ; ep->rep_send_count = ep->rep_send_batch; }else {
net/sunrpc/xprtrdma/xprt_rdma.h +3 -9
@@ -44,7 +44,8 @@#include <linux/wait.h> /* wait_queue_head_t, etc */ #include <linux/spinlock.h> /* spinlock_t, etc */ -#include <linux/atomic.h> /* atomic_t, etc */ +#include <linux/atomic.h> /* atomic_t, etc */ +#include <linux/kref.h> /* struct kref */ #include <linux/workqueue.h> /* struct work_struct */ #include <rdma/rdma_cm.h> /* RDMA connection api */
@@ -329,17 +330,12 @@ struct rpcrdma_req {struct rpcrdma_regbuf *rl_recvbuf;/* rq_rcv_buf */ struct list_head rl_all; -unsigned long rl_flags; +struct kref rl_kref;struct list_head rl_registered;/* registered segments */ struct rpcrdma_mr_seg rl_segments[RPCRDMA_MAX_SEGS ]; }; -/* rl_flags */ -enum { -RPCRDMA_REQ_F_TX_RESOURCES , -}; -static inline struct rpcrdma_req *rpcr_to_rdmar (const struct rpc_rqst *rqst) {
@@ -584,8 +580,6 @@ int rpcrdma_prepare_send_sges(struct rpcrdma_xprt *r_xprt,void rpcrdma_set_max_header_sizes (struct rpcrdma_xprt *);void rpcrdma_complete_rqst (struct rpcrdma_rep *rep);void rpcrdma_reply_handler (struct rpcrdma_rep *rep); -void rpcrdma_release_rqst (struct rpcrdma_xprt *r_xprt, -struct rpcrdma_req *req);static inline void rpcrdma_set_xdrlen (struct xdr_buf *xdr,size_t len) {
PATCH v2 10/19 xprtrdma: Simplify rpcrdma_rep_create
In reply to Chuck LeverClean up.
Commit 7c8d9e7c8863 ("xprtrdma: Move Receive posting to Receive handler") reduced the number of rpcrdma_rep_create call sites to one. After that commit, the backchannel code no longer invokes it.
Therefore the free list logic added by commit d698c4a02ee0 ("xprtrdma: Fix backchannel allocation of extra rpcrdma_reps") is no longer necessary, and in fact adds some extra overhead that we can do without.
Simply post any newly created reps. They will get added back to the rb_recv_bufs list when they subsequently complete.
--- net/sunrpc/xprtrdma/verbs.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
net/sunrpc/xprtrdma/verbs.c +8 -14
@@ -1036,9 +1036,9 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,return NULL ; } -static bool rpcrdma_rep_create (struct rpcrdma_xprt *r_xprt,bool temp) +static struct rpcrdma_rep *rpcrdma_rep_create (struct rpcrdma_xprt *r_xprt, +bool temp) { -struct rpcrdma_buffer *buf = &r_xprt->rx_buf;struct rpcrdma_rep *rep; rep =kzalloc (sizeof (*rep),GFP_KERNEL );
@@ -1049,9 +1049,9 @@ static bool rpcrdma_rep_create(struct rpcrdma_xprt *r_xprt, bool temp) DMA_FROM_DEVICE, GFP_KERNEL);if (!rep->rr_rdmabuf) goto out_free; +xdr_buf_init (&rep->rr_hdrbuf,rdmab_data (rep->rr_rdmabuf),rdmab_length (rep->rr_rdmabuf)); - rep->rr_cqe.done = rpcrdma_wc_receive; rep->rr_rxprt = r_xprt; rep->rr_recv_wr.next =NULL ;
@@ -1059,16 +1059,12 @@ static bool rpcrdma_rep_create(struct rpcrdma_xprt *r_xprt, bool temp) rep->rr_recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov; rep->rr_recv_wr.num_sge =1 ; rep->rr_temp = temp; - -spin_lock (&buf->rb_lock); -list_add (&rep->rr_list, &buf->rb_recv_bufs); -spin_unlock (&buf->rb_lock); -return true; +return rep; out_free:kfree (rep); out: -return false; +return NULL ; }/**
@@ -1497,7 +1493,6 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb) count =0 ; wr =NULL ;while (needed) { -struct rpcrdma_regbuf *rb;struct rpcrdma_rep *rep;spin_lock (&buf->rb_lock);
@@ -1507,13 +1502,12 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb)list_del (&rep->rr_list);spin_unlock (&buf->rb_lock);if (!rep) { -if (!rpcrdma_rep_create (r_xprt, temp)) + rep =rpcrdma_rep_create (r_xprt, temp); +if (!rep)break ; -continue ; } - rb = rep->rr_rdmabuf; -if (!rpcrdma_regbuf_dma_map (r_xprt, rb)) { +if (!rpcrdma_regbuf_dma_map (r_xprt, rep->rr_rdmabuf)) {rpcrdma_recv_buffer_put (rep);break ; }
PATCH v2 11/19 xprtrdma: Streamline rpcrdma_post_recvs
In reply to Chuck Leverrb_lock is contended between rpcrdma_buffer_create, rpcrdma_buffer_put, and rpcrdma_post_recvs.
Commit e340c2d6ef2a ("xprtrdma: Reduce the doorbell rate (Receive)") causes rpcrdma_post_recvs to take the rb_lock repeatedly when it determines more Receives are needed. Streamline this code path so it takes the lock just once in most cases to build the Receive chain that is about to be posted.
--- net/sunrpc/xprtrdma/verbs.c | 59 ++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-)
net/sunrpc/xprtrdma/verbs.c +38 -21
@@ -1478,11 +1478,13 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb) {struct rpcrdma_buffer *buf = &r_xprt->rx_buf;struct rpcrdma_ep *ep = &r_xprt->rx_ep; -struct ib_recv_wr *wr, *bad_wr; +struct ib_recv_wr *i, *wr, *bad_wr; +struct rpcrdma_rep *rep;int needed, count, rc; rc =0 ; count =0 ; + needed = buf->rb_credits + (buf->rb_bc_srv_max_requests <<1 );if (ep->rep_receive_count > needed) goto out;
@@ -1490,39 +1492,48 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb)if (!temp) needed +=RPCRDMA_MAX_RECV_BATCH ; - count =0 ; +/* fast path: all needed reps can be found on the free list */ wr =NULL ; +spin_lock (&buf->rb_lock);while (needed) { -struct rpcrdma_rep *rep; - -spin_lock (&buf->rb_lock); rep =list_first_entry_or_null (&buf->rb_recv_bufs, struct rpcrdma_rep, rr_list); -if (likely (rep)) -list_del (&rep->rr_list); -spin_unlock (&buf->rb_lock); -if (!rep) { - rep =rpcrdma_rep_create (r_xprt, temp); -if (!rep) -break ; - } +if (!rep) +break ; -if (!rpcrdma_regbuf_dma_map (r_xprt, rep->rr_rdmabuf)) { -rpcrdma_recv_buffer_put (rep); +list_del (&rep->rr_list); + rep->rr_recv_wr.next = wr; + wr = &rep->rr_recv_wr; + --needed; + } +spin_unlock (&buf->rb_lock); + +while (needed) { + rep =rpcrdma_rep_create (r_xprt, temp); +if (!rep)break ; - } -trace_xprtrdma_post_recv (rep->rr_recv_wr.wr_cqe); rep->rr_recv_wr.next = wr; wr = &rep->rr_recv_wr; - ++count; --needed; } -if (!count) +if (!wr) goto out; +for (i = wr; i; i = i->next) { + rep = container_of(i, struct rpcrdma_rep, rr_recv_wr); + +if (!rpcrdma_regbuf_dma_map (r_xprt, rep->rr_rdmabuf)) + goto release_wrs; + +trace_xprtrdma_post_recv (rep->rr_recv_wr.wr_cqe); + ++count; + } + rc =ib_post_recv (r_xprt->rx_ia.ri_id->qp, wr, (const struct ib_recv_wr **)&bad_wr); +out: +trace_xprtrdma_post_recvs (r_xprt, count, rc);if (rc) {for (wr = bad_wr; wr;) {struct rpcrdma_rep *rep;
@@ -1534,6 +1545,12 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb) } } ep->rep_receive_count += count; -out: -trace_xprtrdma_post_recvs (r_xprt, count, rc); +return ; + +release_wrs: +for (i = wr; i;) { + rep = container_of(i, struct rpcrdma_rep, rr_recv_wr); + i = i->next; +rpcrdma_recv_buffer_put (rep); + } }
PATCH v2 12/19 xprtrdma: Refactor chunk encoding
In reply to Chuck LeverClean up.
Move the "not present" case into the individual chunk encoders. This improves code organization and readability.
The reason for the original organization was to optimize for the case where there there are no chunks. The optimization turned out to be inconsequential, so let's err on the side of code readability.
--- net/sunrpc/xprtrdma/rpc_rdma.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-)
net/sunrpc/xprtrdma/rpc_rdma.c +16 -20
@@ -366,6 +366,9 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt,unsigned int pos;int nsegs; +if (rtype == rpcrdma_noch) + goto done; + pos = rqst->rq_snd_buf.head[0 ].iov_len;if (rtype == rpcrdma_areadch) pos =0 ;
@@ -389,7 +392,8 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, nsegs -= mr->mr_nents; }while (nsegs); -return 0 ; +done: +return encode_item_not_present (xdr); }/* Register and XDR encode the Write list. Supports encoding a list
@@ -417,6 +421,9 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt,int nsegs, nchunks;__be32 *segcount; +if (wtype != rpcrdma_writech) + goto done; + seg = req->rl_segments; nsegs = rpcrdma_convert_iovs(r_xprt, &rqst->rq_rcv_buf, rqst->rq_rcv_buf.head[0].iov_len,
@@ -451,7 +458,8 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt,/* Update count of segments in this Write chunk */ *segcount =cpu_to_be32 (nchunks); -return 0 ; +done: +return encode_item_not_present (xdr); }/* Register and XDR encode the Reply chunk. Supports encoding an array
@@ -476,6 +484,9 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt,int nsegs, nchunks;__be32 *segcount; +if (wtype != rpcrdma_replych) +return encode_item_not_present (xdr); + seg = req->rl_segments; nsegs =rpcrdma_convert_iovs (r_xprt, &rqst->rq_rcv_buf,0 , wtype, seg);if (nsegs <0 )
@@ -859,28 +870,13 @@ static bool rpcrdma_prepare_msg_sges(struct rpcrdma_xprt *r_xprt,* send a Call message with a Position Zero Read chunk and a * regular Read chunk at the same time. */ -if (rtype != rpcrdma_noch) { - ret =rpcrdma_encode_read_list (r_xprt, req, rqst, rtype); -if (ret) - goto out_err; - } - ret =encode_item_not_present (xdr); + ret =rpcrdma_encode_read_list (r_xprt, req, rqst, rtype);if (ret) goto out_err; - -if (wtype == rpcrdma_writech) { - ret =rpcrdma_encode_write_list (r_xprt, req, rqst, wtype); -if (ret) - goto out_err; - } - ret =encode_item_not_present (xdr); + ret =rpcrdma_encode_write_list (r_xprt, req, rqst, wtype);if (ret) goto out_err; - -if (wtype != rpcrdma_replych) - ret =encode_item_not_present (xdr); -else - ret =rpcrdma_encode_reply_chunk (r_xprt, req, rqst, wtype); + ret =rpcrdma_encode_reply_chunk (r_xprt, req, rqst, wtype);if (ret) goto out_err;
PATCH v2 13/19 xprtrdma: Remove rpcrdma_req::rl_buffer
In reply to Chuck LeverClean up.
There is only one remaining function, rpcrdma_buffer_put(), that uses this field. Its caller can supply a pointer to the correct rpcrdma_buffer, enabling the removal of an 8-byte pointer field from a frequently-allocated shared data structure.
--- net/sunrpc/xprtrdma/transport.c | 5 ++++- net/sunrpc/xprtrdma/verbs.c | 6 ++---- net/sunrpc/xprtrdma/xprt_rdma.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-)
net/sunrpc/xprtrdma/transport.c +4 -1
@@ -550,8 +550,11 @@ void xprt_rdma_close(struct rpc_xprt *xprt)static void xprt_rdma_free_slot (struct rpc_xprt *xprt,struct rpc_rqst *rqst) { +struct rpcrdma_xprt *r_xprt = + container_of(xprt, struct rpcrdma_xprt, rx_xprt); +memset (rqst,0 ,sizeof (*rqst)); -rpcrdma_buffer_put (rpcr_to_rdmar (rqst)); +rpcrdma_buffer_put (&r_xprt->rx_buf,rpcr_to_rdmar (rqst));rpc_wake_up_next (&xprt->backlog); }
net/sunrpc/xprtrdma/verbs.c +2 -4
@@ -1019,7 +1019,6 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size,if (!req->rl_recvbuf) goto out4; - req->rl_buffer = buffer;INIT_LIST_HEAD (&req->rl_registered);spin_lock (&buffer->rb_lock);list_add (&req->rl_all, &buffer->rb_allreqs);
@@ -1299,13 +1298,12 @@ struct rpcrdma_req */** * rpcrdma_buffer_put - Put request/reply buffers back into pool +* @buffers: buffer pool * @req: object to return * */ -void -rpcrdma_buffer_put (struct rpcrdma_req *req) +void rpcrdma_buffer_put (struct rpcrdma_buffer *buffers,struct rpcrdma_req *req) { -struct rpcrdma_buffer *buffers = req->rl_buffer;struct rpcrdma_rep *rep = req->rl_reply; req->rl_reply =NULL ;
net/sunrpc/xprtrdma/xprt_rdma.h +2 -2
@@ -320,7 +320,6 @@ enum {struct rpcrdma_req {struct list_head rl_list;struct rpc_rqst rl_slot; -struct rpcrdma_buffer *rl_buffer;struct rpcrdma_rep *rl_reply;struct xdr_stream rl_stream;struct xdr_buf rl_hdrbuf;
@@ -499,7 +498,8 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size, }struct rpcrdma_req *rpcrdma_buffer_get (struct rpcrdma_buffer *); -void rpcrdma_buffer_put (struct rpcrdma_req *); +void rpcrdma_buffer_put (struct rpcrdma_buffer *buffers, +struct rpcrdma_req *req);void rpcrdma_recv_buffer_put (struct rpcrdma_rep *); bool rpcrdma_regbuf_realloc(struct rpcrdma_regbuf *rb, size_t size,
PATCH v2 14/19 xprtrdma: Modernize ops->connect
In reply to Chuck LeverAdapt and apply changes that were made to the TCP socket connect code. See the following commits for details on the purpose of these changes:
Commit 7196dbb02ea0 ("SUNRPC: Allow changing of the TCP timeout parameters on the fly") Commit 3851f1cdb2b8 ("SUNRPC: Limit the reconnect backoff timer to the max RPC message timeout") Commit 02910177aede ("SUNRPC: Fix reconnection timeouts")
Some common transport code is moved to xprt.c to satisfy the code duplication police.
--- include/linux/sunrpc/xprt.h | 3 ++ include/trace/events/rpcrdma.h | 31 ++++++++++++++++++ net/sunrpc/sched.c | 1 + net/sunrpc/xprt.c | 32 +++++++++++++++++++ net/sunrpc/xprtrdma/transport.c | 66 ++++++++++++++++++++++++++++++--------- net/sunrpc/xprtrdma/xprt_rdma.h | 1 + net/sunrpc/xprtsock.c | 23 +------------- 7 files changed, 121 insertions(+), 36 deletions(-)
include/linux/sunrpc/xprt.h +3 -0
@@ -334,6 +334,9 @@ struct xprt_class {*/ struct rpc_xprt *xprt_create_transport (struct xprt_create *args);void xprt_connect (struct rpc_task *task); +unsigned long xprt_reconnect_delay (const struct rpc_xprt *xprt); +void xprt_reconnect_backoff (struct rpc_xprt *xprt, +unsigned long init_to);void xprt_reserve (struct rpc_task *task);void xprt_retry_reserve (struct rpc_task *task);int xprt_reserve_xprt (struct rpc_xprt *xprt,struct rpc_task *task);
include/trace/events/rpcrdma.h +31 -0
@@ -375,6 +375,37 @@DEFINE_RXPRT_EVENT (xprtrdma_op_close);DEFINE_RXPRT_EVENT (xprtrdma_op_connect); +TRACE_EVENT (xprtrdma_op_set_cto, +TP_PROTO ( + const struct rpcrdma_xprt *r_xprt, + unsigned long connect, + unsigned long reconnect + ), + +TP_ARGS (r_xprt, connect, reconnect), + +TP_STRUCT__entry ( + __field(const void *, r_xprt) + __field(unsigned long, connect) + __field(unsigned long, reconnect) + __string(addr, rpcrdma_addrstr(r_xprt)) +__string (port,rpcrdma_portstr (r_xprt)) + ), + +TP_fast_assign ( + __entry->r_xprt = r_xprt; + __entry->connect = connect; + __entry->reconnect = reconnect; + __assign_str(addr, rpcrdma_addrstr(r_xprt)); + __assign_str(port, rpcrdma_portstr(r_xprt)); + ), + +TP_printk ("peer=[%s]:%s r_xprt=%p: connect=%lu reconnect=%lu" , +__get_str (addr),__get_str (port), __entry->r_xprt, + __entry->connect /HZ , __entry->reconnect /HZ + ) +); + TRACE_EVENT(xprtrdma_qp_event, TP_PROTO( const struct rpcrdma_xprt *r_xprt,
net/sunrpc/sched.c +1 -0
@@ -58,6 +58,7 @@*/ struct workqueue_struct *rpciod_workqueue__read_mostly ;struct workqueue_struct *xprtiod_workqueue__read_mostly ; +EXPORT_SYMBOL_GPL (xprtiod_workqueue);unsigned long rpc_task_timeout (const struct rpc_task *task)
net/sunrpc/xprt.c +32 -0
@@ -850,6 +850,38 @@ void xprt_connect(struct rpc_task *task)xprt_release_write (xprt, task); } +/** +* xprt_reconnect_delay - compute the wait before scheduling a connect +* @xprt: transport instance +* +*/ +unsigned long xprt_reconnect_delay (const struct rpc_xprt *xprt) +{ +unsigned long start, now = jiffies; + + start = xprt->stat.connect_start + xprt->reestablish_timeout; +if (time_after (start, now)) +return start - now; +return 0 ; +} +EXPORT_SYMBOL_GPL (xprt_reconnect_delay); + +/** +* xprt_reconnect_backoff - compute the new re-establish timeout +* @xprt: transport instance +* @init_to: initial reestablish timeout +* +*/ +void xprt_reconnect_backoff (struct rpc_xprt *xprt,unsigned long init_to) +{ + xprt->reestablish_timeout <<=1 ; +if (xprt->reestablish_timeout > xprt->max_reconnect_timeout) + xprt->reestablish_timeout = xprt->max_reconnect_timeout; +if (xprt->reestablish_timeout < init_to) + xprt->reestablish_timeout = init_to; +} +EXPORT_SYMBOL_GPL (xprt_reconnect_backoff); +enum xprt_xid_rb_cmp {XID_RB_EQUAL ,XID_RB_LEFT ,
net/sunrpc/xprtrdma/transport.c +51 -15
102 lines not on this page · raw message
net/sunrpc/xprtrdma/xprt_rdma.h +1 -0
@@ -432,6 +432,7 @@ struct rpcrdma_xprt {struct rpcrdma_ep rx_ep;struct rpcrdma_buffer rx_buf;struct delayed_work rx_connect_worker; +struct rpc_timeout rx_timeout;struct rpcrdma_stats rx_stats; };
net/sunrpc/xprtsock.c +2 -21
@@ -2402,25 +2402,6 @@ static void xs_tcp_setup_socket(struct work_struct *work)xprt_wake_pending_tasks (xprt, status); } -static unsigned long xs_reconnect_delay (const struct rpc_xprt *xprt) -{ -unsigned long start, now = jiffies; - - start = xprt->stat.connect_start + xprt->reestablish_timeout; -if (time_after (start, now)) -return start - now; -return 0 ; -} - -static void xs_reconnect_backoff (struct rpc_xprt *xprt) -{ - xprt->reestablish_timeout <<=1 ; -if (xprt->reestablish_timeout > xprt->max_reconnect_timeout) - xprt->reestablish_timeout = xprt->max_reconnect_timeout; -if (xprt->reestablish_timeout <XS_TCP_INIT_REEST_TO ) - xprt->reestablish_timeout =XS_TCP_INIT_REEST_TO ; -} -/** * xs_connect - connect a socket to a remote endpoint * @xprt: pointer to transport structure
@@ -2450,8 +2431,8 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task)/* Start by resetting any existing state */ xs_reset_transport (transport); - delay =xs_reconnect_delay (xprt); -xs_reconnect_backoff (xprt); + delay =xprt_reconnect_delay (xprt); +xprt_reconnect_backoff (xprt,XS_TCP_INIT_REEST_TO ); }else dprintk ("RPC: xs_connect scheduled xprt %p\n" , xprt);
PATCH v2 15/19 NFS4: Add a trace event to record invalid CB sequence IDs
In reply to Chuck LeverHelp debug NFSv4 callback failures.
--- fs/nfs/callback_proc.c | 28 ++++++++++++++++++++-------- fs/nfs/nfs4trace.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 8 deletions(-)
fs/nfs/callback_proc.c +20 -8
@@ -414,27 +414,39 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp, validate_seqid(const struct nfs4_slot_table *tbl, const struct nfs4_slot *slot, const struct cb_sequenceargs * args) { + __be32 ret; + + ret =cpu_to_be32 (NFS4ERR_BADSLOT );if (args->csa_slotid > tbl->server_highest_slotid) - return htonl(NFS4ERR_BADSLOT); + goto out_err;/* Replay */ if (args->csa_sequenceid == slot->seq_nr) { + ret =cpu_to_be32 (NFS4ERR_DELAY );if (nfs4_test_locked_slot (tbl, slot->slot_nr)) -return htonl (NFS4ERR_DELAY ); + goto out_err; +/* Signal process_op to set this error on next op */ + ret =cpu_to_be32 (NFS4ERR_RETRY_UNCACHED_REP );if (args->csa_cachethis ==0 ) -return htonl (NFS4ERR_RETRY_UNCACHED_REP ); + goto out_err;/* Liar! We never allowed you to set csa_cachethis != 0 */ -return htonl (NFS4ERR_SEQ_FALSE_RETRY ); + ret =cpu_to_be32 (NFS4ERR_SEQ_FALSE_RETRY ); + goto out_err; }/* Note: wraparound relies on seq_nr being of type u32 */ -if (likely (args->csa_sequenceid == slot->seq_nr +1 )) -return htonl (NFS4_OK ); -/* Misordered request */ -return htonl (NFS4ERR_SEQ_MISORDERED ); + ret =cpu_to_be32 (NFS4ERR_SEQ_MISORDERED ); +if (args->csa_sequenceid != slot->seq_nr +1 ) + goto out_err; + +return cpu_to_be32 (NFS4_OK ); + +out_err: +trace_nfs4_cb_seqid_err (args, ret); +return ret; }/*
fs/nfs/nfs4trace.h +38 -0
@@ -490,6 +490,44 @@ __entry->highest_slotid ) ); + +TRACE_EVENT (nfs4_cb_seqid_err, +TP_PROTO ( + const struct cb_sequenceargs *args, + __be32 status + ), +TP_ARGS (args, status), + +TP_STRUCT__entry ( + __field(unsigned int, session) + __field(unsigned int, slot_nr) + __field(unsigned int, seq_nr) + __field(unsigned int, highest_slotid) + __field(unsigned int, cachethis) +__field (int, error) + ), + +TP_fast_assign ( + __entry->session = nfs_session_id_hash(&args->csa_sessionid); + __entry->slot_nr = args->csa_slotid; + __entry->seq_nr = args->csa_sequenceid; + __entry->highest_slotid = args->csa_highestslotid; + __entry->cachethis = args->csa_cachethis; + __entry->error = -be32_to_cpu(status); + ), + +TP_printk ( +"error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " +"highest_slotid=%u" , + __entry->error, +show_nfsv4_errors (__entry->error), + __entry->session, + __entry->slot_nr, + __entry->seq_nr, + __entry->highest_slotid + ) +); +#endif /* CONFIG_NFS_V4_1 */ TRACE_EVENT(nfs4_setup_sequence,
PATCH v2 16/19 NFS: Fix show_nfs_errors macros again
In reply to Chuck LeverI noticed that NFS status values stopped working again.
trace_print_symbols_seq() takes an unsigned long. Passing a negative errno or negative NFSERR value just confuses it, and since we're using C macros here and not static inline functions, all bets are off due to implicit type casting.
Straight-line the calling conventions so that error codes are stored in the trace record as positive values in an unsigned long field.
It's often the case that an error value that is positive is a byte count but when it's negative, it's an error (e.g. nfs4_write). Fix those cases so that the value that is eventually stored in the error field is a positive NFS status or errno, or zero.
--- fs/nfs/nfs4trace.h | 120 ++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-)
fs/nfs/nfs4trace.h +60 -60
@@ -156,7 +156,7 @@TRACE_DEFINE_ENUM (NFS4ERR_XDEV );#define show_nfsv4_errors (error) \ - __print_symbolic(-(error), \ + __print_symbolic(error, \ { NFS4_OK, "OK" }, \/* Mapped by nfs4_stat_to_errno() */ \ { EPERM, "EPERM" }, \
@@ -348,7 +348,7 @@TP_STRUCT__entry ( __string(dstaddr, clp->cl_hostname) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(
@@ -357,7 +357,7 @@ ),TP_printk ( -"error=%d (%s) dstaddr=%s" , +"error=%lu (%s) dstaddr=%s" , __entry->error,show_nfsv4_errors (__entry->error), __get_str(dstaddr)
@@ -420,7 +420,7 @@ __field(unsigned int, highest_slotid) __field(unsigned int, target_highest_slotid) __field(unsigned int, status_flags) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(
@@ -435,7 +435,7 @@ __entry->error = res->sr_status; ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u target_highest_slotid=%u " "status_flags=%u (%s)", __entry->error,
@@ -467,7 +467,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(
@@ -476,11 +476,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),
@@ -504,7 +504,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(
@@ -513,11 +513,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),
@@ -572,18 +572,18 @@TP_STRUCT__entry (__field (u32 ,op ) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->op = op; - __entry->error = -error; + __entry->error = error; ),TP_printk ( -"operation %d: nfs status %d (%s)" , - __entry->op, - __entry->error,show_nfsv4_errors (__entry->error) +"error=%lu (%s) operation %d:" , + __entry->error,show_nfsv4_errors (__entry->error), + __entry->op ) );
@@ -597,7 +597,7 @@TP_ARGS (ctx, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(unsigned int, fmode) __field(dev_t, dev)
@@ -615,7 +615,7 @@const struct nfs4_state *state = ctx->state;const struct inode *inode =NULL ; - __entry->error = error; + __entry->error = -error; __entry->flags = flags; __entry->fmode = (__force unsigned int )ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev;
@@ -647,7 +647,7 @@ ), TP_printk( - "error=%d (%s) flags=%d (%s) fmode=%s " + "error=%lu (%s) flags=%d (%s) fmode=%s " "fileid=%02x:%02x:%llu fhandle=0x%08x " "name=%02x:%02x:%llu/%s stateid=%d:0x%08x " "openstateid=%d:0x%08x",
@@ -733,7 +733,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, fmode) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),
@@ -753,7 +753,7 @@ ), TP_printk( - "error=%d (%s) fmode=%s fileid=%02x:%02x:%llu " + "error=%lu (%s) fmode=%s fileid=%02x:%02x:%llu " "fhandle=0x%08x openstateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),
@@ -795,7 +795,7 @@TP_ARGS (request, state, cmd, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(int, cmd) __field(char, type) __field(loff_t, start)
@@ -825,7 +825,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error,
@@ -865,7 +865,7 @@TP_ARGS (request, state, lockstateid, cmd, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(int, cmd) __field(char, type) __field(loff_t, start)
@@ -901,7 +901,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x lockstateid=%d:0x%08x", __entry->error,
@@ -970,7 +970,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u32, fhandle) -__field (int, error) + __field(unsigned long, error)__field (int, stateid_seq)__field (u32, stateid_hash) ),
@@ -986,7 +986,7 @@ ), TP_printk( - "error=%d (%s) dev=%02x:%02x fhandle=0x%08x " + "error=%lu (%s) dev=%02x:%02x fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1007,7 +1007,7 @@TP_ARGS (state, lsp, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid)
@@ -1029,7 +1029,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1064,7 +1064,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, dir) __string(name, name->name) ),
@@ -1072,12 +1072,12 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = -error;__assign_str (name, name->name); ), TP_printk( - "error=%d (%s) name=%02x:%02x:%llu/%s", + "error=%lu (%s) name=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -1114,7 +1114,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u64, ino) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(
@@ -1124,7 +1124,7 @@ ), TP_printk( - "error=%d (%s) inode=%02x:%02x:%llu", + "error=%lu (%s) inode=%02x:%02x:%llu", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -1145,7 +1145,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, olddir) __string(oldname, oldname->name) __field(u64, newdir)
@@ -1162,7 +1162,7 @@ ), TP_printk( - "error=%d (%s) oldname=%02x:%02x:%llu/%s " + "error=%lu (%s) oldname=%02x:%02x:%llu/%s " "newname=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1187,18 +1187,18 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -1238,7 +1238,7 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),
@@ -1255,7 +1255,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1295,7 +1295,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, valid) -__field (int , error) +__field (unsigned long , error) ), TP_fast_assign(
@@ -1307,7 +1307,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "valid=%s", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1342,7 +1342,7 @@TP_ARGS (clp, fhandle, inode, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid)
@@ -1363,7 +1363,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1397,7 +1397,7 @@TP_ARGS (clp, fhandle, inode, stateid, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid)
@@ -1424,7 +1424,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1460,7 +1460,7 @@TP_ARGS (name, len, id, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(u32, id)__dynamic_array (char, name, len >0 ? len +1 :1 ) ),
@@ -1475,8 +1475,8 @@ ),TP_printk ( -"error=%d id=%u name=%s" , - __entry->error, +"error=%lu (%s) id=%u name=%s" , + __entry->error,show_nfsv4_errors (__entry->error), __entry->id,__get_str (name) )
@@ -1509,7 +1509,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),
@@ -1523,7 +1523,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =
@@ -1531,7 +1531,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1569,7 +1569,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),
@@ -1583,7 +1583,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =
@@ -1591,7 +1591,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1630,7 +1630,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(
@@ -1644,7 +1644,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu", __entry->error, show_nfsv4_errors(__entry->error),
@@ -1694,7 +1694,7 @@ __field(u32, iomode) __field(u64, offset) __field(u64, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) __field(int, layoutstateid_seq)
@@ -1727,7 +1727,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "iomode=%s offset=%llu count=%llu stateid=%d:0x%08x " "layoutstateid=%d:0x%08x", __entry->error,
Re: [PATCH v2 16/19] NFS: Fix show_nfs_errors macros again
Quoted 8 lines · Chuck Lever
I noticed that NFS status values stopped working again.
trace_print_symbols_seq()takes an unsigned long. Passing a negative errno or negative NFSERR value just confuses it, and since we're using C macros here and not static inline functions, all bets are off due to implicit type casting.
Quoted 8 lines
Straight-line the calling conventions so that error codes are stored in the trace record as positive values in an unsigned long field.
It's often the case that an error value that is positive is a byte count but when it's negative, it's an error (e.g.
nfs4_write). Fix those cases so that the value that is eventually stored in the error field is a positive NFS status or errno, or zero.
Hi Chuck,
To clarify, so on error case, we no longer going be seeing a negative value so error=-5 (EIO) would be error=5 (EIO)? I have always relied on searching for "error=-" thru the trace_pipe log for errors. Do we really need to change that?
Quoted 506 lines
Signed-off-by Chuck Lever <[email protected]>--- fs/nfs/nfs4trace.h | 120 ++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-)fs/nfs/nfs4trace.h +60
-60@@ -156,7 +156,7 @@TRACE_DEFINE_ENUM (NFS4ERR_XDEV );#define show_nfsv4_errors (error) \ - __print_symbolic(-(error), \ + __print_symbolic(error, \ { NFS4_OK, "OK" }, \/* Mapped by nfs4_stat_to_errno() */ \ { EPERM, "EPERM" }, \@@ -348,7 +348,7 @@TP_STRUCT__entry ( __string(dstaddr, clp->cl_hostname) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -357,7 +357,7 @@ ),TP_printk ( -"error=%d (%s) dstaddr=%s" , +"error=%lu (%s) dstaddr=%s" , __entry->error,show_nfsv4_errors (__entry->error), __get_str(dstaddr)@@ -420,7 +420,7 @@ __field(unsigned int, highest_slotid) __field(unsigned int, target_highest_slotid) __field(unsigned int, status_flags) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -435,7 +435,7 @@ __entry->error = res->sr_status; ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u target_highest_slotid=%u " "status_flags=%u (%s)", __entry->error,@@ -467,7 +467,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -476,11 +476,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -504,7 +504,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -513,11 +513,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -572,18 +572,18 @@TP_STRUCT__entry (__field (u32 ,op ) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->op = op; - __entry->error = -error; + __entry->error = error; ),TP_printk ( -"operation %d: nfs status %d (%s)" , - __entry->op, - __entry->error,show_nfsv4_errors (__entry->error) +"error=%lu (%s) operation %d:" , + __entry->error,show_nfsv4_errors (__entry->error), + __entry->op ) );@@ -597,7 +597,7 @@TP_ARGS (ctx, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(unsigned int, fmode) __field(dev_t, dev)@@ -615,7 +615,7 @@const struct nfs4_state *state = ctx->state;const struct inode *inode =NULL ; - __entry->error = error; + __entry->error = -error; __entry->flags = flags; __entry->fmode = (__force unsigned int )ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev;@@ -647,7 +647,7 @@ ), TP_printk( - "error=%d (%s) flags=%d (%s) fmode=%s " + "error=%lu (%s) flags=%d (%s) fmode=%s " "fileid=%02x:%02x:%llu fhandle=0x%08x " "name=%02x:%02x:%llu/%s stateid=%d:0x%08x " "openstateid=%d:0x%08x",@@ -733,7 +733,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, fmode) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -753,7 +753,7 @@ ), TP_printk( - "error=%d (%s) fmode=%s fileid=%02x:%02x:%llu " + "error=%lu (%s) fmode=%s fileid=%02x:%02x:%llu " "fhandle=0x%08x openstateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -795,7 +795,7 @@ TP_ARGS(request, state, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -825,7 +825,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error,@@ -865,7 +865,7 @@ TP_ARGS(request, state, lockstateid, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -901,7 +901,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x lockstateid=%d:0x%08x", __entry->error,@@ -970,7 +970,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u32, fhandle) -__field (int, error) + __field(unsigned long, error)__field (int, stateid_seq)__field (u32, stateid_hash) ),@@ -986,7 +986,7 @@ ), TP_printk( - "error=%d (%s) dev=%02x:%02x fhandle=0x%08x " + "error=%lu (%s) dev=%02x:%02x fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1007,7 +1007,7 @@ TP_ARGS(state, lsp, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1029,7 +1029,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1064,7 +1064,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, dir) __string(name, name->name) ),@@ -1072,12 +1072,12 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = -error;__assign_str (name, name->name); ), TP_printk( - "error=%d (%s) name=%02x:%02x:%llu/%s", + "error=%lu (%s) name=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1114,7 +1114,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u64, ino) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1124,7 +1124,7 @@ ), TP_printk( - "error=%d (%s) inode=%02x:%02x:%llu", + "error=%lu (%s) inode=%02x:%02x:%llu", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1145,7 +1145,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, olddir) __string(oldname, oldname->name) __field(u64, newdir)@@ -1162,7 +1162,7 @@ ), TP_printk( - "error=%d (%s) oldname=%02x:%02x:%llu/%s " + "error=%lu (%s) oldname=%02x:%02x:%llu/%s " "newname=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1187,18 +1187,18 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1238,7 +1238,7 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1255,7 +1255,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1295,7 +1295,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, valid) -__field (int , error) +__field (unsigned long , error) ), TP_fast_assign(@@ -1307,7 +1307,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "valid=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1342,7 +1342,7 @@ TP_ARGS(clp, fhandle, inode, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1363,7 +1363,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1397,7 +1397,7 @@ TP_ARGS(clp, fhandle, inode, stateid, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1424,7 +1424,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1460,7 +1460,7 @@TP_ARGS (name, len, id, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(u32, id)__dynamic_array (char, name, len >0 ? len +1 :1 ) ),@@ -1475,8 +1475,8 @@ ),TP_printk ( -"error=%d id=%u name=%s" , - __entry->error, +"error=%lu (%s) id=%u name=%s" , + __entry->error,show_nfsv4_errors (__entry->error), __entry->id,__get_str (name) )@@ -1509,7 +1509,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1523,7 +1523,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1531,7 +1531,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1569,7 +1569,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1583,7 +1583,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1591,7 +1591,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1630,7 +1630,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1644,7 +1644,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu", __entry->error, show_nfsv4_errors(__entry->error),@@ -1694,7 +1694,7 @@ __field(u32, iomode) __field(u64, offset) __field(u64, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) __field(int, layoutstateid_seq)@@ -1727,7 +1727,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "iomode=%s offset=%llu count=%llu stateid=%d:0x%08x " "layoutstateid=%d:0x%08x", __entry->error,
Re: [PATCH v2 16/19] NFS: Fix show_nfs_errors macros again
Quoted 22 lines · Olga Kornievskaia
Quoted 8 lines · Chuck Lever
I noticed that NFS status values stopped working again.
trace_print_symbols_seq()takes an unsigned long. Passing a negative errno or negative NFSERR value just confuses it, and since we're using C macros here and not static inline functions, all bets are off due to implicit type casting.Quoted 8 lines
Straight-line the calling conventions so that error codes are stored in the trace record as positive values in an unsigned long field.
It's often the case that an error value that is positive is a byte count but when it's negative, it's an error (e.g.
nfs4_write). Fix those cases so that the value that is eventually stored in the error field is a positive NFS status or errno, or zero.
Quoted 6 lines
Hi Chuck,
To clarify, so on error case, we no longer going be seeing a negative value so error=-5 (EIO) would be error=5 (EIO)? I have always relied on searching for "error=-" thru the
trace_pipelog for errors. Do we really need to change that?
error= will be zero or a positive errno/status code. If the trace point has a count= or task->tk_status= you can see the byte count when error=0.
So now the search will be for anything that has "error=" but is not "error=0".
Quoted 499 lines
Quoted 499 lines
Signed-off-by Chuck Lever <[email protected]>---
fs/nfs/nfs4trace.h| 120 ++++++++++++++++++++++++++--------------------------1 file changed, 60 insertions(+), 60 deletions(-)fs/nfs/nfs4trace.h +59
-59@@ -156,7 +156,7 @@TRACE_DEFINE_ENUM (NFS4ERR_XDEV );#define show_nfsv4_errors (error) \ - __print_symbolic(-(error), \ + __print_symbolic(error, \ { NFS4_OK, "OK" }, \/* Mapped by nfs4_stat_to_errno() */ \ { EPERM, "EPERM" }, \@@ -348,7 +348,7 @@TP_STRUCT__entry ( __string(dstaddr, clp->cl_hostname) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -357,7 +357,7 @@ ),TP_printk ( -"error=%d (%s) dstaddr=%s" , +"error=%lu (%s) dstaddr=%s" , __entry->error,show_nfsv4_errors (__entry->error), __get_str(dstaddr)@@ -420,7 +420,7 @@ __field(unsigned int, highest_slotid) __field(unsigned int, target_highest_slotid) __field(unsigned int, status_flags) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -435,7 +435,7 @@ __entry->error = res->sr_status; ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u target_highest_slotid=%u " "status_flags=%u (%s)", __entry->error,@@ -467,7 +467,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -476,11 +476,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -504,7 +504,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -513,11 +513,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -572,18 +572,18 @@TP_STRUCT__entry (__field (u32 ,op ) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->op = op; - __entry->error = -error; + __entry->error = error; ),TP_printk ( -"operation %d: nfs status %d (%s)" , - __entry->op, - __entry->error,show_nfsv4_errors (__entry->error) +"error=%lu (%s) operation %d:" , + __entry->error,show_nfsv4_errors (__entry->error), + __entry->op ) );@@ -597,7 +597,7 @@TP_ARGS (ctx, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(unsigned int, fmode) __field(dev_t, dev)@@ -615,7 +615,7 @@const struct nfs4_state *state = ctx->state;const struct inode *inode =NULL ; - __entry->error = error; + __entry->error = -error; __entry->flags = flags; __entry->fmode = (__force unsigned int )ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev;@@ -647,7 +647,7 @@ ), TP_printk( - "error=%d (%s) flags=%d (%s) fmode=%s " + "error=%lu (%s) flags=%d (%s) fmode=%s " "fileid=%02x:%02x:%llu fhandle=0x%08x " "name=%02x:%02x:%llu/%s stateid=%d:0x%08x " "openstateid=%d:0x%08x",@@ -733,7 +733,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, fmode) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -753,7 +753,7 @@ ), TP_printk( - "error=%d (%s) fmode=%s fileid=%02x:%02x:%llu " + "error=%lu (%s) fmode=%s fileid=%02x:%02x:%llu " "fhandle=0x%08x openstateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -795,7 +795,7 @@ TP_ARGS(request, state, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -825,7 +825,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error,@@ -865,7 +865,7 @@ TP_ARGS(request, state, lockstateid, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -901,7 +901,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x lockstateid=%d:0x%08x", __entry->error,@@ -970,7 +970,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u32, fhandle) -__field (int, error) + __field(unsigned long, error)__field (int, stateid_seq)__field (u32, stateid_hash) ),@@ -986,7 +986,7 @@ ), TP_printk( - "error=%d (%s) dev=%02x:%02x fhandle=0x%08x " + "error=%lu (%s) dev=%02x:%02x fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1007,7 +1007,7 @@ TP_ARGS(state, lsp, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1029,7 +1029,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1064,7 +1064,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, dir) __string(name, name->name) ),@@ -1072,12 +1072,12 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = -error;__assign_str (name, name->name); ), TP_printk( - "error=%d (%s) name=%02x:%02x:%llu/%s", + "error=%lu (%s) name=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1114,7 +1114,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u64, ino) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1124,7 +1124,7 @@ ), TP_printk( - "error=%d (%s) inode=%02x:%02x:%llu", + "error=%lu (%s) inode=%02x:%02x:%llu", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1145,7 +1145,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, olddir) __string(oldname, oldname->name) __field(u64, newdir)@@ -1162,7 +1162,7 @@ ), TP_printk( - "error=%d (%s) oldname=%02x:%02x:%llu/%s " + "error=%lu (%s) oldname=%02x:%02x:%llu/%s " "newname=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1187,18 +1187,18 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1238,7 +1238,7 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1255,7 +1255,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1295,7 +1295,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, valid) -__field (int , error) +__field (unsigned long , error) ), TP_fast_assign(@@ -1307,7 +1307,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "valid=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1342,7 +1342,7 @@ TP_ARGS(clp, fhandle, inode, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1363,7 +1363,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1397,7 +1397,7 @@ TP_ARGS(clp, fhandle, inode, stateid, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1424,7 +1424,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1460,7 +1460,7 @@TP_ARGS (name, len, id, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(u32, id)__dynamic_array (char, name, len >0 ? len +1 :1 ) ),@@ -1475,8 +1475,8 @@ ),TP_printk ( -"error=%d id=%u name=%s" , - __entry->error, +"error=%lu (%s) id=%u name=%s" , + __entry->error,show_nfsv4_errors (__entry->error), __entry->id,__get_str (name) )@@ -1509,7 +1509,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1523,7 +1523,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1531,7 +1531,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1569,7 +1569,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1583,7 +1583,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1591,7 +1591,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1630,7 +1630,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1644,7 +1644,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu", __entry->error, show_nfsv4_errors(__entry->error),@@ -1694,7 +1694,7 @@ __field(u32, iomode) __field(u64, offset) __field(u64, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) __field(int, layoutstateid_seq)@@ -1727,7 +1727,7 @@ ),
Quoted 6 lines
fs/nfs/nfs4trace.h line 1733
Quoted 6 lines
fs/nfs/nfs4trace.h +1
-1TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "iomode=%s offset=%llu count=%llu stateid=%d:0x%08x " "layoutstateid=%d:0x%08x", __entry->error,
--
Chuck Lever
Re: [PATCH v2 16/19] NFS: Fix show_nfs_errors macros again
Quoted 30 lines · Chuck Lever
Quoted 23 lines · Olga Kornievskaia
Quoted 8 lines · Chuck Lever
I noticed that NFS status values stopped working again.
trace_print_symbols_seq()takes an unsigned long. Passing a negative errno or negative NFSERR value just confuses it, and since we're using C macros here and not static inline functions, all bets are off due to implicit type casting.Quoted 8 lines
Straight-line the calling conventions so that error codes are stored in the trace record as positive values in an unsigned long field.
It's often the case that an error value that is positive is a byte count but when it's negative, it's an error (e.g.
nfs4_write). Fix those cases so that the value that is eventually stored in the error field is a positive NFS status or errno, or zero.Quoted 6 lines
Hi Chuck,
To clarify, so on error case, we no longer going be seeing a negative value so error=-5 (EIO) would be error=5 (EIO)? I have always relied on searching for "error=-" thru the
trace_pipelog for errors. Do we really need to change that?
Quoted 6 lines
error= will be zero or a positive errno/status code. If the trace point has a count= or task->tk_status= you can see the byte count when error=0.
So now the search will be for anything that has "error=" but is not "error=0".
Unfortunately, "error=" but not "error=0" isn't easily translated into the vi search... ("error=-" was more convenient).
Can we keep the value of the error= negative but change it to the positive value for the show_nfsv4_errors()?
Quoted 511 lines
Quoted 499 lines
Quoted 499 lines
Signed-off-by Chuck Lever <[email protected]>---
fs/nfs/nfs4trace.h| 120 ++++++++++++++++++++++++++--------------------------1 file changed, 60 insertions(+), 60 deletions(-)fs/nfs/nfs4trace.h +59
-59@@ -156,7 +156,7 @@TRACE_DEFINE_ENUM (NFS4ERR_XDEV );#define show_nfsv4_errors (error) \ - __print_symbolic(-(error), \ + __print_symbolic(error, \ { NFS4_OK, "OK" }, \/* Mapped by nfs4_stat_to_errno() */ \ { EPERM, "EPERM" }, \@@ -348,7 +348,7 @@TP_STRUCT__entry ( __string(dstaddr, clp->cl_hostname) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -357,7 +357,7 @@ ),TP_printk ( -"error=%d (%s) dstaddr=%s" , +"error=%lu (%s) dstaddr=%s" , __entry->error,show_nfsv4_errors (__entry->error), __get_str(dstaddr)@@ -420,7 +420,7 @@ __field(unsigned int, highest_slotid) __field(unsigned int, target_highest_slotid) __field(unsigned int, status_flags) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -435,7 +435,7 @@ __entry->error = res->sr_status; ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u target_highest_slotid=%u " "status_flags=%u (%s)", __entry->error,@@ -467,7 +467,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -476,11 +476,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -504,7 +504,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -513,11 +513,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -572,18 +572,18 @@TP_STRUCT__entry (__field (u32 ,op ) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->op = op; - __entry->error = -error; + __entry->error = error; ),TP_printk ( -"operation %d: nfs status %d (%s)" , - __entry->op, - __entry->error,show_nfsv4_errors (__entry->error) +"error=%lu (%s) operation %d:" , + __entry->error,show_nfsv4_errors (__entry->error), + __entry->op ) );@@ -597,7 +597,7 @@TP_ARGS (ctx, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(unsigned int, fmode) __field(dev_t, dev)@@ -615,7 +615,7 @@const struct nfs4_state *state = ctx->state;const struct inode *inode =NULL ; - __entry->error = error; + __entry->error = -error; __entry->flags = flags; __entry->fmode = (__force unsigned int )ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev;@@ -647,7 +647,7 @@ ), TP_printk( - "error=%d (%s) flags=%d (%s) fmode=%s " + "error=%lu (%s) flags=%d (%s) fmode=%s " "fileid=%02x:%02x:%llu fhandle=0x%08x " "name=%02x:%02x:%llu/%s stateid=%d:0x%08x " "openstateid=%d:0x%08x",@@ -733,7 +733,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, fmode) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -753,7 +753,7 @@ ), TP_printk( - "error=%d (%s) fmode=%s fileid=%02x:%02x:%llu " + "error=%lu (%s) fmode=%s fileid=%02x:%02x:%llu " "fhandle=0x%08x openstateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -795,7 +795,7 @@ TP_ARGS(request, state, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -825,7 +825,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error,@@ -865,7 +865,7 @@ TP_ARGS(request, state, lockstateid, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -901,7 +901,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x lockstateid=%d:0x%08x", __entry->error,@@ -970,7 +970,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u32, fhandle) -__field (int, error) + __field(unsigned long, error)__field (int, stateid_seq)__field (u32, stateid_hash) ),@@ -986,7 +986,7 @@ ), TP_printk( - "error=%d (%s) dev=%02x:%02x fhandle=0x%08x " + "error=%lu (%s) dev=%02x:%02x fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1007,7 +1007,7 @@ TP_ARGS(state, lsp, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1029,7 +1029,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1064,7 +1064,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, dir) __string(name, name->name) ),@@ -1072,12 +1072,12 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = -error;__assign_str (name, name->name); ), TP_printk( - "error=%d (%s) name=%02x:%02x:%llu/%s", + "error=%lu (%s) name=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1114,7 +1114,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u64, ino) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1124,7 +1124,7 @@ ), TP_printk( - "error=%d (%s) inode=%02x:%02x:%llu", + "error=%lu (%s) inode=%02x:%02x:%llu", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1145,7 +1145,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, olddir) __string(oldname, oldname->name) __field(u64, newdir)@@ -1162,7 +1162,7 @@ ), TP_printk( - "error=%d (%s) oldname=%02x:%02x:%llu/%s " + "error=%lu (%s) oldname=%02x:%02x:%llu/%s " "newname=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1187,18 +1187,18 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1238,7 +1238,7 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1255,7 +1255,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1295,7 +1295,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, valid) -__field (int , error) +__field (unsigned long , error) ), TP_fast_assign(@@ -1307,7 +1307,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "valid=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1342,7 +1342,7 @@ TP_ARGS(clp, fhandle, inode, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1363,7 +1363,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1397,7 +1397,7 @@ TP_ARGS(clp, fhandle, inode, stateid, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1424,7 +1424,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1460,7 +1460,7 @@TP_ARGS (name, len, id, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(u32, id)__dynamic_array (char, name, len >0 ? len +1 :1 ) ),@@ -1475,8 +1475,8 @@ ),TP_printk ( -"error=%d id=%u name=%s" , - __entry->error, +"error=%lu (%s) id=%u name=%s" , + __entry->error,show_nfsv4_errors (__entry->error), __entry->id,__get_str (name) )@@ -1509,7 +1509,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1523,7 +1523,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1531,7 +1531,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1569,7 +1569,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1583,7 +1583,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1591,7 +1591,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1630,7 +1630,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1644,7 +1644,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu", __entry->error, show_nfsv4_errors(__entry->error),@@ -1694,7 +1694,7 @@ __field(u32, iomode) __field(u64, offset) __field(u64, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) __field(int, layoutstateid_seq)@@ -1727,7 +1727,7 @@ ),Quoted 6 lines
fs/nfs/nfs4trace.h line 1733
Quoted 6 lines
fs/nfs/nfs4trace.h +1
-1TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "iomode=%s offset=%llu count=%llu stateid=%d:0x%08x " "layoutstateid=%d:0x%08x", __entry->error,--
Chuck Lever
Re: [PATCH v2 16/19] NFS: Fix show_nfs_errors macros again
Quoted 39 lines · Olga Kornievskaia
Quoted 34 lines · Chuck Lever
Quoted 23 lines · Olga Kornievskaia
Quoted 8 lines · Chuck Lever
I noticed that NFS status values stopped working again.
trace_print_symbols_seq()takes an unsigned long. Passing a negative errno or negative NFSERR value just confuses it, and since we're using C macros here and not static inline functions, all bets are off due to implicit type casting.Quoted 8 lines
Straight-line the calling conventions so that error codes are stored in the trace record as positive values in an unsigned long field.
It's often the case that an error value that is positive is a byte count but when it's negative, it's an error (e.g.
nfs4_write). Fix those cases so that the value that is eventually stored in the error field is a positive NFS status or errno, or zero.Quoted 6 lines
Hi Chuck,
To clarify, so on error case, we no longer going be seeing a negative value so error=-5 (EIO) would be error=5 (EIO)? I have always relied on searching for "error=-" thru the
trace_pipelog for errors. Do we really need to change that?error= will be zero or a positive errno/status code. If the trace point has a count= or task->tk_status= you can see the byte count when error=0.
Quoted 8 lines
Quoted 2 lines
So now the search will be for anything that has "error=" but is not "error=0".
Unfortunately, "error=" but not "error=0" isn't easily translated into the vi search... ("error=-" was more convenient).
Can we keep the value of the error= negative but change it to the positive value for the
show_nfsv4_errors()?
The patch strips out implicit and explicit type casts which makes the trace points less brittle.
You could just as easily use awk or grep instead, or switch to using trace-cmd, which has more efficient mechanisms for filtering by value.
I can try storing the value as an unsigned long, and printing it as negative (signed) long, so that zero is still displayed as "error=0". But I think some people might find this confusing.
Quoted 499 lines
Quoted 499 lines
Quoted 499 lines
Quoted 499 lines
Signed-off-by Chuck Lever <[email protected]>---
fs/nfs/nfs4trace.h| 120 ++++++++++++++++++++++++++--------------------------1 file changed, 60 insertions(+), 60 deletions(-)fs/nfs/nfs4trace.h +59
-59@@ -156,7 +156,7 @@TRACE_DEFINE_ENUM (NFS4ERR_XDEV );#define show_nfsv4_errors (error) \ - __print_symbolic(-(error), \ + __print_symbolic(error, \ { NFS4_OK, "OK" }, \/* Mapped by nfs4_stat_to_errno() */ \ { EPERM, "EPERM" }, \@@ -348,7 +348,7 @@TP_STRUCT__entry ( __string(dstaddr, clp->cl_hostname) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -357,7 +357,7 @@ ),TP_printk ( -"error=%d (%s) dstaddr=%s" , +"error=%lu (%s) dstaddr=%s" , __entry->error,show_nfsv4_errors (__entry->error), __get_str(dstaddr)@@ -420,7 +420,7 @@ __field(unsigned int, highest_slotid) __field(unsigned int, target_highest_slotid) __field(unsigned int, status_flags) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -435,7 +435,7 @@ __entry->error = res->sr_status; ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u target_highest_slotid=%u " "status_flags=%u (%s)", __entry->error,@@ -467,7 +467,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -476,11 +476,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -504,7 +504,7 @@ __field(unsigned int, seq_nr) __field(unsigned int, highest_slotid) __field(unsigned int, cachethis) - __field(int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -513,11 +513,11 @@ __entry->seq_nr = args->csa_sequenceid; __entry->highest_slotid = args->csa_highestslotid; __entry->cachethis = args->csa_cachethis; - __entry->error = -be32_to_cpu (status); + __entry->error =be32_to_cpu (status); ), TP_printk( - "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u " + "error=%lu (%s) session=0x%08x slot_nr=%u seq_nr=%u " "highest_slotid=%u", __entry->error, show_nfsv4_errors(__entry->error),@@ -572,18 +572,18 @@TP_STRUCT__entry (__field (u32 ,op ) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->op = op; - __entry->error = -error; + __entry->error = error; ),TP_printk ( -"operation %d: nfs status %d (%s)" , - __entry->op, - __entry->error,show_nfsv4_errors (__entry->error) +"error=%lu (%s) operation %d:" , + __entry->error,show_nfsv4_errors (__entry->error), + __entry->op ) );@@ -597,7 +597,7 @@TP_ARGS (ctx, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(unsigned int, fmode) __field(dev_t, dev)@@ -615,7 +615,7 @@const struct nfs4_state *state = ctx->state;const struct inode *inode =NULL ; - __entry->error = error; + __entry->error = -error; __entry->flags = flags; __entry->fmode = (__force unsigned int )ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev;@@ -647,7 +647,7 @@ ), TP_printk( - "error=%d (%s) flags=%d (%s) fmode=%s " + "error=%lu (%s) flags=%d (%s) fmode=%s " "fileid=%02x:%02x:%llu fhandle=0x%08x " "name=%02x:%02x:%llu/%s stateid=%d:0x%08x " "openstateid=%d:0x%08x",@@ -733,7 +733,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, fmode) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -753,7 +753,7 @@ ), TP_printk( - "error=%d (%s) fmode=%s fileid=%02x:%02x:%llu " + "error=%lu (%s) fmode=%s fileid=%02x:%02x:%llu " "fhandle=0x%08x openstateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -795,7 +795,7 @@ TP_ARGS(request, state, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -825,7 +825,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error,@@ -865,7 +865,7 @@ TP_ARGS(request, state, lockstateid, cmd, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (int, cmd)__field (char, type) __field(loff_t, start)@@ -901,7 +901,7 @@ ), TP_printk( - "error=%d (%s) cmd=%s:%s range=%lld:%lld " + "error=%lu (%s) cmd=%s:%s range=%lld:%lld " "fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x lockstateid=%d:0x%08x", __entry->error,@@ -970,7 +970,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u32, fhandle) -__field (int, error) + __field(unsigned long, error)__field (int, stateid_seq)__field (u32, stateid_hash) ),@@ -986,7 +986,7 @@ ), TP_printk( - "error=%d (%s) dev=%02x:%02x fhandle=0x%08x " + "error=%lu (%s) dev=%02x:%02x fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1007,7 +1007,7 @@ TP_ARGS(state, lsp, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1029,7 +1029,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1064,7 +1064,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, dir) __string(name, name->name) ),@@ -1072,12 +1072,12 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = -error;__assign_str (name, name->name); ), TP_printk( - "error=%d (%s) name=%02x:%02x:%llu/%s", + "error=%lu (%s) name=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1114,7 +1114,7 @@TP_STRUCT__entry (__field (dev_t ,dev )__field (u64, ino) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1124,7 +1124,7 @@ ), TP_printk( - "error=%d (%s) inode=%02x:%02x:%llu", + "error=%lu (%s) inode=%02x:%02x:%llu", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1145,7 +1145,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, olddir) __string(oldname, oldname->name) __field(u64, newdir)@@ -1162,7 +1162,7 @@ ), TP_printk( - "error=%d (%s) oldname=%02x:%02x:%llu/%s " + "error=%lu (%s) oldname=%02x:%02x:%llu/%s " "newname=%02x:%02x:%llu/%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1187,18 +1187,18 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) -__field (int, error) + __field(unsigned long, error) ),TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x", __entry->error, show_nfsv4_errors(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev),@@ -1238,7 +1238,7 @@ __field(dev_t, dev) __field(u32, fhandle) __field(u64, fileid) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1255,7 +1255,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1295,7 +1295,7 @@ __field(u32, fhandle) __field(u64, fileid) __field(unsigned int, valid) -__field (int , error) +__field (unsigned long , error) ), TP_fast_assign(@@ -1307,7 +1307,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "valid=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1342,7 +1342,7 @@ TP_ARGS(clp, fhandle, inode, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1363,7 +1363,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1397,7 +1397,7 @@ TP_ARGS(clp, fhandle, inode, stateid, error),TP_STRUCT__entry ( -__field (int ,error ) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(u64, fileid)@@ -1424,7 +1424,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "stateid=%d:0x%08x dstaddr=%s", __entry->error, show_nfsv4_errors(__entry->error),@@ -1460,7 +1460,7 @@TP_ARGS (name, len, id, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(u32, id)__dynamic_array (char, name, len >0 ? len +1 :1 ) ),@@ -1475,8 +1475,8 @@ ),TP_printk ( -"error=%d id=%u name=%s" , - __entry->error, +"error=%lu (%s) id=%u name=%s" , + __entry->error,show_nfsv4_errors (__entry->error), __entry->id,__get_str (name) )@@ -1509,7 +1509,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1523,7 +1523,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1531,7 +1531,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1569,7 +1569,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) ),@@ -1583,7 +1583,7 @@ __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); __entry->offset = hdr->args.offset; __entry->count = hdr->args.count; - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->stateid_seq =be32_to_cpu (state->stateid.seqid); __entry->stateid_hash =@@ -1591,7 +1591,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu stateid=%d:0x%08x", __entry->error, show_nfsv4_errors(__entry->error),@@ -1630,7 +1630,7 @@ __field(u64, fileid) __field(loff_t, offset) __field(size_t, count) -__field (int, error) + __field(unsigned long, error) ), TP_fast_assign(@@ -1644,7 +1644,7 @@ ), TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "offset=%lld count=%zu", __entry->error, show_nfsv4_errors(__entry->error),@@ -1694,7 +1694,7 @@ __field(u32, iomode) __field(u64, offset) __field(u64, count) - __field(int, error) + __field(unsigned long, error) __field(int, stateid_seq) __field(u32, stateid_hash) __field(int, layoutstateid_seq)@@ -1727,7 +1727,7 @@ ),
Quoted 9 lines
Quoted 9 lines
Quoted 6 lines
fs/nfs/nfs4trace.h line 1733
Quoted 6 lines
fs/nfs/nfs4trace.h +1
-1TP_printk( - "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "iomode=%s offset=%llu count=%llu stateid=%d:0x%08x " "layoutstateid=%d:0x%08x", __entry->error,--
Chuck Lever
--
Chuck Lever
PATCH v2 17/19 NFS: Display symbolic status code names in trace log
In reply to Chuck LeverFor improved readability, add nfs_show_status() call-sites in the generic NFS trace points so that the symbolic status code name is displayed.
--- fs/nfs/nfstrace.h | 74 +++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 34 deletions(-)
fs/nfs/nfstrace.h +40 -34
@@ -83,7 +83,7 @@ TP_ARGS(inode, error),TP_STRUCT__entry ( - __field(int, error) +__field (unsigned long ,error )__field (dev_t, dev)__field (u32, fhandle) __field(unsigned char, type)
@@ -96,7 +96,7 @@TP_fast_assign ( const struct nfs_inode *nfsi = NFS_I(inode); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->dev = inode->i_sb->s_dev; __entry->fileid = nfsi->fileid; __entry->fhandle =nfs_fhandle_hash (&nfsi->fh);
@@ -108,10 +108,10 @@ ), TP_printk( - "error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " + "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "type=%u (%s) version=%llu size=%lld " "cache_validity=%lu (%s) nfs_flags=%ld (%s)", - __entry->error, + __entry->error, nfs_show_status(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev), (unsigned long long)__entry->fileid, __entry->fhandle,
@@ -219,7 +219,7 @@TP_ARGS (dir, dentry, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(dev_t, dev) __field(u64, dir)
@@ -229,14 +229,14 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = error <0 ? -error :0 ; __entry->flags = flags;__assign_str (name, dentry->d_name.name); ), TP_printk( - "error=%d flags=%u (%s) name=%02x:%02x:%llu/%s", - __entry->error, + "error=%lu (%s) flags=%u (%s) name=%02x:%02x:%llu/%s", + __entry->error, nfs_show_status(__entry->error), __entry->flags, show_lookup_flags(__entry->flags), MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -323,7 +323,7 @@TP_ARGS (dir, ctx, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(unsigned int, fmode) __field(dev_t, dev)
@@ -332,7 +332,7 @@ ), TP_fast_assign( - __entry->error = error; + __entry->error = -error; __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); __entry->flags = flags;
@@ -341,9 +341,9 @@ ), TP_printk( - "error=%d flags=%u (%s) fmode=%s " + "error=%lu (%s) flags=%u (%s) fmode=%s " "name=%02x:%02x:%llu/%s", - __entry->error, + __entry->error, nfs_show_status(__entry->error), __entry->flags, show_open_flags(__entry->flags), show_fmode_flags(__entry->fmode),
@@ -397,7 +397,7 @@TP_ARGS (dir, dentry, flags, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(unsigned int, flags) __field(dev_t, dev) __field(u64, dir)
@@ -405,7 +405,7 @@ ), TP_fast_assign( - __entry->error = error; + __entry->error = -error; __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); __entry->flags = flags;
@@ -413,8 +413,8 @@ ), TP_printk( - "error=%d flags=%u (%s) name=%02x:%02x:%llu/%s", - __entry->error, + "error=%lu (%s) flags=%u (%s) name=%02x:%02x:%llu/%s", + __entry->error, nfs_show_status(__entry->error), __entry->flags, show_open_flags(__entry->flags), MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -469,7 +469,7 @@ TP_ARGS(dir, dentry, error),TP_STRUCT__entry ( - __field(int, error) +__field (unsigned long ,error )__field (dev_t, dev)__field (u64, dir) __string(name, dentry->d_name.name)
@@ -478,13 +478,13 @@TP_fast_assign ( __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = error <0 ? -error :0 ;__assign_str (name, dentry->d_name.name); ),TP_printk ( -"error=%d name=%02x:%02x:%llu/%s" , - __entry->error, +"error=%lu (%s) name=%02x:%02x:%llu/%s" , + __entry->error,nfs_show_status (__entry->error),MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->dir, __get_str(name)
@@ -557,7 +557,7 @@TP_ARGS (inode, dir, dentry, error),TP_STRUCT__entry ( - __field(int, error) + __field(unsigned long, error) __field(dev_t, dev) __field(u64, fileid) __field(u64, dir)
@@ -568,13 +568,13 @@ __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = error <0 ? -error :0 ;__assign_str (name, dentry->d_name.name); ), TP_printk( - "error=%d fileid=%02x:%02x:%llu name=%02x:%02x:%llu/%s", - __entry->error, + "error=%lu (%s) fileid=%02x:%02x:%llu name=%02x:%02x:%llu/%s", + __entry->error, nfs_show_status(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev), __entry->fileid, MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -642,7 +642,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, old_dir) __string(old_name, old_dentry->d_name.name) __field(u64, new_dir)
@@ -651,17 +651,17 @@TP_fast_assign ( __entry->dev = old_dir->i_sb->s_dev; + __entry->error = -error; __entry->old_dir =NFS_FILEID (old_dir); __entry->new_dir =NFS_FILEID (new_dir); - __entry->error = error;__assign_str (old_name, old_dentry->d_name.name);__assign_str (new_name, new_dentry->d_name.name); ), TP_printk( - "error=%d old_name=%02x:%02x:%llu/%s " + "error=%lu (%s) old_name=%02x:%02x:%llu/%s " "new_name=%02x:%02x:%llu/%s", - __entry->error, + __entry->error, nfs_show_status(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev), (unsigned long long)__entry->old_dir, __get_str(old_name),
@@ -697,7 +697,7 @@TP_STRUCT__entry (__field (dev_t ,dev ) -__field (int, error) + __field(unsigned long, error)__field (u64, dir) __dynamic_array(char, name, data->args.name.len + 1) ),
@@ -707,15 +707,15 @@size_t len = data->args.name.len; __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); - __entry->error = error; + __entry->error = -error;memcpy (__get_str (name), data->args.name.name, len);__get_str (name)[len] =0 ; ),TP_printk ( -"error=%d name=%02x:%02x:%llu/%s" , - __entry->error, +"error=%lu (%s) name=%02x:%02x:%llu/%s" , + __entry->error,nfs_show_status (__entry->error),MAJOR (__entry->dev),MINOR (__entry->dev), (unsigned long long )__entry->dir, __get_str(name)
@@ -974,6 +974,8 @@TRACE_DEFINE_ENUM (NFSERR_NOENT );TRACE_DEFINE_ENUM (NFSERR_IO );TRACE_DEFINE_ENUM (NFSERR_NXIO ); +TRACE_DEFINE_ENUM (ECHILD ); +TRACE_DEFINE_ENUM (NFSERR_EAGAIN );TRACE_DEFINE_ENUM (NFSERR_ACCES );TRACE_DEFINE_ENUM (NFSERR_EXIST );TRACE_DEFINE_ENUM (NFSERR_XDEV );
@@ -985,6 +987,7 @@TRACE_DEFINE_ENUM (NFSERR_NOSPC );TRACE_DEFINE_ENUM (NFSERR_ROFS );TRACE_DEFINE_ENUM (NFSERR_MLINK ); +TRACE_DEFINE_ENUM (NFSERR_OPNOTSUPP );TRACE_DEFINE_ENUM (NFSERR_NAMETOOLONG );TRACE_DEFINE_ENUM (NFSERR_NOTEMPTY );TRACE_DEFINE_ENUM (NFSERR_DQUOT );
@@ -1007,6 +1010,8 @@ { NFSERR_NOENT, "NOENT" }, \ { NFSERR_IO, "IO" }, \ { NFSERR_NXIO, "NXIO" }, \ + { ECHILD, "CHILD" }, \ + { NFSERR_EAGAIN, "AGAIN" }, \ { NFSERR_ACCES, "ACCES" }, \ { NFSERR_EXIST, "EXIST" }, \ { NFSERR_XDEV, "XDEV" }, \
@@ -1018,6 +1023,7 @@ { NFSERR_NOSPC, "NOSPC" }, \ { NFSERR_ROFS, "ROFS" }, \ { NFSERR_MLINK, "MLINK" }, \ + { NFSERR_OPNOTSUPP, "OPNOTSUPP" }, \ { NFSERR_NAMETOOLONG, "NAMETOOLONG" }, \ { NFSERR_NOTEMPTY, "NOTEMPTY" }, \ { NFSERR_DQUOT, "DQUOT" }, \
@@ -1041,7 +1047,7 @@TP_ARGS (error),TP_STRUCT__entry ( -__field (int, error) +__field (unsigned long ,error ) ), TP_fast_assign(
@@ -1049,7 +1055,7 @@ ),TP_printk ( -"error=%d (%s)" , +"error=%lu (%s)" , __entry->error,nfs_show_status (__entry->error) ) );
PATCH v2 18/19 NFS: Update symbolic flags displayed by trace events
In reply to Chuck LeverClean up.
--- fs/nfs/nfstrace.h | 98 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 14 deletions(-)
fs/nfs/nfstrace.h +84 -14
@@ -11,6 +11,16 @@#include <linux/tracepoint.h> #include <linux/iversion.h> +TRACE_DEFINE_ENUM (DT_UNKNOWN ); +TRACE_DEFINE_ENUM (DT_FIFO ); +TRACE_DEFINE_ENUM (DT_CHR ); +TRACE_DEFINE_ENUM (DT_DIR ); +TRACE_DEFINE_ENUM (DT_BLK ); +TRACE_DEFINE_ENUM (DT_REG ); +TRACE_DEFINE_ENUM (DT_LNK ); +TRACE_DEFINE_ENUM (DT_SOCK ); +TRACE_DEFINE_ENUM (DT_WHT ); +#define nfs_show_file_type (ftype) \ __print_symbolic(ftype, \ { DT_UNKNOWN, "UNKNOWN" }, \
@@ -23,25 +33,57 @@ { DT_SOCK, "SOCK" }, \ { DT_WHT, "WHT" }) +TRACE_DEFINE_ENUM (NFS_INO_INVALID_DATA ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_ATIME ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_ACCESS ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_ACL ); +TRACE_DEFINE_ENUM (NFS_INO_REVAL_PAGECACHE ); +TRACE_DEFINE_ENUM (NFS_INO_REVAL_FORCED ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_LABEL ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_CHANGE ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_CTIME ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_MTIME ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_SIZE ); +TRACE_DEFINE_ENUM (NFS_INO_INVALID_OTHER ); +#define nfs_show_cache_validity (v) \ __print_flags(v, "|", \ - { NFS_INO_INVALID_ATTR, "INVALID_ATTR" }, \ { NFS_INO_INVALID_DATA, "INVALID_DATA" }, \ { NFS_INO_INVALID_ATIME, "INVALID_ATIME" }, \ { NFS_INO_INVALID_ACCESS, "INVALID_ACCESS" }, \ { NFS_INO_INVALID_ACL, "INVALID_ACL" }, \ { NFS_INO_REVAL_PAGECACHE, "REVAL_PAGECACHE" }, \ { NFS_INO_REVAL_FORCED, "REVAL_FORCED" }, \ - { NFS_INO_INVALID_LABEL, "INVALID_LABEL" }) + { NFS_INO_INVALID_LABEL, "INVALID_LABEL" }, \ + { NFS_INO_INVALID_CHANGE, "INVALID_CHANGE" }, \ + { NFS_INO_INVALID_CTIME, "INVALID_CTIME" }, \ + { NFS_INO_INVALID_MTIME, "INVALID_MTIME" }, \ + { NFS_INO_INVALID_SIZE, "INVALID_SIZE" }, \ + { NFS_INO_INVALID_OTHER, "INVALID_OTHER" }) + +TRACE_DEFINE_ENUM (NFS_INO_ADVISE_RDPLUS ); +TRACE_DEFINE_ENUM (NFS_INO_STALE ); +TRACE_DEFINE_ENUM (NFS_INO_ACL_LRU_SET ); +TRACE_DEFINE_ENUM (NFS_INO_INVALIDATING ); +TRACE_DEFINE_ENUM (NFS_INO_FSCACHE ); +TRACE_DEFINE_ENUM (NFS_INO_FSCACHE_LOCK ); +TRACE_DEFINE_ENUM (NFS_INO_LAYOUTCOMMIT ); +TRACE_DEFINE_ENUM (NFS_INO_LAYOUTCOMMITTING ); +TRACE_DEFINE_ENUM (NFS_INO_LAYOUTSTATS ); +TRACE_DEFINE_ENUM (NFS_INO_ODIRECT );#define nfs_show_nfsi_flags (v) \ __print_flags(v, "|", \ { 1 << NFS_INO_ADVISE_RDPLUS, "ADVISE_RDPLUS" }, \ { 1 << NFS_INO_STALE, "STALE" }, \ + { 1 << NFS_INO_ACL_LRU_SET, "ACL_LRU_SET" }, \ { 1 << NFS_INO_INVALIDATING, "INVALIDATING" }, \ { 1 << NFS_INO_FSCACHE, "FSCACHE" }, \ + { 1 << NFS_INO_FSCACHE_LOCK, "FSCACHE_LOCK" }, \ { 1 << NFS_INO_LAYOUTCOMMIT, "NEED_LAYOUTCOMMIT" }, \ - { 1 << NFS_INO_LAYOUTCOMMITTING, "LAYOUTCOMMIT" }) + { 1 << NFS_INO_LAYOUTCOMMITTING, "LAYOUTCOMMIT" }, \ + { 1 << NFS_INO_LAYOUTSTATS, "LAYOUTSTATS" }, \ + { 1 << NFS_INO_ODIRECT, "ODIRECT" }) DECLARE_EVENT_CLASS(nfs_inode_event, TP_PROTO(
@@ -110,7 +152,7 @@ TP_printk( "error=%lu (%s) fileid=%02x:%02x:%llu fhandle=0x%08x " "type=%u (%s) version=%llu size=%lld " - "cache_validity=%lu (%s) nfs_flags=%ld (%s)", + "cache_validity=0x%lx (%s) nfs_flags=0x%lx (%s)", __entry->error, nfs_show_status(__entry->error), MAJOR(__entry->dev), MINOR(__entry->dev), (unsigned long long)__entry->fileid,
@@ -260,15 +302,43 @@DEFINE_NFS_LOOKUP_EVENT (nfs_lookup_revalidate_enter);DEFINE_NFS_LOOKUP_EVENT_DONE (nfs_lookup_revalidate_exit); +TRACE_DEFINE_ENUM (O_WRONLY ); +TRACE_DEFINE_ENUM (O_RDWR ); +TRACE_DEFINE_ENUM (O_CREAT ); +TRACE_DEFINE_ENUM (O_EXCL ); +TRACE_DEFINE_ENUM (O_NOCTTY ); +TRACE_DEFINE_ENUM (O_TRUNC ); +TRACE_DEFINE_ENUM (O_APPEND ); +TRACE_DEFINE_ENUM (O_NONBLOCK ); +TRACE_DEFINE_ENUM (O_DSYNC ); +TRACE_DEFINE_ENUM (O_DIRECT ); +TRACE_DEFINE_ENUM (O_LARGEFILE ); +TRACE_DEFINE_ENUM (O_DIRECTORY ); +TRACE_DEFINE_ENUM (O_NOFOLLOW ); +TRACE_DEFINE_ENUM (O_NOATIME ); +TRACE_DEFINE_ENUM (O_CLOEXEC ); +#define show_open_flags (flags) \ - __print_flags((unsigned long)flags, "|", \ + __print_flags(flags, "|", \ + { O_WRONLY, "O_WRONLY" }, \ + { O_RDWR, "O_RDWR" }, \ { O_CREAT, "O_CREAT" }, \ { O_EXCL, "O_EXCL" }, \ + { O_NOCTTY, "O_NOCTTY" }, \ { O_TRUNC, "O_TRUNC" }, \ { O_APPEND, "O_APPEND" }, \ + { O_NONBLOCK, "O_NONBLOCK" }, \ { O_DSYNC, "O_DSYNC" }, \ { O_DIRECT, "O_DIRECT" }, \ - { O_DIRECTORY, "O_DIRECTORY" }) + { O_LARGEFILE, "O_LARGEFILE" }, \ + { O_DIRECTORY, "O_DIRECTORY" }, \ + { O_NOFOLLOW, "O_NOFOLLOW" }, \ + { O_NOATIME, "O_NOATIME" }, \ + { O_CLOEXEC, "O_CLOEXEC" }) + +TRACE_DEFINE_ENUM (FMODE_READ ); +TRACE_DEFINE_ENUM (FMODE_WRITE ); +TRACE_DEFINE_ENUM (FMODE_EXEC );#define show_fmode_flags (mode) \ __print_flags(mode, "|", \
@@ -286,7 +356,7 @@TP_ARGS (dir, ctx, flags),TP_STRUCT__entry ( - __field(unsigned int, flags) + __field(unsigned long, flags) __field(unsigned int, fmode) __field(dev_t, dev) __field(u64, dir)
@@ -302,7 +372,7 @@ ), TP_printk( - "flags=%u (%s) fmode=%s name=%02x:%02x:%llu/%s", + "flags=%lu (%s) fmode=%s name=%02x:%02x:%llu/%s", __entry->flags, show_open_flags(__entry->flags), show_fmode_flags(__entry->fmode),
@@ -324,7 +394,7 @@TP_STRUCT__entry (__field (unsigned long ,error ) - __field(unsigned int, flags) + __field(unsigned long, flags) __field(unsigned int, fmode)__field (dev_t, dev) __field(u64, dir)
@@ -341,7 +411,7 @@ ), TP_printk( - "error=%lu (%s) flags=%u (%s) fmode=%s " + "error=%lu (%s) flags=%lu (%s) fmode=%s " "name=%02x:%02x:%llu/%s", __entry->error, nfs_show_status(__entry->error), __entry->flags,
@@ -363,7 +433,7 @@ TP_ARGS(dir, dentry, flags),TP_STRUCT__entry ( -__field (unsigned int ,flags ) +__field (unsigned long ,flags )__field (dev_t, dev)__field (u64, dir) __string(name, dentry->d_name.name)
@@ -377,7 +447,7 @@ ), TP_printk( - "flags=%u (%s) name=%02x:%02x:%llu/%s", + "flags=%lu (%s) name=%02x:%02x:%llu/%s", __entry->flags, show_open_flags(__entry->flags), MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -398,7 +468,7 @@TP_STRUCT__entry (__field (unsigned long ,error ) - __field(unsigned int, flags) + __field(unsigned long, flags)__field (dev_t, dev)__field (u64, dir) __string(name, dentry->d_name.name)
@@ -413,7 +483,7 @@ ), TP_printk( - "error=%lu (%s) flags=%u (%s) name=%02x:%02x:%llu/%s", + "error=%lu (%s) flags=%lu (%s) name=%02x:%02x:%llu/%s", __entry->error, nfs_show_status(__entry->error), __entry->flags, show_open_flags(__entry->flags),
PATCH v2 19/19 NFS: Record task, client ID, and XID in xdr_status trace points
In reply to Chuck LeverWhen triggering an nfs_xdr_status trace point, record the task ID and XID of the failing RPC to better pinpoint the problem.
This feels like a bit of a layering violation.
--- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 2 +- fs/nfs/nfs4trace.h | 15 +++++++++++++-- fs/nfs/nfs4xdr.c | 2 +- fs/nfs/nfstrace.h | 15 +++++++++++++-- 5 files changed, 29 insertions(+), 7 deletions(-)
fs/nfs/nfs2xdr.c +1 -1
@@ -151,7 +151,7 @@ static int decode_stat(struct xdr_stream *xdr, enum nfs_stat *status)return 0 ; out_status: *status =be32_to_cpup (p); -trace_nfs_xdr_status ((int )*status); +trace_nfs_xdr_status (xdr, (int )*status);return 0 ; }
fs/nfs/nfs3xdr.c +1 -1
@@ -343,7 +343,7 @@ static int decode_nfsstat3(struct xdr_stream *xdr, enum nfs_stat *status)return 0 ; out_status: *status =be32_to_cpup (p); -trace_nfs_xdr_status ((int )*status); +trace_nfs_xdr_status (xdr, (int )*status);return 0 ; }
fs/nfs/nfs4trace.h +13 -2
@@ -564,24 +564,35 @@TRACE_EVENT (nfs4_xdr_status,TP_PROTO ( + const struct xdr_stream *xdr, u32 op, int error ), -TP_ARGS (op, error), +TP_ARGS (xdr, op, error),TP_STRUCT__entry ( + __field(unsigned int, task_id) + __field(unsigned int, client_id) + __field(u32, xid) __field(u32, op) __field(unsigned long, error) ),TP_fast_assign ( + const struct rpc_rqst *rqstp = xdr->rqst; + const struct rpc_task *task = rqstp->rq_task; + + __entry->task_id = task->tk_pid; + __entry->client_id = task->tk_client->cl_clid; + __entry->xid = be32_to_cpu(rqstp->rq_xid); __entry->op = op; __entry->error = error; ),TP_printk ( -"error=%lu (%s) operation %d:" , +"task:%u@%d xid=0x%08x error=%lu (%s) operation=%d" , + __entry->task_id, __entry->client_id, __entry->xid, __entry->error,show_nfsv4_errors (__entry->error), __entry->op )
fs/nfs/nfs4xdr.c +1 -1
@@ -3187,7 +3187,7 @@ static bool __decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected,return true; out_status: nfserr =be32_to_cpup (p); -trace_nfs4_xdr_status (opnum, nfserr); +trace_nfs4_xdr_status (xdr, opnum, nfserr); *nfs_retval =nfs4_stat_to_errno (nfserr);return true; out_bad_operation:
fs/nfs/nfstrace.h +13 -2
@@ -1111,21 +1111,32 @@TRACE_EVENT (nfs_xdr_status,TP_PROTO ( + const struct xdr_stream *xdr, int error ), -TP_ARGS (error), +TP_ARGS (xdr, error),TP_STRUCT__entry ( + __field(unsigned int, task_id) + __field(unsigned int, client_id) + __field(u32, xid) __field(unsigned long, error) ),TP_fast_assign ( + const struct rpc_rqst *rqstp = xdr->rqst; + const struct rpc_task *task = rqstp->rq_task; + + __entry->task_id = task->tk_pid; + __entry->client_id = task->tk_client->cl_clid; + __entry->xid = be32_to_cpu(rqstp->rq_xid); __entry->error = error; ),TP_printk ( -"error=%lu (%s)" , +"task:%u@%d xid=0x%08x error=%lu (%s)" , + __entry->task_id, __entry->client_id, __entry->xid, __entry->error,nfs_show_status (__entry->error) ) );