Two small clean-ups for v5.1
Subsystems (3)
cover Two small clean-ups for v5.1
Hi Bruce-
Please consider these two commits for the v5.1 merge window.
---
Chuck Lever (2):
svcrdma: Squelch compiler warning when SUNRPC_DEBUG is disabled
svcrdma: Remove syslog warnings in work completion handlers
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +-------- net/sunrpc/xprtrdma/svc_rdma_rw.c | 11 +---------- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 4 ---- net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 +++------ 4 files changed, 5 insertions(+), 28 deletions(-)
--
Chuck Lever
PATCH 1/2 svcrdma: Squelch compiler warning when SUNRPC_DEBUG is disabled
CC [M] net/sunrpc/xprtrdma/svc_rdma_transport.olinux/net/sunrpc/xprtrdma/svc_rdma_transport.c: In function ‘svc_rdma_accept’:linux/net/sunrpc/xprtrdma/svc_rdma_transport.c:452:19: warning: variable ‘sap’ set but not used [-Wunused-but-set-variable]
struct sockaddr *sap;
^--- net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +3 -1
@@ -390,8 +390,8 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)struct ib_qp_init_attr qp_attr;unsigned int ctxts, rq_depth;struct ib_device *dev; -struct sockaddr *sap;int ret =0 ; + RPC_IFDEBUG(struct sockaddr *sap); listen_rdma = container_of(xprt, struct svcxprt_rdma, sc_xprt);clear_bit (XPT_CONN , &xprt->xpt_flags);
@@ -528,6 +528,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)if (ret) goto errout; +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )dprintk ("svcrdma: new connection %p accepted:\n" , newxprt); sap = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr;dprintk (" local address : %pIS:%u\n" , sap,rpc_get_port (sap));
@@ -538,6 +539,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)dprintk (" rdma_rw_ctxs : %d\n" , ctxts);dprintk (" max_requests : %d\n" , newxprt->sc_max_requests);dprintk (" ord : %d\n" , conn_param.initiator_depth); +#endif trace_svcrdma_xprt_accept (&newxprt->sc_xprt);return &newxprt->sc_xprt;
PATCH 2/2 svcrdma: Remove syslog warnings in work completion handlers
In reply to Chuck LeverThese can result in a lot of log noise, and are able to be triggered by client misbehavior. Since there are trace points in these handlers now, there's no need to spam the log.
--- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +-------- net/sunrpc/xprtrdma/svc_rdma_rw.c | 11 +---------- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 4 ---- net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ----- 4 files changed, 2 insertions(+), 27 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +1 -8
@@ -272,11 +272,8 @@ bool svc_rdma_post_recvs(struct svcxprt_rdma *rdma)return false; ctxt->rc_temp = true; ret =__svc_rdma_post_recv (rdma, ctxt); -if (ret) { -pr_err ("svcrdma: failure posting recv buffers: %d\n" , - ret); +if (ret)return false; - } }return true; }
@@ -322,10 +319,6 @@ static void svc_rdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc) goto out; flushed: -if (wc->status !=IB_WC_WR_FLUSH_ERR ) -pr_err ("svcrdma: Recv: %s (%u/0x%x)\n" , -ib_wc_status_msg (wc->status), - wc->status, wc->vendor_err); post_err:svc_rdma_recv_ctxt_put (rdma, ctxt);set_bit (XPT_CLOSE , &rdma->sc_xprt.xpt_flags);
net/sunrpc/xprtrdma/svc_rdma_rw.c +1 -10
@@ -213,13 +213,8 @@ static void svc_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc)atomic_add (cc->cc_sqecount, &rdma->sc_sq_avail);wake_up (&rdma->sc_send_wait); -if (unlikely (wc->status !=IB_WC_SUCCESS )) { +if (unlikely (wc->status !=IB_WC_SUCCESS ))set_bit (XPT_CLOSE , &rdma->sc_xprt.xpt_flags); -if (wc->status !=IB_WC_WR_FLUSH_ERR ) -pr_err ("svcrdma: write ctx: %s (%u/0x%x)\n" , -ib_wc_status_msg (wc->status), - wc->status, wc->vendor_err); - }svc_rdma_write_info_free (info); }
@@ -278,10 +273,6 @@ static void svc_rdma_wc_read_done(struct ib_cq *cq, struct ib_wc *wc)if (unlikely (wc->status !=IB_WC_SUCCESS )) {set_bit (XPT_CLOSE , &rdma->sc_xprt.xpt_flags); -if (wc->status !=IB_WC_WR_FLUSH_ERR ) -pr_err ("svcrdma: read ctx: %s (%u/0x%x)\n" , -ib_wc_status_msg (wc->status), - wc->status, wc->vendor_err);svc_rdma_recv_ctxt_put (rdma, info->ri_readctxt); }else {spin_lock (&rdma->sc_rq_dto_lock);
net/sunrpc/xprtrdma/svc_rdma_sendto.c +0 -4
@@ -272,10 +272,6 @@ static void svc_rdma_wc_send(struct ib_cq *cq, struct ib_wc *wc)if (unlikely (wc->status !=IB_WC_SUCCESS )) {set_bit (XPT_CLOSE , &rdma->sc_xprt.xpt_flags);svc_xprt_enqueue (&rdma->sc_xprt); -if (wc->status !=IB_WC_WR_FLUSH_ERR ) -pr_err ("svcrdma: Send: %s (%u/0x%x)\n" , -ib_wc_status_msg (wc->status), - wc->status, wc->vendor_err); }svc_xprt_put (&rdma->sc_xprt);
net/sunrpc/xprtrdma/svc_rdma_transport.c +0 -5
@@ -593,11 +593,6 @@ static void __svc_rdma_free(struct work_struct *work)if (rdma->sc_qp && !IS_ERR (rdma->sc_qp))ib_drain_qp (rdma->sc_qp); -/* We should only be called from kref_put */ -if (kref_read (&xprt->xpt_ref) !=0 ) -pr_err ("svcrdma: sc_xprt still in use? (%d)\n" , -kref_read (&xprt->xpt_ref)); -svc_rdma_flush_recv_queues (rdma);/* Final put of backchannel client transport */
Quoted 3 lines · Chuck Lever
Hi Bruce-
Please consider these two commits for the v5.1 merge window.
Thanks, applying.--b.
Quoted 16 lines
---
Chuck Lever (2):
svcrdma: Squelch compiler warning whenSUNRPC_DEBUGis disabled
svcrdma: Remove syslog warnings in work completion handlersnet/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +-------- net/sunrpc/xprtrdma/svc_rdma_rw.c | 11 +---------- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 4 ---- net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 +++------ 4 files changed, 5 insertions(+), 28 deletions(-)--
Chuck Lever