From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65A6014A60F for ; Tue, 21 Oct 2025 23:47:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090422; cv=none; b=M9MDLzdGMOaxy2OGxZV5c/Yb+wAy+AC3SP+AvzhL1PWutyeYWyh/CWgBeaaVkAnty/b9y+2rQvaaOL1k1MlU9ek7X0VyIHYQHRniblmUlQb60AfM9gpk9frnyXi8vyVWvJlnE6yO8K9o7gKACslsmraYKUednWv3I8BSEf3a8MM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090422; c=relaxed/simple; bh=i/0blcvw30L2XmsZDP8JwezkIYQz0CtWUOjE1zydzXY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qhZE91FiKVrvDrC3Tq4n+9WNOwl3UQb+XPLB2mjKG74r5T1aki4wtEuIhBT+e46JpY9URtkBgQHhzXOPRo7enopa+6WR4AM2oEpAy7WnCbUB8sDqlEBLQ85E7QqMVsz3lN12T6mFTgqxhLIxPzf06amjjHzWInaiIPYI9/6LsOw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bADi7B/p; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bADi7B/p" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-33b9dc8d517so5620967a91.0 for ; Tue, 21 Oct 2025 16:47:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090420; x=1761695220; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ux00ENqxNtzazJRP0kNIFZEFFfqT/sB9ciqM1XMIy8Y=; b=bADi7B/pZVDCE7VQv7lugnzQ18wRMEqm0V+SsIVNvoOsEejkuOFcmucO70NUMdlrRn nDgIfYNZFKZpatd2u9Ouia5gQcwNGRFmEg+bTsP+4w5feLim+Bj8M5wP1FHn6cjbhGqj IZeB8umpj4ftY9zphnMT5lDd5Dv8NP8ePlgItJgbl8NvdtI8GbT1A8PicdvliKK9dBkZ ZzJ33tn28IB63lB35dsp6/9vnTxSg3zAC8vCxCg8lfa0MlVsmXgR8pPI6Yw7Tcpegb/J VUs6rzSPXDRveYIJ2t8enX41n3ysSdp7tQMviUFFnrHbwM14mZCDSuzwgkvodgByLUvy vz5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090420; x=1761695220; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ux00ENqxNtzazJRP0kNIFZEFFfqT/sB9ciqM1XMIy8Y=; b=WwIuH529sCQti+f+hgM/VU4uxdYP1J0OaOYA6bPWVdE1UhSw1wVeW4jGha5nPJD2av TmuRMidL71eSMWiFlT0wgrb8uCS0VTxZQMGCIWBDVlnJJnlcjyW2ECpvdGAI/IB3Q6NC F6wBA1JGwFhAicgPL4ktS54i1rVra4tryJ4OWKVW2hokE9cSoZ+M0bdBP/TEATugIaKC Ravo27G99XEkbZtvXDUrcHR0AAvapy274tYCGLmFqFiwuso8uOFlLFjXwVOJJkhfJbsZ ndvwqba5CncQ8Z9G4K8xgGkhdf1MtQY+Fnjq0ljgJYAF7lu87P3TEa5lLGVj8pcqjUKt TZ2g== X-Forwarded-Encrypted: i=1; AJvYcCVNjUubETDSRpTMxllVYNLCPuLyBjE9toPPYAojH5hN3n9EmDffkcxA15LZ7CSp6rSDb3mGDBgq+St70kc=@vger.kernel.org X-Gm-Message-State: AOJu0YyEyuXEeNKUisjTxjNHWtRJPPo4fbj/3wh6Va/8Gk28pIaVGVNB iJZmEn/SPFRJ9tX+JqoPS3bzSeIMdX4ObbyT4G56sHsK1FzmBjcKbgsm X-Gm-Gg: ASbGnctmu559uhLH93qfKQ5S/ksY1Fp8tDJT7QU+ns9xc78sfa2EKjT8RfKNFWlnSVQ Qx72rsbcgHfMJwu9WMbRI7ocR5kXtKOGqutswnYVWPR/76B/csolXjvUqNY+tyEgmEGKsjtfx17 tHWL3asdX2I6R9+U+5jUIGoOfDUoJLCjFLGmCx+GG81IXpeoiY27d8uW6aadQSxzYLlK7s+0Ad8 MIn3tNAebthi0bIXv+Q6w7ixMzkpGVG0pUGBoK9P4QpewcYNvM5+DzW3Jcb2vCjkjEBprSOdfsF 20OljsGBNVt9CBtqsTAHL2fp55wnf4Y52rAb9uiVBVf6OJOl7dLcGT/eH5ApMImzB88m15QZ81S KN2MRqrHrUtAGoVxLD2vtyRQMdu7ZufGpWxZMDAS9oDdoZXSYwgb/4nP9BzUbJlPcWlCbufkQ X-Google-Smtp-Source: AGHT+IHeGId/ywDSD1+B3HjeV1Dv8DYhirb7ZJAGBaWWTqw55VcAYUuGBf/b9fQl2uNxLFwxdMYmNQ== X-Received: by 2002:a17:903:2445:b0:25c:25f1:542d with SMTP id d9443c01a7336-290ca1219e1mr253823315ad.36.1761090419637; Tue, 21 Oct 2025 16:46:59 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292471fd9e8sm120714105ad.85.2025.10.21.16.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:46:59 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:44 -0700 Subject: [PATCH net-next v7 01/26] vsock: a per-net vsock NS mode state Precedence: bulk X-Mailing-List: linux-hyperv@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251021-vsock-vmtest-v7-1-0661b7b6f081@meta.com> References: <20251021-vsock-vmtest-v7-0-0661b7b6f081@meta.com> In-Reply-To: <20251021-vsock-vmtest-v7-0-0661b7b6f081@meta.com> To: Stefano Garzarella , Shuah Khan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list , Bobby Eshleman Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, berrange@redhat.com, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Add the per-net vsock NS mode state. This only adds the structure for holding the mode and some of the functions for setting/getting and checking the mode, but does not integrate the functionality yet. A "net_mode" field is added to vsock_sock to store the mode of the namespace when the vsock_sock was created. In order to evaluate namespace mode rules we need to know both a) which namespace the endpoints are in, and b) what mode that namespace had when the endpoints were created. This allows us to handle the changing of modes from global to local *after* a socket has been created by remembering that the mode was global when the socket was created. If we were to use the current net's mode instead, then the lookup would fail and the socket would break. Signed-off-by: Bobby Eshleman --- Changes in v7: - clarify vsock_net_check_mode() comments - change to `orig_net_mode == VSOCK_NET_MODE_GLOBAL && orig_net_mode == vsk->orig_net_mode` - remove extraneous explanation of `orig_net_mode` - rename `written` to `mode_locked` - rename `vsock_hdr` to `sysctl_hdr` - change `orig_net_mode` to `net_mode` - make vsock_net_check_mode() more generic by taking just net pointers and modes, instead of a vsock_sock ptr, for reuse by transports (e.g., vhost_vsock) Changes in v6: - add orig_net_mode to store mode at creation time which will be used to avoid breakage when namespace changes mode during socket/VM lifespan Changes in v5: - use /proc/sys/net/vsock/ns_mode instead of /proc/net/vsock_ns_mode - change from net->vsock.ns_mode to net->vsock.mode - change vsock_net_set_mode() to vsock_net_write_mode() - vsock_net_write_mode() returns bool for write success to avoid need to use vsock_net_mode_can_set() - remove vsock_net_mode_can_set() --- MAINTAINERS | 1 + include/net/af_vsock.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ include/net/net_namespace.h | 4 +++ include/net/netns/vsock.h | 20 ++++++++++++++ 4 files changed, 89 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4faa7719bf86..c58f9e38898a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -27062,6 +27062,7 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/vhost/vsock.c F: include/linux/virtio_vsock.h +F: include/net/netns/vsock.h F: include/uapi/linux/virtio_vsock.h F: net/vmw_vsock/virtio_transport.c F: net/vmw_vsock/virtio_transport_common.c diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index d40e978126e3..a1053d3668cf 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -65,6 +66,7 @@ struct vsock_sock { u32 peer_shutdown; bool sent_request; bool ignore_connecting_rst; + enum vsock_net_mode net_mode; /* Protected by lock_sock(sk) */ u64 buffer_size; @@ -256,4 +258,66 @@ static inline bool vsock_msgzerocopy_allow(const struct vsock_transport *t) { return t->msgzerocopy_allow && t->msgzerocopy_allow(); } + +static inline enum vsock_net_mode vsock_net_mode(struct net *net) +{ + enum vsock_net_mode ret; + + spin_lock_bh(&net->vsock.lock); + ret = net->vsock.mode; + spin_unlock_bh(&net->vsock.lock); + return ret; +} + +static inline bool vsock_net_write_mode(struct net *net, u8 mode) +{ + bool ret; + + spin_lock_bh(&net->vsock.lock); + + if (net->vsock.mode_locked) { + ret = false; + goto skip; + } + + net->vsock.mode = mode; + net->vsock.mode_locked = true; + ret = true; + +skip: + spin_unlock_bh(&net->vsock.lock); + return ret; +} + +/* Return true if two namespaces and modes pass the mode rules. Otherwise, + * return false. + * + * ns0 and ns1 are the namespaces being checked. + * mode0 and mode1 are the vsock namespace modes of ns0 and ns1. + * + * Read more about modes in the comment header of net/vmw_vsock/af_vsock.c. + */ +static inline bool vsock_net_check_mode(struct net *ns0, enum vsock_net_mode mode0, + struct net *ns1, enum vsock_net_mode mode1) +{ + /* Any vsocks within the same network namespace are always reachable, + * regardless of the mode. + */ + if (net_eq(ns0, ns1)) + return true; + + /* + * If the network namespaces differ, vsocks are only reachable if both + * were created in VSOCK_NET_MODE_GLOBAL mode. + * + * The vsock namespace mode is write-once, and the default is + * VSOCK_NET_MODE_GLOBAL. Once set to VSOCK_NET_MODE_LOCAL, it cannot + * revert to GLOBAL. It is not possible to have a case where a socket + * was created in LOCAL mode, and then the mode switched to GLOBAL. + * + * As a result, we only need to check if the modes were global at + * creation time. + */ + return mode0 == VSOCK_NET_MODE_GLOBAL && mode0 == mode1; +} #endif /* __AF_VSOCK_H__ */ diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index cb664f6e3558..66d3de1d935f 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -196,6 +197,9 @@ struct net { /* Move to a better place when the config guard is removed. */ struct mutex rtnl_mutex; #endif +#if IS_ENABLED(CONFIG_VSOCKETS) + struct netns_vsock vsock; +#endif } __randomize_layout; #include diff --git a/include/net/netns/vsock.h b/include/net/netns/vsock.h new file mode 100644 index 000000000000..c9a438ad52f2 --- /dev/null +++ b/include/net/netns/vsock.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __NET_NET_NAMESPACE_VSOCK_H +#define __NET_NET_NAMESPACE_VSOCK_H + +#include + +enum vsock_net_mode { + VSOCK_NET_MODE_GLOBAL, + VSOCK_NET_MODE_LOCAL, +}; + +struct netns_vsock { + struct ctl_table_header *sysctl_hdr; + spinlock_t lock; + + /* protected by lock */ + enum vsock_net_mode mode; + bool mode_locked; +}; +#endif /* __NET_NET_NAMESPACE_VSOCK_H */ -- 2.47.3