From patchwork Fri Oct 7 10:01:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9365927 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 94D7860752 for ; Fri, 7 Oct 2016 10:05:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85AC32949B for ; Fri, 7 Oct 2016 10:05:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A5662949D; Fri, 7 Oct 2016 10:05:04 +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 2B9ED2949B for ; Fri, 7 Oct 2016 10:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbcJGKFD (ORCPT ); Fri, 7 Oct 2016 06:05:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39118 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752214AbcJGKFB (ORCPT ); Fri, 7 Oct 2016 06:05:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 2309E1E20 for ; Fri, 7 Oct 2016 10:04:31 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u97A4GLB001348; Fri, 7 Oct 2016 06:04:26 -0400 From: Stefan Hajnoczi To: linux-nfs@vger.kernel.org Cc: Stefan Hajnoczi Subject: [PATCH 4/4] getport: recognize "vsock" netid Date: Fri, 7 Oct 2016 11:01:43 +0100 Message-Id: <1475834503-3984-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1475834503-3984-1-git-send-email-stefanha@redhat.com> References: <1475834503-3984-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 07 Oct 2016 10:04:31 +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 Neither libtirpc nor getprotobyname(3) know about AF_VSOCK. For similar reasons as for "rdma"/"rmda6", translate "vsock" manually in getport.c. It is now possible to mount a file system from the host (hypervisor) over AF_VSOCK like this: (guest)$ mount.nfs 2:/export /mnt -v -o clientaddr=3,proto=vsock The VM's cid address is 3 and the hypervisor is 2. Signed-off-by: Stefan Hajnoczi --- support/nfs/getport.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/support/nfs/getport.c b/support/nfs/getport.c index 081594c..0b857af 100644 --- a/support/nfs/getport.c +++ b/support/nfs/getport.c @@ -217,8 +217,7 @@ nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol) struct protoent *proto; /* - * IANA does not define a protocol number for rdma netids, - * since "rdma" is not an IP protocol. + * IANA does not define protocol numbers for non-IP netids. */ if (strcmp(netid, "rdma") == 0) { *family = AF_INET; @@ -230,6 +229,11 @@ nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol) *protocol = NFSPROTO_RDMA; return 1; } + if (strcmp(netid, "vsock") == 0) { + *family = AF_VSOCK; + *protocol = 0; + return 1; + } nconf = getnetconfigent(netid); if (nconf == NULL) @@ -258,14 +262,18 @@ nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol) struct protoent *proto; /* - * IANA does not define a protocol number for rdma netids, - * since "rdma" is not an IP protocol. + * IANA does not define protocol numbers for non-IP netids. */ if (strcmp(netid, "rdma") == 0) { *family = AF_INET; *protocol = NFSPROTO_RDMA; return 1; } + if (strcmp(netid, "vsock") == 0) { + *family = AF_VSOCK; + *protocol = 0; + return 1; + } proto = getprotobyname(netid); if (proto == NULL)