From patchwork Fri Oct 7 10:01:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9365949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7665F6077E for ; Fri, 7 Oct 2016 10:06:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66F4D2949C for ; Fri, 7 Oct 2016 10:06:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BD472949E; Fri, 7 Oct 2016 10:06:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F134F2949C for ; Fri, 7 Oct 2016 10:06:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752824AbcJGKGy (ORCPT ); Fri, 7 Oct 2016 06:06:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42052 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752385AbcJGKGx (ORCPT ); Fri, 7 Oct 2016 06:06:53 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D47F19D38F; Fri, 7 Oct 2016 10:06:53 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u97A6puf026629; Fri, 7 Oct 2016 06:06:52 -0400 From: Stefan Hajnoczi To: linux-nfs@vger.kernel.org Cc: Anna Schumaker , "J. Bruce Fields" , Trond Myklebust , Stefan Hajnoczi Subject: [PATCH v2 10/10] NFS: add AF_VSOCK support to NFS client Date: Fri, 7 Oct 2016 11:01:54 +0100 Message-Id: <1475834514-4058-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1475834514-4058-1-git-send-email-stefanha@redhat.com> References: <1475834514-4058-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Oct 2016 10:06:53 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds AF_VSOCK to the NFS client. Mounts can now use the "vsock" proto option and pass "vsock:" address strings, which are interpreted by sunrpc for xprt creation. Signed-off-by: Stefan Hajnoczi --- fs/nfs/client.c | 2 ++ fs/nfs/super.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 1e10678..71c5b33 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -434,6 +435,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto, switch (proto) { case XPRT_TRANSPORT_TCP: case XPRT_TRANSPORT_RDMA: + case XPRT_TRANSPORT_VSOCK: if (retrans == NFS_UNSPEC_RETRANS) to->to_retries = NFS_DEF_TCP_RETRANS; if (timeo == NFS_UNSPEC_TIMEO || to->to_retries == 0) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index d396013..01e0589 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -191,7 +191,7 @@ static const match_table_t nfs_mount_option_tokens = { enum { Opt_xprt_udp, Opt_xprt_udp6, Opt_xprt_tcp, Opt_xprt_tcp6, Opt_xprt_rdma, - Opt_xprt_rdma6, + Opt_xprt_rdma6, Opt_xprt_vsock, Opt_xprt_err }; @@ -203,6 +203,7 @@ static const match_table_t nfs_xprt_protocol_tokens = { { Opt_xprt_tcp6, "tcp6" }, { Opt_xprt_rdma, "rdma" }, { Opt_xprt_rdma6, "rdma6" }, + { Opt_xprt_vsock, "vsock" }, { Opt_xprt_err, NULL } }; @@ -971,6 +972,8 @@ static int nfs_verify_server_address(struct sockaddr *addr) struct in6_addr *sa = &((struct sockaddr_in6 *)addr)->sin6_addr; return !ipv6_addr_any(sa); } + case AF_VSOCK: + return 1; } dfprintk(MOUNT, "NFS: Invalid IP address specified\n"); @@ -1000,6 +1003,7 @@ static void nfs_validate_transport_protocol(struct nfs_parsed_mount_data *mnt) case XPRT_TRANSPORT_UDP: case XPRT_TRANSPORT_TCP: case XPRT_TRANSPORT_RDMA: + case XPRT_TRANSPORT_VSOCK: break; default: mnt->nfs_server.protocol = XPRT_TRANSPORT_TCP; @@ -1481,6 +1485,11 @@ static int nfs_parse_mount_options(char *raw, mnt->nfs_server.protocol = XPRT_TRANSPORT_RDMA; xprt_load_transport(string); break; + case Opt_xprt_vsock: + protofamily = AF_VSOCK; + mnt->flags &= ~NFS_MOUNT_TCP; + mnt->nfs_server.protocol = XPRT_TRANSPORT_VSOCK; + break; default: dfprintk(MOUNT, "NFS: unrecognized " "transport protocol\n");