Commit d3abc739 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Trond Myklebust
Browse files

sunrpc: keep track of the xprt_class in rpc_xprt structure 



We need to keep track of the type for a given transport.

Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 5b926872

include/linux/sunrpc/xprt.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ enum rpc_display_format_t { 


struct rpc_task;

struct rpc_xprt;

struct xprt_class;

struct seq_file;

struct svc_serv;

struct net;
@@ -289,6 +290,7 @@ struct rpc_xprt { 
	atomic_t		inject_disconnect;

#endif

	struct rcu_head		rcu;

	const struct xprt_class	*xprt_class;

};



#if defined(CONFIG_SUNRPC_BACKCHANNEL)

net/sunrpc/xprtrdma/transport.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ unsigned int xprt_rdma_max_inline_read = RPCRDMA_DEF_INLINE; 
unsigned int xprt_rdma_max_inline_write = RPCRDMA_DEF_INLINE;

unsigned int xprt_rdma_memreg_strategy		= RPCRDMA_FRWR;

int xprt_rdma_pad_optimize;

static struct xprt_class xprt_rdma;



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
@@ -349,6 +350,7 @@ xprt_setup_rdma(struct xprt_create *args) 
	/* Ensure xprt->addr holds valid server TCP (not RDMA)

	 * address, for any side protocols which peek at it */

	xprt->prot = IPPROTO_TCP;

	xprt->xprt_class = &xprt_rdma;

	xprt->addrlen = args->addrlen;

	memcpy(&xprt->addr, sap, xprt->addrlen);

net/sunrpc/xprtsock.c

+9 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ static unsigned int xprt_max_resvport_limit = RPC_MAX_RESVPORT; 


static struct ctl_table_header *sunrpc_table_header;



static struct xprt_class xs_local_transport;

static struct xprt_class xs_udp_transport;

static struct xprt_class xs_tcp_transport;

static struct xprt_class xs_bc_tcp_transport;



/*

 * FIXME: changing the UDP slot table size should also resize the UDP

 *        socket buffers for existing UDP transports
@@ -2779,6 +2784,7 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args) 
	transport = container_of(xprt, struct sock_xprt, xprt);



	xprt->prot = 0;

	xprt->xprt_class = &xs_local_transport;

	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;



	xprt->bind_timeout = XS_BIND_TO;
@@ -2848,6 +2854,7 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args) 
	transport = container_of(xprt, struct sock_xprt, xprt);



	xprt->prot = IPPROTO_UDP;

	xprt->xprt_class = &xs_udp_transport;

	/* XXX: header size can vary due to auth type, IPv6, etc. */

	xprt->max_payload = (1U << 16) - (MAX_HEADER << 3);
@@ -2928,6 +2935,7 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) 
	transport = container_of(xprt, struct sock_xprt, xprt);



	xprt->prot = IPPROTO_TCP;

	xprt->xprt_class = &xs_tcp_transport;

	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;



	xprt->bind_timeout = XS_BIND_TO;
@@ -3001,6 +3009,7 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args) 
	transport = container_of(xprt, struct sock_xprt, xprt);



	xprt->prot = IPPROTO_TCP;

	xprt->xprt_class = &xs_bc_tcp_transport;

	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;

	xprt->timeout = &xs_tcp_default_timeout;