Allow creation of AF_VSOCK service xprts. This is needed for the "vsock-bc" backchannel. Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx> --- 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 <linux/sunrpc/svc.h> +#include <linux/vm_sockets.h> 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 <linux/kthread.h> #include <linux/slab.h> #include <net/sock.h> +#include <net/af_vsock.h> #include <linux/sunrpc/addr.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/svc_xprt.h> @@ -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; } -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html