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

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

NFS: Enable client side NFSv4.1 backchannel to use other transports 



Forechannel transports get their own "bc_up" method to create an
endpoint for the backchannel service.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
[Anna Schumaker: Add forward declaration of struct net to xprt.h]
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 0f2e3bda

fs/nfs/callback.c

+8 −32
Original line number Diff line number Diff line
@@ -99,17 +99,6 @@ nfs4_callback_up(struct svc_serv *serv) 
}



#if defined(CONFIG_NFS_V4_1)

static int nfs41_callback_up_net(struct svc_serv *serv, struct net *net)

{

	/*

	 * Create an svc_sock for the back channel service that shares the

	 * fore channel connection.

	 * Returns the input port (0) and sets the svc_serv bc_xprt on success

	 */

	return svc_create_xprt(serv, "tcp-bc", net, PF_INET, 0,

			      SVC_SOCK_ANONYMOUS);

}



/*

 * The callback service for NFSv4.1 callbacks

 */
@@ -184,11 +173,6 @@ static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt, 
		xprt->bc_serv = serv;

}

#else

static int nfs41_callback_up_net(struct svc_serv *serv, struct net *net)

{

	return 0;

}



static void nfs_minorversion_callback_svc_setup(struct svc_serv *serv,

		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))

{
@@ -259,7 +243,8 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc 
	svc_shutdown_net(serv, net);

}



static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct net *net)

static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,

			       struct net *net, struct rpc_xprt *xprt)

{

	struct nfs_net *nn = net_generic(net, nfs_net_id);

	int ret;
@@ -275,20 +260,11 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n 
		goto err_bind;

	}



	switch (minorversion) {

		case 0:

	ret = -EPROTONOSUPPORT;

	if (minorversion == 0)

		ret = nfs4_callback_up_net(serv, net);

			break;

		case 1:

		case 2:

			ret = nfs41_callback_up_net(serv, net);

			break;

		default:

			printk(KERN_ERR "NFS: unknown callback version: %d\n",

					minorversion);

			ret = -EINVAL;

			break;

	}

	else if (xprt->ops->bc_up)

		ret = xprt->ops->bc_up(serv, net);



	if (ret < 0) {

		printk(KERN_ERR "NFS: callback service start failed\n");
@@ -364,7 +340,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) 
		goto err_create;

	}



	ret = nfs_callback_up_net(minorversion, serv, net);

	ret = nfs_callback_up_net(minorversion, serv, net, xprt);

	if (ret < 0)

		goto err_net;

include/linux/sunrpc/xprt.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ enum rpc_display_format_t { 
struct rpc_task;

struct rpc_xprt;

struct seq_file;

struct svc_serv;

struct net;



/*

 * This describes a complete RPC request
@@ -138,6 +140,7 @@ struct rpc_xprt_ops { 
	void		(*inject_disconnect)(struct rpc_xprt *xprt);

	int		(*bc_setup)(struct rpc_xprt *xprt,

				    unsigned int min_reqs);

	int		(*bc_up)(struct svc_serv *serv, struct net *net);

	void		(*bc_free_rqst)(struct rpc_rqst *rqst);

	void		(*bc_destroy)(struct rpc_xprt *xprt,

				      unsigned int max_reqs);

net/sunrpc/xprtrdma/backchannel.c

+21 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/module.h>

#include <linux/sunrpc/xprt.h>

#include <linux/sunrpc/svc.h>

#include <linux/sunrpc/svc_xprt.h>



#include "xprt_rdma.h"
@@ -173,6 +174,26 @@ int xprt_rdma_bc_setup(struct rpc_xprt *xprt, unsigned int reqs) 
	return -ENOMEM;

}



/**

 * xprt_rdma_bc_up - Create transport endpoint for backchannel service

 * @serv: server endpoint

 * @net: network namespace

 *

 * The "xprt" is an implied argument: it supplies the name of the

 * backchannel transport class.

 *

 * Returns zero on success, negative errno on failure

 */

int xprt_rdma_bc_up(struct svc_serv *serv, struct net *net)

{

	int ret;



	ret = svc_create_xprt(serv, "rdma-bc", net, PF_INET, 0, 0);

	if (ret < 0)

		return ret;

	return 0;

}



/**

 * rpcrdma_bc_marshal_reply - Send backwards direction reply

 * @rqst: buffer containing RPC reply data

net/sunrpc/xprtrdma/transport.c

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ static struct rpc_xprt_ops xprt_rdma_procs = { 
	.inject_disconnect	= xprt_rdma_inject_disconnect,

#if defined(CONFIG_SUNRPC_BACKCHANNEL)

	.bc_setup		= xprt_rdma_bc_setup,

	.bc_up			= xprt_rdma_bc_up,

	.bc_free_rqst		= xprt_rdma_bc_free_rqst,

	.bc_destroy		= xprt_rdma_bc_destroy,

#endif

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ void xprt_rdma_cleanup(void); 
 */

#if defined(CONFIG_SUNRPC_BACKCHANNEL)

int xprt_rdma_bc_setup(struct rpc_xprt *, unsigned int);

int xprt_rdma_bc_up(struct svc_serv *, struct net *);

int rpcrdma_bc_post_recv(struct rpcrdma_xprt *, unsigned int);

void rpcrdma_bc_receive_call(struct rpcrdma_xprt *, struct rpcrdma_rep *);

int rpcrdma_bc_marshal_reply(struct rpc_rqst *);