Commit c977dea2 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Remove BUG_ON() call sites 



If an error occurs in the marshaling logic, fail the RPC request
being processed, but leave the client running.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e7ce710a

net/sunrpc/xprtrdma/transport.c

+2 −1
Original line number Diff line number Diff line
@@ -463,7 +463,8 @@ xprt_rdma_allocate(struct rpc_task *task, size_t size) 
	struct rpcrdma_req *req, *nreq;



	req = rpcrdma_buffer_get(&rpcx_to_rdmax(xprt)->rx_buf);

	BUG_ON(NULL == req);

	if (req == NULL)

		return NULL;



	if (size > req->rl_size) {

		dprintk("RPC:       %s: size %zd too large for buffer[%zd]: "

net/sunrpc/xprtrdma/verbs.c

+10 −8
Original line number Diff line number Diff line
@@ -1302,7 +1302,6 @@ rpcrdma_buffer_put(struct rpcrdma_req *req) 
	int i;

	unsigned long flags;



	BUG_ON(req->rl_nchunks != 0);

	spin_lock_irqsave(&buffers->rb_lock, flags);

	buffers->rb_send_bufs[--buffers->rb_send_index] = req;

	req->rl_niovs = 0;
@@ -1535,10 +1534,6 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 
	} else

		post_wr = &frmr_wr;



	/* Bump the key */

	key = (u8)(seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey & 0x000000FF);

	ib_update_fast_reg_key(seg1->mr_chunk.rl_mw->r.frmr.fr_mr, ++key);



	/* Prepare FRMR WR */

	memset(&frmr_wr, 0, sizeof frmr_wr);

	frmr_wr.wr_id = (unsigned long)(void *)seg1->mr_chunk.rl_mw;
@@ -1549,7 +1544,16 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 
	frmr_wr.wr.fast_reg.page_list_len = page_no;

	frmr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;

	frmr_wr.wr.fast_reg.length = page_no << PAGE_SHIFT;

	BUG_ON(frmr_wr.wr.fast_reg.length < len);

	if (frmr_wr.wr.fast_reg.length < len) {

		while (seg1->mr_nsegs--)

			rpcrdma_unmap_one(ia, seg++);

		return -EIO;

	}



	/* Bump the key */

	key = (u8)(seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey & 0x000000FF);

	ib_update_fast_reg_key(seg1->mr_chunk.rl_mw->r.frmr.fr_mr, ++key);



	frmr_wr.wr.fast_reg.access_flags = (writing ?

				IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE :

				IB_ACCESS_REMOTE_READ);
@@ -1709,9 +1713,7 @@ rpcrdma_deregister_external(struct rpcrdma_mr_seg *seg, 


#if RPCRDMA_PERSISTENT_REGISTRATION

	case RPCRDMA_ALLPHYSICAL:

		BUG_ON(nsegs != 1);

		rpcrdma_unmap_one(ia, seg);

		rc = 0;

		break;

#endif