From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v1 3/7] svcrdma: Trace page overruns when constructing RDMA Reads
Date: Fri, 01 May 2020 13:40:42 -0400 [thread overview]
Message-ID: <20200501174042.3899.51707.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <20200501173903.3899.31567.stgit@klimt.1015granger.net>
Clean up: Replace a dprintk call site with a tracepoint.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
include/trace/events/rpcrdma.h | 28 ++++++++++++++++++++++++++++
net/sunrpc/xprtrdma/svc_rdma_rw.c | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index a2fc5f3fb7d9..15dc1e852a0c 100644
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1645,6 +1645,34 @@ TRACE_EVENT(svcrdma_no_rwctx_err,
)
);
+TRACE_EVENT(svcrdma_page_overrun_err,
+ TP_PROTO(
+ const struct svcxprt_rdma *rdma,
+ const struct svc_rqst *rqst,
+ unsigned int pageno
+ ),
+
+ TP_ARGS(rdma, rqst, pageno),
+
+ TP_STRUCT__entry(
+ __field(unsigned int, pageno)
+ __field(u32, xid)
+ __string(device, rdma->sc_cm_id->device->name)
+ __string(addr, rdma->sc_xprt.xpt_remotebuf)
+ ),
+
+ TP_fast_assign(
+ __entry->pageno = pageno;
+ __entry->xid = __be32_to_cpu(rqst->rq_xid);
+ __assign_str(device, rdma->sc_cm_id->device->name);
+ __assign_str(addr, rdma->sc_xprt.xpt_remotebuf);
+ ),
+
+ TP_printk("addr=%s device=%s xid=0x%08x pageno=%u", __get_str(addr),
+ __get_str(device), __entry->xid, __entry->pageno
+ )
+);
+
TRACE_EVENT(svcrdma_send_pullup,
TP_PROTO(
unsigned int len
diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c
index c2d49f607cfe..17098a11d2ad 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -676,7 +676,7 @@ static int svc_rdma_build_read_segment(struct svc_rdma_read_info *info,
return 0;
out_overrun:
- dprintk("svcrdma: request overruns rq_pages\n");
+ trace_svcrdma_page_overrun_err(cc->cc_rdma, rqstp, info->ri_pageno);
return -EINVAL;
}
next prev parent reply other threads:[~2020-05-01 17:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 17:40 [PATCH v1 0/7] svcrdma observability improvements Chuck Lever
2020-05-01 17:40 ` [PATCH v1 1/7] svcrdma: Clean up the tracing for rw_ctx_init errors Chuck Lever
2020-05-01 17:40 ` [PATCH v1 2/7] svcrdma: Clean up handling of get_rw_ctx errors Chuck Lever
2020-05-01 17:40 ` Chuck Lever [this message]
2020-05-01 17:40 ` [PATCH v1 4/7] svcrdma: trace undersized Write chunks Chuck Lever
2020-05-01 17:40 ` [PATCH v1 5/7] svcrdma: Fix backchannel return code Chuck Lever
2020-05-01 17:40 ` [PATCH v1 6/7] svcrdma: Remove backchannel dprintk call sites Chuck Lever
2020-05-01 17:41 ` [PATCH v1 7/7] svcrdma: Rename tracepoints that record header decoding errors Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200501174042.3899.51707.stgit@klimt.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox