leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSv4/pNFS: Store the transport type in struct nfs4_pnfs_ds_addr

Browse Source 
We want to enable RDMA and UDP as valid transport methods if a
GETDEVICEINFO call specifies it. Do so by adding a parser for the
netid that translates it to an appropriate argument for the RPC
transport layer.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2020-11-06 16:10:52 -05:00
parent 190c75a31f
commit 4be78d2681
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/pnfs.h
View File

@ -51,6 +51,8 @@ struct nfs4_pnfs_ds_addr {
size_t da_addrlen; size_t da_addrlen;
struct list_head da_node; /* nfs4_pnfs_dev_hlist dev_dslist */ struct list_head da_node; /* nfs4_pnfs_dev_hlist dev_dslist */
char *da_remotestr; /* human readable addr+port */ char *da_remotestr; /* human readable addr+port */
const char *da_netid;
int da_transport;
}; };
struct nfs4_pnfs_ds { struct nfs4_pnfs_ds {

34
fs/nfs/pnfs_nfs.c
View File

@ -672,6 +672,7 @@ static struct nfs4_pnfs_ds_addr *nfs4_pnfs_ds_addr_alloc(gfp_t gfp_flags)
static void nfs4_pnfs_ds_addr_free(struct nfs4_pnfs_ds_addr *da) static void nfs4_pnfs_ds_addr_free(struct nfs4_pnfs_ds_addr *da)
{ {
kfree(da->da_remotestr); kfree(da->da_remotestr);
kfree(da->da_netid);
kfree(da); kfree(da);
} }
@ -867,13 +868,15 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,
if (!IS_ERR(clp)) { if (!IS_ERR(clp)) {
struct xprt_create xprt_args = { struct xprt_create xprt_args = {
.ident = XPRT_TRANSPORT_TCP, .ident = da->da_transport,
.net = clp->cl_net, .net = clp->cl_net,
.dstaddr = (struct sockaddr *)&da->da_addr, .dstaddr = (struct sockaddr *)&da->da_addr,
.addrlen = da->da_addrlen, .addrlen = da->da_addrlen,
.servername = clp->cl_hostname, .servername = clp->cl_hostname,
}; };
if (da->da_transport != clp->cl_proto)
continue;
if (da->da_addr.ss_family != clp->cl_addr.ss_family) if (da->da_addr.ss_family != clp->cl_addr.ss_family)
continue; continue;
/* Add this address as an alias */ /* Add this address as an alias */
@ -883,7 +886,7 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,
} }
clp = get_v3_ds_connect(mds_srv, clp = get_v3_ds_connect(mds_srv,
(struct sockaddr *)&da->da_addr, (struct sockaddr *)&da->da_addr,
da->da_addrlen, IPPROTO_TCP, da->da_addrlen, da->da_transport,
timeo, retrans); timeo, retrans);
if (IS_ERR(clp)) if (IS_ERR(clp))
continue; continue;
@ -921,7 +924,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,
if (!IS_ERR(clp) && clp->cl_mvops->session_trunk) { if (!IS_ERR(clp) && clp->cl_mvops->session_trunk) {
struct xprt_create xprt_args = { struct xprt_create xprt_args = {
.ident = XPRT_TRANSPORT_TCP, .ident = da->da_transport,
.net = clp->cl_net, .net = clp->cl_net,
.dstaddr = (struct sockaddr *)&da->da_addr, .dstaddr = (struct sockaddr *)&da->da_addr,
.addrlen = da->da_addrlen, .addrlen = da->da_addrlen,
@ -935,6 +938,8 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,
.data = &xprtdata, .data = &xprtdata,
}; };
if (da->da_transport != clp->cl_proto)
continue;
if (da->da_addr.ss_family != clp->cl_addr.ss_family) if (da->da_addr.ss_family != clp->cl_addr.ss_family)
continue; continue;
/** /**
@ -950,8 +955,9 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,
} else { } else {
clp = nfs4_set_ds_client(mds_srv, clp = nfs4_set_ds_client(mds_srv,
(struct sockaddr *)&da->da_addr, (struct sockaddr *)&da->da_addr,
da->da_addrlen, IPPROTO_TCP, da->da_addrlen,
timeo, retrans, minor_version); da->da_transport, timeo,
retrans, minor_version);
if (IS_ERR(clp)) if (IS_ERR(clp))
continue; continue;
@ -1042,8 +1048,8 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)
int nlen, rlen; int nlen, rlen;
int tmp[2]; int tmp[2];
__be32 *p; __be32 *p;
char *netid, *match_netid; char *netid;
size_t len, match_netid_len; size_t len;
char *startsep = ""; char *startsep = "";
char *endsep = ""; char *endsep = "";
@ -1125,15 +1131,11 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)
case AF_INET: case AF_INET:
((struct sockaddr_in *)&da->da_addr)->sin_port = port; ((struct sockaddr_in *)&da->da_addr)->sin_port = port;
da->da_addrlen = sizeof(struct sockaddr_in); da->da_addrlen = sizeof(struct sockaddr_in);
match_netid = "tcp";
match_netid_len = 3;
break; break;
case AF_INET6: case AF_INET6:
((struct sockaddr_in6 *)&da->da_addr)->sin6_port = port; ((struct sockaddr_in6 *)&da->da_addr)->sin6_port = port;
da->da_addrlen = sizeof(struct sockaddr_in6); da->da_addrlen = sizeof(struct sockaddr_in6);
match_netid = "tcp6";
match_netid_len = 4;
startsep = "["; startsep = "[";
endsep = "]"; endsep = "]";
break; break;
@ -1144,12 +1146,15 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)
goto out_free_da; goto out_free_da;
} }
if (nlen != match_netid_len || strncmp(netid, match_netid, nlen)) { da->da_transport = xprt_find_transport_ident(netid);
dprintk("%s: ERROR: r_netid \"%s\" != \"%s\"\n", if (da->da_transport < 0) {
__func__, netid, match_netid); dprintk("%s: ERROR: unknown r_netid \"%s\"\n",
__func__, netid);
goto out_free_da; goto out_free_da;
} }
da->da_netid = netid;
/* save human readable address */ /* save human readable address */
len = strlen(startsep) + strlen(buf) + strlen(endsep) + 7; len = strlen(startsep) + strlen(buf) + strlen(endsep) + 7;
da->da_remotestr = kzalloc(len, gfp_flags); da->da_remotestr = kzalloc(len, gfp_flags);
@ -1161,7 +1166,6 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)
dprintk("%s: Parsed DS addr %s\n", __func__, da->da_remotestr); dprintk("%s: Parsed DS addr %s\n", __func__, da->da_remotestr);
kfree(buf); kfree(buf);
kfree(netid);
return da; return da;
out_free_da: out_free_da: