Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8820bcaa authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Remove syslog warnings in work completion handlers 



These 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.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent c7920f06

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+1 −8
Original line number Diff line number Diff line
@@ -272,12 +272,9 @@ 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
Original line number Diff line number Diff line
@@ -212,13 +212,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);

}
@@ -277,10 +272,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -590,11 +590,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 */