From patchwork Fri Nov 6 22:55:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 11888341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E59EB1744 for ; Fri, 6 Nov 2020 23:05:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C45752078B for ; Fri, 6 Nov 2020 23:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604703952; bh=7qcNQs7RSCAyBzgCEDbSTByzEUxtTc4xEJN4IEq5Ri8=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=J8y3GrPwZv7MrXjNnlCqgHLGkXfBb+OserRgESdI3xmqGaIAbR62SfLT0LTW6LwVI adUrgT7hlxuohWNGDr3i4vYoAkjV1zDNukSb8A29BUB/A6WeuNefRBYlgU7GrsH+Dx l/Mkf1+juu4QgrXZHJUoO6Aptr/ofqP2/0MvamaI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729036AbgKFXFw (ORCPT ); Fri, 6 Nov 2020 18:05:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:50806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729018AbgKFXFu (ORCPT ); Fri, 6 Nov 2020 18:05:50 -0500 Received: from localhost.localdomain (c-68-36-133-222.hsd1.mi.comcast.net [68.36.133.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3DB22151B for ; Fri, 6 Nov 2020 23:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604703950; bh=7qcNQs7RSCAyBzgCEDbSTByzEUxtTc4xEJN4IEq5Ri8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ndtxvvO8k2Mgeu+HrKhIrXxwtYDwOfiwaOkbLplC8RGaBdGQN1QCHJ/G+XWnfLz1z 17xOPJSppORqzUewq7cO3vH/0vNzKmC0LN6qqnG+U5hT2tL4yyKSUWeLkiXDJv6geS iWig4eqCGalv9oEy3Q3vQcjIGtxIfzPDdbtt1ENA= From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH 3/3] NFSv4/pNFS: Store the transport type in struct nfs4_pnfs_ds_addr Date: Fri, 6 Nov 2020 17:55:27 -0500 Message-Id: <20201106225527.19148-4-trondmy@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201106225527.19148-3-trondmy@kernel.org> References: <20201106225527.19148-1-trondmy@kernel.org> <20201106225527.19148-2-trondmy@kernel.org> <20201106225527.19148-3-trondmy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust 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 --- fs/nfs/pnfs.h | 1 + fs/nfs/pnfs_nfs.c | 66 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 53 insertions(+), 14 deletions(-) diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 2661c44c62db..20ee37b751e3 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -51,6 +51,7 @@ struct nfs4_pnfs_ds_addr { size_t da_addrlen; struct list_head da_node; /* nfs4_pnfs_dev_hlist dev_dslist */ char *da_remotestr; /* human readable addr+port */ + int da_transport; }; struct nfs4_pnfs_ds { diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index 7027dac41cc7..d00750743100 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -854,13 +854,15 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, if (!IS_ERR(clp)) { struct xprt_create xprt_args = { - .ident = XPRT_TRANSPORT_TCP, + .ident = da->da_transport, .net = clp->cl_net, .dstaddr = (struct sockaddr *)&da->da_addr, .addrlen = da->da_addrlen, .servername = clp->cl_hostname, }; + if (da->da_transport != clp->cl_proto) + continue; if (da->da_addr.ss_family != clp->cl_addr.ss_family) continue; /* Add this address as an alias */ @@ -870,7 +872,7 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, } clp = get_v3_ds_connect(mds_srv, (struct sockaddr *)&da->da_addr, - da->da_addrlen, IPPROTO_TCP, + da->da_addrlen, da->da_transport, timeo, retrans); if (IS_ERR(clp)) continue; @@ -908,7 +910,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, if (!IS_ERR(clp) && clp->cl_mvops->session_trunk) { struct xprt_create xprt_args = { - .ident = XPRT_TRANSPORT_TCP, + .ident = da->da_transport, .net = clp->cl_net, .dstaddr = (struct sockaddr *)&da->da_addr, .addrlen = da->da_addrlen, @@ -923,6 +925,8 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, .data = &xprtdata, }; + if (da->da_transport != clp->cl_proto) + continue; if (da->da_addr.ss_family != clp->cl_addr.ss_family) continue; /** @@ -937,8 +941,9 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv, } else { clp = nfs4_set_ds_client(mds_srv, (struct sockaddr *)&da->da_addr, - da->da_addrlen, IPPROTO_TCP, - timeo, retrans, minor_version); + da->da_addrlen, + da->da_transport, timeo, + retrans, minor_version); if (IS_ERR(clp)) continue; @@ -1017,6 +1022,41 @@ int nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds, } EXPORT_SYMBOL_GPL(nfs4_pnfs_ds_connect); +struct xprt_lookup_transport { + const char *name; + sa_family_t protofamily; + int type; +}; + +static const struct xprt_lookup_transport xl_xprt[] = { + { "tcp", AF_INET, XPRT_TRANSPORT_TCP }, + { "tcp6", AF_INET6, XPRT_TRANSPORT_TCP }, + { "rdma", AF_INET, XPRT_TRANSPORT_RDMA }, + { "rdma6", AF_INET6, XPRT_TRANSPORT_RDMA }, + { "udp", AF_INET, XPRT_TRANSPORT_UDP }, + { "udp6", AF_INET6, XPRT_TRANSPORT_UDP }, + { NULL, 0, -1 }, +}; + +static int +nfs4_decode_transport(const char *str, size_t len, sa_family_t protofamily) +{ + const struct xprt_lookup_transport *p; + + for (p = xl_xprt; p->name; p++) { + if (p->protofamily != protofamily) + continue; + if (strlen(p->name) != len) + continue; + if (memcmp(p->name, str, len) != 0) + continue; + if (xprt_load_transport(p->name) != 0) + continue; + return p->type; + } + return -1; +} + /* * Currently only supports ipv4, ipv6 and one multi-path address. */ @@ -1029,8 +1069,8 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags) int nlen, rlen; int tmp[2]; __be32 *p; - char *netid, *match_netid; - size_t len, match_netid_len; + char *netid; + size_t len; char *startsep = ""; char *endsep = ""; @@ -1114,15 +1154,11 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags) case AF_INET: ((struct sockaddr_in *)&da->da_addr)->sin_port = port; da->da_addrlen = sizeof(struct sockaddr_in); - match_netid = "tcp"; - match_netid_len = 3; break; case AF_INET6: ((struct sockaddr_in6 *)&da->da_addr)->sin6_port = port; da->da_addrlen = sizeof(struct sockaddr_in6); - match_netid = "tcp6"; - match_netid_len = 4; startsep = "["; endsep = "]"; break; @@ -1133,9 +1169,11 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags) goto out_free_da; } - if (nlen != match_netid_len || strncmp(netid, match_netid, nlen)) { - dprintk("%s: ERROR: r_netid \"%s\" != \"%s\"\n", - __func__, netid, match_netid); + da->da_transport = nfs4_decode_transport(netid, nlen, + da->da_addr.ss_family); + if (da->da_transport == -1) { + dprintk("%s: ERROR: unknown r_netid \"%*s\"\n", + __func__, nlen, netid); goto out_free_da; }