Commit 2a95ce47 authored by Chuck Lever's avatar Chuck Lever
Browse files

svcrdma: Optimize svc_rdma_cc_init() 



The atomic_inc_return() in svc_rdma_send_cid_init() is expensive.

Some svc_rdma_chunk_ctxt's now reside in long-lived container
structures. They don't need a fresh completion ID for every I/O
operation.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 28ee0ec8

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ svc_rdma_recv_ctxt_alloc(struct svcxprt_rdma *rdma) 
	dma_addr_t addr;

	void *buffer;



	ctxt = kmalloc_node(sizeof(*ctxt), GFP_KERNEL, node);

	ctxt = kzalloc_node(sizeof(*ctxt), GFP_KERNEL, node);

	if (!ctxt)

		goto fail0;

	buffer = kmalloc_node(rdma->sc_max_req_size, GFP_KERNEL, node);

net/sunrpc/xprtrdma/svc_rdma_rw.c

+5 −4
Original line number Diff line number Diff line
@@ -154,7 +154,10 @@ static int svc_rdma_rw_ctx_init(struct svcxprt_rdma *rdma, 
void svc_rdma_cc_init(struct svcxprt_rdma *rdma,

		      struct svc_rdma_chunk_ctxt *cc)

{

	svc_rdma_send_cid_init(rdma, &cc->cc_cid);

	struct rpc_rdma_cid *cid = &cc->cc_cid;



	if (unlikely(!cid->ci_completion_id))

		svc_rdma_send_cid_init(rdma, cid);



	INIT_LIST_HEAD(&cc->cc_rwctxts);

	cc->cc_sqecount = 0;
@@ -221,15 +224,13 @@ svc_rdma_write_info_alloc(struct svcxprt_rdma *rdma, 
{

	struct svc_rdma_write_info *info;



	info = kmalloc_node(sizeof(*info), GFP_KERNEL,

	info = kzalloc_node(sizeof(*info), GFP_KERNEL,

			    ibdev_to_node(rdma->sc_cm_id->device));

	if (!info)

		return info;



	info->wi_rdma = rdma;

	info->wi_chunk = chunk;

	info->wi_seg_off = 0;

	info->wi_seg_no = 0;

	svc_rdma_cc_init(rdma, &info->wi_cc);

	info->wi_cc.cc_cqe.done = svc_rdma_write_done;

	return info;

net/sunrpc/xprtrdma/svc_rdma_sendto.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ svc_rdma_send_ctxt_alloc(struct svcxprt_rdma *rdma) 
	void *buffer;

	int i;



	ctxt = kmalloc_node(struct_size(ctxt, sc_sges, rdma->sc_max_send_sges),

	ctxt = kzalloc_node(struct_size(ctxt, sc_sges, rdma->sc_max_send_sges),

			    GFP_KERNEL, node);

	if (!ctxt)

		goto fail0;