All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org
Subject: [PATCH v4 08/33] svcrdma: Remove backchannel dprintk call sites
Date: Sat, 30 May 2020 09:28:46 -0400	[thread overview]
Message-ID: <20200530132846.10117.3039.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <20200530131711.10117.74063.stgit@klimt.1015granger.net>

Clean up.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 net/sunrpc/xprtrdma/svc_rdma_backchannel.c |   48 +++-------------------------
 1 file changed, 5 insertions(+), 43 deletions(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_backchannel.c b/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
index b174f3b109a5..1ee73f7cf931 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
@@ -10,10 +10,6 @@
 #include "xprt_rdma.h"
 #include <trace/events/rpcrdma.h>
 
-#define RPCDBG_FACILITY	RPCDBG_SVCXPRT
-
-#undef SVCRDMA_BACKCHANNEL_DEBUG
-
 /**
  * svc_rdma_handle_bc_reply - Process incoming backchannel Reply
  * @rqstp: resources for handling the Reply
@@ -31,33 +27,17 @@ void svc_rdma_handle_bc_reply(struct svc_rqst *rqstp,
 	__be32 *rdma_resp = rctxt->rc_recv_buf;
 	struct rpc_rqst *req;
 	u32 credits;
-	size_t len;
-	__be32 xid;
-	__be32 *p;
-
-	p = (__be32 *)src->iov_base;
-	len = src->iov_len;
-	xid = *rdma_resp;
-
-#ifdef SVCRDMA_BACKCHANNEL_DEBUG
-	pr_info("%s: xid=%08x, length=%zu\n",
-		__func__, be32_to_cpu(xid), len);
-	pr_info("%s: RPC/RDMA: %*ph\n",
-		__func__, (int)RPCRDMA_HDRLEN_MIN, rdma_resp);
-	pr_info("%s:      RPC: %*ph\n",
-		__func__, (int)len, p);
-#endif
 
 	spin_lock(&xprt->queue_lock);
-	req = xprt_lookup_rqst(xprt, xid);
+	req = xprt_lookup_rqst(xprt, *rdma_resp);
 	if (!req)
 		goto out_unlock;
 
 	dst = &req->rq_private_buf.head[0];
 	memcpy(&req->rq_private_buf, &req->rq_rcv_buf, sizeof(struct xdr_buf));
-	if (dst->iov_len < len)
+	if (dst->iov_len < src->iov_len)
 		goto out_unlock;
-	memcpy(dst->iov_base, p, len);
+	memcpy(dst->iov_base, src->iov_base, src->iov_len);
 	xprt_pin_rqst(req);
 	spin_unlock(&xprt->queue_lock);
 
@@ -66,7 +46,6 @@ void svc_rdma_handle_bc_reply(struct svc_rqst *rqstp,
 		credits = 1;	/* don't deadlock */
 	else if (credits > r_xprt->rx_buf.rb_bc_max_requests)
 		credits = r_xprt->rx_buf.rb_bc_max_requests;
-
 	spin_lock(&xprt->transport_lock);
 	xprt->cwnd = credits << RPC_CWNDSHIFT;
 	spin_unlock(&xprt->transport_lock);
@@ -174,10 +153,6 @@ rpcrdma_bc_send_request(struct svcxprt_rdma *rdma, struct rpc_rqst *rqst)
 	*p++ = xdr_zero;
 	*p   = xdr_zero;
 
-#ifdef SVCRDMA_BACKCHANNEL_DEBUG
-	pr_info("%s: %*ph\n", __func__, 64, rqst->rq_buffer);
-#endif
-
 	rqst->rq_xtime = ktime_get();
 	rc = svc_rdma_bc_sendto(rdma, rqst, ctxt);
 	if (rc)
@@ -188,7 +163,6 @@ rpcrdma_bc_send_request(struct svcxprt_rdma *rdma, struct rpc_rqst *rqst)
 	svc_rdma_send_ctxt_put(rdma, ctxt);
 
 drop_connection:
-	dprintk("svcrdma: failed to send bc call\n");
 	return -ENOTCONN;
 }
 
@@ -207,9 +181,6 @@ static int xprt_rdma_bc_send_request(struct rpc_rqst *rqst)
 		container_of(sxprt, struct svcxprt_rdma, sc_xprt);
 	int ret;
 
-	dprintk("svcrdma: sending bc call with xid: %08x\n",
-		be32_to_cpu(rqst->rq_xid));
-
 	if (test_bit(XPT_DEAD, &sxprt->xpt_flags))
 		return -ENOTCONN;
 
@@ -222,8 +193,6 @@ static int xprt_rdma_bc_send_request(struct rpc_rqst *rqst)
 static void
 xprt_rdma_bc_close(struct rpc_xprt *xprt)
 {
-	dprintk("svcrdma: %s: xprt %p\n", __func__, xprt);
-
 	xprt_disconnect_done(xprt);
 	xprt->cwnd = RPC_CWNDSHIFT;
 }
@@ -231,8 +200,6 @@ xprt_rdma_bc_close(struct rpc_xprt *xprt)
 static void
 xprt_rdma_bc_put(struct rpc_xprt *xprt)
 {
-	dprintk("svcrdma: %s: xprt %p\n", __func__, xprt);
-
 	xprt_rdma_free_addresses(xprt);
 	xprt_free(xprt);
 }
@@ -267,19 +234,14 @@ xprt_setup_rdma_bc(struct xprt_create *args)
 	struct rpc_xprt *xprt;
 	struct rpcrdma_xprt *new_xprt;
 
-	if (args->addrlen > sizeof(xprt->addr)) {
-		dprintk("RPC:       %s: address too large\n", __func__);
+	if (args->addrlen > sizeof(xprt->addr))
 		return ERR_PTR(-EBADF);
-	}
 
 	xprt = xprt_alloc(args->net, sizeof(*new_xprt),
 			  RPCRDMA_MAX_BC_REQUESTS,
 			  RPCRDMA_MAX_BC_REQUESTS);
-	if (!xprt) {
-		dprintk("RPC:       %s: couldn't allocate rpc_xprt\n",
-			__func__);
+	if (!xprt)
 		return ERR_PTR(-ENOMEM);
-	}
 
 	xprt->timeout = &xprt_rdma_bc_timeout;
 	xprt_set_bound(xprt);


  parent reply	other threads:[~2020-05-30 13:28 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-30 13:28 [PATCH v4 00/33] Possible NFSD patches for v5.8 Chuck Lever
2020-05-30 13:28 ` [PATCH v4 01/33] SUNRPC: Split the xdr_buf event class Chuck Lever
2020-05-30 13:28 ` [PATCH v4 02/33] SUNRPC: Move xpt_mutex into socket xpo_sendto methods Chuck Lever
2020-05-30 13:28 ` [PATCH v4 03/33] svcrdma: Clean up the tracing for rw_ctx_init errors Chuck Lever
2020-05-30 13:28 ` [PATCH v4 04/33] svcrdma: Clean up handling of get_rw_ctx errors Chuck Lever
2020-05-30 13:28 ` [PATCH v4 05/33] svcrdma: Trace page overruns when constructing RDMA Reads Chuck Lever
2020-05-30 13:28 ` [PATCH v4 06/33] svcrdma: trace undersized Write chunks Chuck Lever
2020-05-30 13:28 ` [PATCH v4 07/33] svcrdma: Fix backchannel return code Chuck Lever
2020-05-30 13:28 ` Chuck Lever [this message]
2020-05-30 13:28 ` [PATCH v4 09/33] svcrdma: Rename tracepoints that record header decoding errors Chuck Lever
2020-05-30 13:28 ` [PATCH v4 10/33] svcrdma: Remove the SVCRDMA_DEBUG macro Chuck Lever
2020-05-30 13:29 ` [PATCH v4 11/33] svcrdma: Displayed remote IP address should match stored address Chuck Lever
2020-05-30 13:29 ` [PATCH v4 12/33] svcrdma: Add tracepoints to report ->xpo_accept failures Chuck Lever
2020-05-30 13:29 ` [PATCH v4 13/33] SUNRPC: Remove kernel memory address from svc_xprt tracepoints Chuck Lever
2020-05-30 13:29 ` [PATCH v4 14/33] SUNRPC: Tracepoint to record errors in svc_xpo_create() Chuck Lever
2020-05-30 13:29 ` [PATCH v4 15/33] SUNRPC: Trace a few more generic svc_xprt events Chuck Lever
2020-05-30 13:29 ` [PATCH v4 16/33] SUNRPC: Remove "#include <trace/events/skb.h>" Chuck Lever
2020-05-30 13:29 ` [PATCH v4 17/33] SUNRPC: Add more svcsock tracepoints Chuck Lever
2020-05-30 13:29 ` [PATCH v4 18/33] SUNRPC: Replace dprintk call sites in TCP state change callouts Chuck Lever
2020-05-30 13:29 ` [PATCH v4 19/33] SUNRPC: Trace server-side rpcbind registration events Chuck Lever
2020-05-30 13:29 ` [PATCH v4 20/33] SUNRPC: Rename svc_sock::sk_reclen Chuck Lever
2020-05-30 13:29 ` [PATCH v4 21/33] SUNRPC: Restructure svc_tcp_recv_record() Chuck Lever
2020-05-30 13:30 ` [PATCH v4 22/33] SUNRPC: Replace dprintk() call sites in TCP receive path Chuck Lever
2020-05-30 13:30 ` [PATCH v4 23/33] SUNRPC: Refactor recvfrom path dealing with incomplete TCP receives Chuck Lever
2020-05-30 13:30 ` [PATCH v4 24/33] SUNRPC: Clean up svc_release_skb() functions Chuck Lever
2020-05-30 13:30 ` [PATCH v4 25/33] SUNRPC: Refactor svc_recvfrom() Chuck Lever
2020-05-30 13:30 ` [PATCH v4 26/33] SUNRPC: Restructure svc_udp_recvfrom() Chuck Lever
2020-05-30 13:30 ` [PATCH v4 27/33] SUNRPC: svc_show_status() macro should have enum definitions Chuck Lever
2020-05-30 13:30 ` [PATCH v4 28/33] NFSD: Add tracepoints to NFSD's duplicate reply cache Chuck Lever
2020-05-30 13:30 ` [PATCH v4 29/33] NFSD: Add tracepoints to the NFSD state management code Chuck Lever
2020-05-30 13:30 ` [PATCH v4 30/33] NFSD: Add tracepoints for monitoring NFSD callbacks Chuck Lever
2020-05-30 13:30 ` [PATCH v4 31/33] SUNRPC: Clean up request deferral tracepoints Chuck Lever
2020-05-30 13:30 ` [PATCH v4 32/33] NFSD: Squash an annoying compiler warning Chuck Lever
2020-05-30 13:30 ` [PATCH v4 33/33] NFSD: Fix improperly-formatted Doxygen comments Chuck Lever
2020-06-01 14:38 ` [PATCH v4 00/33] Possible NFSD patches for v5.8 J. Bruce Fields

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=20200530132846.10117.3039.stgit@klimt.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=bfields@fieldses.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.