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

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

SUNRPC: Generalize the RPC buffer release API 



xprtrdma needs to allocate the Call and Reply buffers separately.
TBH, the reliance on using a single buffer for the pair of XDR
buffers is transport implementation-specific.

Instead of passing just the rq_buffer into the buf_free method, pass
the task structure and let buf_free take care of freeing both
XDR buffers at once.

There's a micro-optimization here. In the common case, both
xprt_release and the transport's buf_free method were checking if
rq_buffer was NULL. Now the check is done only once per RPC.

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

include/linux/sunrpc/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct rpc_task *rpc_wake_up_first(struct rpc_wait_queue *, 
void		rpc_wake_up_status(struct rpc_wait_queue *, int);

void		rpc_delay(struct rpc_task *, unsigned long);

int		rpc_malloc(struct rpc_task *);

void		rpc_free(void *);

void		rpc_free(struct rpc_task *);

int		rpciod_up(void);

void		rpciod_down(void);

int		__rpc_wait_for_completion_task(struct rpc_task *task, wait_bit_action_f *);

include/linux/sunrpc/xprt.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct rpc_xprt_ops { 
	void		(*set_port)(struct rpc_xprt *xprt, unsigned short port);

	void		(*connect)(struct rpc_xprt *xprt, struct rpc_task *task);

	int		(*buf_alloc)(struct rpc_task *task);

	void		(*buf_free)(void *buffer);

	void		(*buf_free)(struct rpc_task *task);

	int		(*send_request)(struct rpc_task *task);

	void		(*set_retrans_timeout)(struct rpc_task *task);

	void		(*timer)(struct rpc_xprt *xprt, struct rpc_task *task);

net/sunrpc/sched.c

+4 −6
Original line number Diff line number Diff line
@@ -896,18 +896,16 @@ int rpc_malloc(struct rpc_task *task) 
EXPORT_SYMBOL_GPL(rpc_malloc);



/**

 * rpc_free - free buffer allocated via rpc_malloc

 * @buffer: buffer to free

 * rpc_free - free RPC buffer resources allocated via rpc_malloc

 * @task: RPC task

 *

 */

void rpc_free(void *buffer)

void rpc_free(struct rpc_task *task)

{

	void *buffer = task->tk_rqstp->rq_buffer;

	size_t size;

	struct rpc_buffer *buf;



	if (!buffer)

		return;



	buf = container_of(buffer, struct rpc_buffer, data);

	size = buf->len;

net/sunrpc/xprt.c

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ void xprt_release(struct rpc_task *task) 
	xprt_schedule_autodisconnect(xprt);

	spin_unlock_bh(&xprt->transport_lock);

	if (req->rq_buffer)

		xprt->ops->buf_free(req->rq_buffer);

		xprt->ops->buf_free(task);

	xprt_inject_disconnect(xprt);

	if (req->rq_cred != NULL)

		put_rpccred(req->rq_cred);

net/sunrpc/xprtrdma/svc_rdma_backchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ xprt_rdma_bc_allocate(struct rpc_task *task) 
}



static void

xprt_rdma_bc_free(void *buffer)

xprt_rdma_bc_free(struct rpc_task *task)

{

	/* No-op: ctxt and page have already been freed. */

}