Commit 42e5c3e2 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker

SUNRPC: Abstract backchannel operations

xprt_{setup,destroy}_backchannel() won't be adequate for RPC/RMDA
bi-direction. In particular, receive buffers have to be pre-
registered and posted in order to receive incoming backchannel
requests.

Add a virtual function call to allow the insertion of appropriate
backchannel setup and destruction methods for each transport.

In addition, freeing a backchannel request is a little different
for RPC/RDMA. Introduce an rpc_xprt_op to handle the difference.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Tested-By: default avatarDevesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent a5b027e1
...@@ -38,6 +38,11 @@ void xprt_free_bc_request(struct rpc_rqst *req); ...@@ -38,6 +38,11 @@ void xprt_free_bc_request(struct rpc_rqst *req);
int xprt_setup_backchannel(struct rpc_xprt *, unsigned int min_reqs); int xprt_setup_backchannel(struct rpc_xprt *, unsigned int min_reqs);
void xprt_destroy_backchannel(struct rpc_xprt *, unsigned int max_reqs); void xprt_destroy_backchannel(struct rpc_xprt *, unsigned int max_reqs);
/* Socket backchannel transport methods */
int xprt_setup_bc(struct rpc_xprt *xprt, unsigned int min_reqs);
void xprt_destroy_bc(struct rpc_xprt *xprt, unsigned int max_reqs);
void xprt_free_bc_rqst(struct rpc_rqst *req);
/* /*
* Determine if a shared backchannel is in use * Determine if a shared backchannel is in use
*/ */
......
...@@ -136,6 +136,11 @@ struct rpc_xprt_ops { ...@@ -136,6 +136,11 @@ struct rpc_xprt_ops {
int (*enable_swap)(struct rpc_xprt *xprt); int (*enable_swap)(struct rpc_xprt *xprt);
void (*disable_swap)(struct rpc_xprt *xprt); void (*disable_swap)(struct rpc_xprt *xprt);
void (*inject_disconnect)(struct rpc_xprt *xprt); void (*inject_disconnect)(struct rpc_xprt *xprt);
int (*bc_setup)(struct rpc_xprt *xprt,
unsigned int min_reqs);
void (*bc_free_rqst)(struct rpc_rqst *rqst);
void (*bc_destroy)(struct rpc_xprt *xprt,
unsigned int max_reqs);
}; };
/* /*
......
...@@ -137,6 +137,14 @@ struct rpc_rqst *xprt_alloc_bc_req(struct rpc_xprt *xprt, gfp_t gfp_flags) ...@@ -137,6 +137,14 @@ struct rpc_rqst *xprt_alloc_bc_req(struct rpc_xprt *xprt, gfp_t gfp_flags)
* callback requests can be up to 4096 bytes in size. * callback requests can be up to 4096 bytes in size.
*/ */
int xprt_setup_backchannel(struct rpc_xprt *xprt, unsigned int min_reqs) int xprt_setup_backchannel(struct rpc_xprt *xprt, unsigned int min_reqs)
{
if (!xprt->ops->bc_setup)
return 0;
return xprt->ops->bc_setup(xprt, min_reqs);
}
EXPORT_SYMBOL_GPL(xprt_setup_backchannel);
int xprt_setup_bc(struct rpc_xprt *xprt, unsigned int min_reqs)
{ {
struct rpc_rqst *req; struct rpc_rqst *req;
struct list_head tmp_list; struct list_head tmp_list;
...@@ -192,7 +200,6 @@ int xprt_setup_backchannel(struct rpc_xprt *xprt, unsigned int min_reqs) ...@@ -192,7 +200,6 @@ int xprt_setup_backchannel(struct rpc_xprt *xprt, unsigned int min_reqs)
dprintk("RPC: setup backchannel transport failed\n"); dprintk("RPC: setup backchannel transport failed\n");
return -ENOMEM; return -ENOMEM;
} }
EXPORT_SYMBOL_GPL(xprt_setup_backchannel);
/** /**
* xprt_destroy_backchannel - Destroys the backchannel preallocated structures. * xprt_destroy_backchannel - Destroys the backchannel preallocated structures.
...@@ -204,6 +211,13 @@ EXPORT_SYMBOL_GPL(xprt_setup_backchannel); ...@@ -204,6 +211,13 @@ EXPORT_SYMBOL_GPL(xprt_setup_backchannel);
* of reqs specified by the caller. * of reqs specified by the caller.
*/ */
void xprt_destroy_backchannel(struct rpc_xprt *xprt, unsigned int max_reqs) void xprt_destroy_backchannel(struct rpc_xprt *xprt, unsigned int max_reqs)
{
if (xprt->ops->bc_destroy)
xprt->ops->bc_destroy(xprt, max_reqs);
}
EXPORT_SYMBOL_GPL(xprt_destroy_backchannel);
void xprt_destroy_bc(struct rpc_xprt *xprt, unsigned int max_reqs)
{ {
struct rpc_rqst *req = NULL, *tmp = NULL; struct rpc_rqst *req = NULL, *tmp = NULL;
...@@ -227,7 +241,6 @@ void xprt_destroy_backchannel(struct rpc_xprt *xprt, unsigned int max_reqs) ...@@ -227,7 +241,6 @@ void xprt_destroy_backchannel(struct rpc_xprt *xprt, unsigned int max_reqs)
dprintk("RPC: backchannel list empty= %s\n", dprintk("RPC: backchannel list empty= %s\n",
list_empty(&xprt->bc_pa_list) ? "true" : "false"); list_empty(&xprt->bc_pa_list) ? "true" : "false");
} }
EXPORT_SYMBOL_GPL(xprt_destroy_backchannel);
static struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt, __be32 xid) static struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt, __be32 xid)
{ {
...@@ -264,6 +277,13 @@ void xprt_free_bc_request(struct rpc_rqst *req) ...@@ -264,6 +277,13 @@ void xprt_free_bc_request(struct rpc_rqst *req)
{ {
struct rpc_xprt *xprt = req->rq_xprt; struct rpc_xprt *xprt = req->rq_xprt;
xprt->ops->bc_free_rqst(req);
}
void xprt_free_bc_rqst(struct rpc_rqst *req)
{
struct rpc_xprt *xprt = req->rq_xprt;
dprintk("RPC: free backchannel req=%p\n", req); dprintk("RPC: free backchannel req=%p\n", req);
req->rq_connect_cookie = xprt->connect_cookie - 1; req->rq_connect_cookie = xprt->connect_cookie - 1;
......
...@@ -2580,6 +2580,11 @@ static struct rpc_xprt_ops xs_tcp_ops = { ...@@ -2580,6 +2580,11 @@ static struct rpc_xprt_ops xs_tcp_ops = {
.enable_swap = xs_enable_swap, .enable_swap = xs_enable_swap,
.disable_swap = xs_disable_swap, .disable_swap = xs_disable_swap,
.inject_disconnect = xs_inject_disconnect, .inject_disconnect = xs_inject_disconnect,
#ifdef CONFIG_SUNRPC_BACKCHANNEL
.bc_setup = xprt_setup_bc,
.bc_free_rqst = xprt_free_bc_rqst,
.bc_destroy = xprt_destroy_bc,
#endif
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment