From patchwork Fri Oct 7 10:01:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9365945 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 911426077E for ; Fri, 7 Oct 2016 10:06:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81B892949C for ; Fri, 7 Oct 2016 10:06:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 769622949E; Fri, 7 Oct 2016 10:06:51 +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 1790A2949C for ; Fri, 7 Oct 2016 10:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752807AbcJGKGu (ORCPT ); Fri, 7 Oct 2016 06:06:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53530 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752385AbcJGKGt (ORCPT ); Fri, 7 Oct 2016 06:06:49 -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 877F761A11; Fri, 7 Oct 2016 10:06:49 +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 u97A6l9F026548; Fri, 7 Oct 2016 06:06:48 -0400 From: Stefan Hajnoczi To: linux-nfs@vger.kernel.org Cc: Anna Schumaker , "J. Bruce Fields" , Trond Myklebust , Stefan Hajnoczi Subject: [PATCH v2 08/10] SUNRPC: add AF_VSOCK support to svc_xprt.c Date: Fri, 7 Oct 2016 11:01:52 +0100 Message-Id: <1475834514-4058-9-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.26]); Fri, 07 Oct 2016 10:06:49 +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 Allow creation of AF_VSOCK service xprts. This is needed for the "vsock-bc" backchannel. Signed-off-by: Stefan Hajnoczi --- include/linux/sunrpc/svc_xprt.h | 12 ++++++++++++ net/sunrpc/svc_xprt.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h index ab02a45..01834f2 100644 --- a/include/linux/sunrpc/svc_xprt.h +++ b/include/linux/sunrpc/svc_xprt.h @@ -8,6 +8,7 @@ #define SUNRPC_SVC_XPRT_H #include +#include struct module; @@ -153,12 +154,15 @@ static inline unsigned short svc_addr_port(const struct sockaddr *sa) { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sa; + const struct sockaddr_vm *svm = (const struct sockaddr_vm *)sa; switch (sa->sa_family) { case AF_INET: return ntohs(sin->sin_port); case AF_INET6: return ntohs(sin6->sin6_port); + case AF_VSOCK: + return svm->svm_port; } return 0; @@ -171,6 +175,8 @@ static inline size_t svc_addr_len(const struct sockaddr *sa) return sizeof(struct sockaddr_in); case AF_INET6: return sizeof(struct sockaddr_in6); + case AF_VSOCK: + return sizeof(struct sockaddr_vm); } BUG(); } @@ -190,6 +196,7 @@ static inline char *__svc_print_addr(const struct sockaddr *addr, { const struct sockaddr_in *sin = (const struct sockaddr_in *)addr; const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)addr; + const struct sockaddr_vm *svm = (const struct sockaddr_vm *)addr; switch (addr->sa_family) { case AF_INET: @@ -203,6 +210,11 @@ static inline char *__svc_print_addr(const struct sockaddr *addr, ntohs(sin6->sin6_port)); break; + case AF_VSOCK: + snprintf(buf, len, "%u, port=%u", + svm->svm_cid, svm->svm_port); + break; + default: snprintf(buf, len, "unknown address type: %d", addr->sa_family); break; diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index c3f6523..d929bc7 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -195,6 +196,13 @@ static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, .sin6_port = htons(port), }; #endif +#ifdef CONFIG_SUNRPC_XPRT_VSOCK + struct sockaddr_vm svm = { + .svm_family = AF_VSOCK, + .svm_cid = VMADDR_CID_ANY, + .svm_port = port, + }; +#endif struct sockaddr *sap; size_t len; @@ -209,6 +217,12 @@ static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, len = sizeof(sin6); break; #endif +#ifdef CONFIG_SUNRPC_XPRT_VSOCK + case AF_VSOCK: + sap = (struct sockaddr *)&svm; + len = sizeof(svm); + break; +#endif default: return ERR_PTR(-EAFNOSUPPORT); } @@ -595,6 +609,10 @@ int svc_port_is_privileged(struct sockaddr *sin) case AF_INET6: return ntohs(((struct sockaddr_in6 *)sin)->sin6_port) < PROT_SOCK; + case AF_VSOCK: + return ((struct sockaddr_vm *)sin)->svm_port <= + LAST_RESERVED_PORT; + default: return 0; }