From: Bobby Eshleman <bobbyeshleman@meta.com>
To: "Stefano Garzarella" <sgarzare@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Simon Horman" <horms@kernel.org>,
"Jonathan Corbet" <corbet@lwn.net>,
"Shuah Khan" <skhan@linuxfoundation.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowangio@gmail.com>,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Shuah Khan" <shuah@kernel.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Donald Hunter" <donald.hunter@gmail.com>,
"Eric Dumazet" <edumazet@kernel.org>,
"George Zhang" <georgezhang@vmware.com>,
"Andy King" <acking@vmware.com>,
"Dmitry Torokhov" <dtor@vmware.com>,
"Eric Dumazet" <edumazet@kernel.org>
Cc: <virtualization@lists.linux.dev>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<kvm@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
<sargun@sargun.me>, <jlinbox@meta.com>,
Bobby Eshleman <bobbyeshleman@gmail.com>,
Bobby Eshleman <bobbyeshleman@meta.com>
Subject: [PATCH net-next v7 5/7] vsock/virtio: support guest device network namespace
Date: Tue, 17 Nov 2026 17:54:48 -0800 [thread overview]
Message-ID: <20261117-vsock-guest-ns-v7-5-7e522ea9dd9b@meta.com> (raw)
In-Reply-To: <20261117-vsock-guest-ns-v7-0-7e522ea9dd9b@meta.com>
virtio-vsock did not have namespace support (the device was always
accessible to any global namespace).
Make the virtio-vsock device assignable to a namespace by setting
.netns_assign_allow, and allow stream and seqpacket sockets from any
netns that can reach the device rather than only from global-mode ones.
The device starts out assigned to init_net, which is hardcoded to global
mode, so global namespaces see no change until the assign command is
issued. Local namespaces still cannot use the device.
An assign can land while virtio_transport_rx_work() is draining a
batch, so the assigned namespace is re-read per packet rather than once
per batch. Matching the rest of the batch against the namespace the
device has left would reset connections that belong to the new one.
When the device is assigned, VSOCK_CMD_DEV_NETNS_SET closes every
connected socket that can no longer reach it. A socket that completes
its handshake at the same time must not slip into the connected table
behind that sweep, so the listen and connecting receive paths now call
vsock_maybe_set_connected(), which checks reachability and inserts the
socket under the lock the sweep walks the table with. If the check
fails, the handshake is aborted and the host is sent a RST.
A socket closed by an assign can still try to send, e.g. a credit
update from setsockopt(SO_RCVLOWAT) or a shutdown. To stop that,
virtio_transport_send_pkt_info() now returns -ENETUNREACH without
sending when the socket's netns cannot reach the device. RSTs sent by
virtio_transport_reset_no_sock(), such as the one above, do not go
through it and still reach the host.
Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
---
Changes in v7:
- Tap with the assigned netns, add vsock_g2h_net_rcu() (Paolo, Sashiko)
- Fix stale comment and commit message (Sashiko)
Changes in v6:
- Move the reachability check from virtio_transport_send_pkt() to
virtio_transport_send_pkt_info(), so RSTs sent by
virtio_transport_reset_no_sock() still reach the host after an assign
(Paolo, Sashiko)
- Revert the v5 change that sent the recv_listen()/recv_connecting()
RSTs to the netns the packet arrived on; sock_net(sk) works again now
that those RSTs skip the check
- Export vsock_g2h_reachable_sk() for virtio_transport_send_pkt_info()
- Rewrite the commit message: drop what the previous patch already does
and describe the virtio_transport_send_pkt_info() check (Paolo)
Changes in v5:
- Send the RSTs in virtio_transport_recv_listen() and
virtio_transport_recv_connecting() to the netns the packet arrived on,
not the socket's: after an assign the socket's netns may no longer
reach the device, so the RST would be dropped by the reachability
check this patch adds to virtio_transport_send_pkt() (Stefano, Sashiko)
Changes in v4:
- Drop packets in virtio_transport_send_pkt() from a netns that cannot
reach the device, e.g. shutdown() or credit updates on a swept socket
(Sashiko)
Changes in v3:
- Re-read the assigned netns per packet in virtio_transport_rx_work()
rather than once per batch, so a mid-batch assign cannot reset the new
namespace's connections (Sashiko)
- Drop the NULL netns reset in virtio_transport_rx_work(), the assigned
netns is now pinned
- Drop the .reset op and the virtio_transport_reset{,_no_sock}() exports,
the sweep no longer sends a RST (Sashiko)
Changes in v2:
- Export virtio_transport_reset(), wire it to the new .reset op (Stefano)
- netns_assign_allow is now a bool (Stefano)
- Pass NULL, not &init_net, in virtio_transport_rx_work(), and
comment why (Stefano)
- Drop the if (net) guard around put_net() (Stefano)
- Drop the comments at the vsock_maybe_set_connected() call sites,
the commit msg seems sufficient
---
include/net/af_vsock.h | 2 ++
net/vmw_vsock/af_vsock.c | 14 +++++++++++--
net/vmw_vsock/virtio_transport.c | 30 +++++++++++++++++++-------
net/vmw_vsock/virtio_transport_common.c | 37 ++++++++++++++++++++++++++-------
4 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
index ce945a83a919..7765fc3ee6ca 100644
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
@@ -249,7 +249,9 @@ bool __vsock_find_cid(struct net *net, unsigned int cid);
void vsock_linger(struct sock *sk);
struct net *vsock_g2h_net_get(netns_tracker *tracker);
bool vsock_g2h_net_eq(const struct net *net);
+struct net *vsock_g2h_net_rcu(void);
bool vsock_g2h_net_reachable(struct net *net);
+bool vsock_g2h_reachable_sk(struct vsock_sock *vsk);
bool vsock_maybe_set_connected(struct vsock_sock *vsk);
/**** TAP ****/
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index dcd39ad43eec..33b1902f2637 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -128,7 +128,7 @@
* error that propagates to the user (as there is for connection attempts)
* because it is possible for some packet to reach this socket from
* a different transport that *does* support local mode. For
- * example, virtio-vsock may not support local mode, but the socket
+ * example, hyperv-vsock does not support local mode, but the socket
* may still accept a connection from vhost-vsock which does.
*
* - A guest has a single vsock device, owned by the guest->host transport.
@@ -914,6 +914,12 @@ bool vsock_g2h_net_eq(const struct net *net)
}
EXPORT_SYMBOL_GPL(vsock_g2h_net_eq);
+struct net *vsock_g2h_net_rcu(void)
+{
+ return rcu_dereference(vsock_g2h_net);
+}
+EXPORT_SYMBOL_GPL(vsock_g2h_net_rcu);
+
bool vsock_g2h_net_reachable(struct net *net)
{
bool reachable;
@@ -926,13 +932,17 @@ bool vsock_g2h_net_reachable(struct net *net)
}
EXPORT_SYMBOL_GPL(vsock_g2h_net_reachable);
-static bool vsock_g2h_reachable_sk(struct vsock_sock *vsk)
+/* True if @vsk can reach the g2h device, or its transport ignores namespace
+ * assignment.
+ */
+bool vsock_g2h_reachable_sk(struct vsock_sock *vsk)
{
if (!vsock_net_assignable(vsk->transport))
return true;
return vsock_g2h_net_reachable(sock_net(sk_vsock(vsk)));
}
+EXPORT_SYMBOL_GPL(vsock_g2h_reachable_sk);
/* Move @vsk to TCP_ESTABLISHED and into the connected table, unless the device
* has moved to a namespace @vsk cannot reach. Returns false without doing
diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index 1ddb6839a8fb..ba9081536212 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -150,7 +150,9 @@ static int virtio_transport_send_skb(struct sk_buff *skb, struct virtqueue *vq,
if (ret < 0)
return ret;
- virtio_transport_deliver_tap_pkt(skb, NULL);
+ rcu_read_lock();
+ virtio_transport_deliver_tap_pkt(skb, vsock_g2h_net_rcu());
+ rcu_read_unlock();
return 0;
}
@@ -542,7 +544,7 @@ static bool virtio_transport_msgzerocopy_allow(void)
bool virtio_transport_stream_allow(struct vsock_sock *vsk, u32 cid, u32 port)
{
- return vsock_net_mode_global(vsk);
+ return vsock_g2h_net_reachable(sock_net(sk_vsock(vsk)));
}
static bool virtio_transport_seqpacket_allow(struct vsock_sock *vsk,
@@ -587,6 +589,7 @@ static struct virtio_transport virtio_transport = {
.seqpacket_has_data = virtio_transport_seqpacket_has_data,
.msgzerocopy_allow = virtio_transport_msgzerocopy_allow,
+ .netns_assign_allow = true,
.notify_poll_in = virtio_transport_notify_poll_in,
.notify_poll_out = virtio_transport_notify_poll_out,
@@ -616,7 +619,7 @@ virtio_transport_seqpacket_allow(struct vsock_sock *vsk, u32 remote_cid)
struct virtio_vsock *vsock;
bool seqpacket_allow;
- if (!vsock_net_mode_global(vsk))
+ if (!vsock_g2h_net_reachable(sock_net(sk_vsock(vsk))))
return false;
seqpacket_allow = false;
@@ -633,7 +636,12 @@ static void virtio_transport_rx_work(struct work_struct *work)
{
struct virtio_vsock *vsock =
container_of(work, struct virtio_vsock, rx_work);
+ struct virtio_transport *t = &virtio_transport;
+ netns_tracker ns_tracker;
struct virtqueue *vq;
+ struct net *net;
+
+ net = vsock_g2h_net_get(&ns_tracker);
mutex_lock(&vsock->rx_lock);
@@ -680,12 +688,16 @@ static void virtio_transport_rx_work(struct work_struct *work)
if (payload_len)
virtio_vsock_skb_put(skb, payload_len);
- virtio_transport_deliver_tap_pkt(skb, NULL);
-
- /* Force virtio-transport into global mode since it
- * does not yet support local-mode namespacing.
+ /* Only grab a reference if the net changes underneath
+ * us.
*/
- virtio_transport_recv_pkt(&virtio_transport, skb, NULL);
+ if (unlikely(!vsock_g2h_net_eq(net))) {
+ put_net_track(net, &ns_tracker);
+ net = vsock_g2h_net_get(&ns_tracker);
+ }
+
+ virtio_transport_deliver_tap_pkt(skb, net);
+ virtio_transport_recv_pkt(t, skb, net);
}
} while (!virtqueue_enable_cb(vq));
@@ -694,6 +706,8 @@ static void virtio_transport_rx_work(struct work_struct *work)
virtio_vsock_rx_fill(vsock);
out_nofill:
mutex_unlock(&vsock->rx_lock);
+
+ put_net_track(net, &ns_tracker);
}
static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index 027fe41c676a..c8049dd80cbc 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -295,6 +295,9 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *
* since a socket assigned to a transport is required.
*
* Do not use on listener sockets!
+ *
+ * This checks that the socket can reach the g2h device, so device-only replies
+ * such as virtio_transport_reset_no_sock() must keep not using this path.
*/
static int virtio_transport_send_pkt_info(struct vsock_sock *vsk,
struct virtio_vsock_pkt_info *info)
@@ -317,6 +320,9 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk,
if (unlikely(!t_ops))
return -EFAULT;
+ if (!vsock_g2h_reachable_sk(vsk))
+ return -ENETUNREACH;
+
src_cid = t_ops->transport.get_local_cid();
src_port = vsk->local_addr.svm_port;
if (!info->remote_cid) {
@@ -1468,8 +1474,8 @@ void virtio_transport_release(struct vsock_sock *vsk)
EXPORT_SYMBOL_GPL(virtio_transport_release);
static int
-virtio_transport_recv_connecting(struct sock *sk,
- struct sk_buff *skb)
+virtio_transport_recv_connecting(struct sock *sk, struct sk_buff *skb,
+ struct virtio_transport *t)
{
struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb);
struct vsock_sock *vsk = vsock_sk(sk);
@@ -1478,9 +1484,18 @@ virtio_transport_recv_connecting(struct sock *sk,
switch (le16_to_cpu(hdr->op)) {
case VIRTIO_VSOCK_OP_RESPONSE:
- sk->sk_state = TCP_ESTABLISHED;
+ if (!vsock_maybe_set_connected(vsk)) {
+ /* The net arg is required but unused: only g2h can fail
+ * vsock_maybe_set_connected(), and g2h
+ * virtio_transport_reset_no_sock() ignores the net arg.
+ */
+ virtio_transport_reset_no_sock(t, skb, sock_net(sk));
+ skerr = ECONNRESET;
+ err = -ENETUNREACH;
+ goto close;
+ }
+
sk->sk_socket->state = SS_CONNECTED;
- vsock_insert_connected(vsk);
sk->sk_state_change(sk);
break;
case VIRTIO_VSOCK_OP_INVALID:
@@ -1498,6 +1513,7 @@ virtio_transport_recv_connecting(struct sock *sk,
destroy:
virtio_transport_reset(vsk, skb);
+close:
sk->sk_state = TCP_CLOSE;
sk->sk_err = skerr;
sk_error_report(sk);
@@ -1736,8 +1752,6 @@ virtio_transport_recv_listen(struct sock *sk, struct sk_buff *skb,
lock_sock_nested(child, SINGLE_DEPTH_NESTING);
- child->sk_state = TCP_ESTABLISHED;
-
vchild = vsock_sk(child);
vsock_addr_init(&vchild->local_addr, le64_to_cpu(hdr->dst_cid),
le32_to_cpu(hdr->dst_port));
@@ -1758,7 +1772,14 @@ virtio_transport_recv_listen(struct sock *sk, struct sk_buff *skb,
if (virtio_transport_space_update(child, skb))
child->sk_write_space(child);
- vsock_insert_connected(vchild);
+ if (!vsock_maybe_set_connected(vchild)) {
+ release_sock(child);
+ /* Only reached for g2h, whose send_pkt() ignores the netns. */
+ virtio_transport_reset_no_sock(t, skb, sock_net(sk));
+ sock_put(child);
+ return -ENETUNREACH;
+ }
+
vsock_enqueue_accept(sk, child);
virtio_transport_send_response(vchild, skb);
@@ -1859,7 +1880,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
kfree_skb(skb);
break;
case TCP_SYN_SENT:
- virtio_transport_recv_connecting(sk, skb);
+ virtio_transport_recv_connecting(sk, skb, t);
kfree_skb(skb);
break;
case TCP_ESTABLISHED:
--
2.53.1-Meta
next prev parent reply other threads:[~2026-11-18 1:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 1:54 [PATCH net-next v7 0/7] vsock: assign the guest vsock device to a " Bobby Eshleman
2026-11-18 1:54 ` [PATCH net-next v7 1/7] vsock: constify the transport in vsock_for_each_connected_socket() Bobby Eshleman
2026-11-18 1:54 ` [PATCH net-next v7 2/7] vsock: rename the vsock pernet operations Bobby Eshleman
2026-11-18 1:54 ` [PATCH net-next v7 3/7] vsock: pass the netns to ->has_remote_cid() Bobby Eshleman
2026-11-18 1:54 ` [PATCH net-next v7 4/7] vsock: add a netlink command to assign the g2h device to a netns Bobby Eshleman
2026-11-18 1:54 ` Bobby Eshleman [this message]
2026-11-18 1:54 ` [PATCH net-next v7 6/7] selftests/vsock: test the guest vsock device network namespace Bobby Eshleman
2026-11-18 1:54 ` [PATCH net-next v7 7/7] selftests/vsock: test the netns assign privilege checks Bobby Eshleman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117-vsock-guest-ns-v7-5-7e522ea9dd9b@meta.com \
--to=bobbyeshleman@meta.com \
--cc=acking@vmware.com \
--cc=bobbyeshleman@gmail.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=dtor@vmware.com \
--cc=edumazet@kernel.org \
--cc=eperezma@redhat.com \
--cc=georgezhang@vmware.com \
--cc=horms@kernel.org \
--cc=jasowangio@gmail.com \
--cc=jlinbox@meta.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rdunlap@infradead.org \
--cc=sargun@sargun.me \
--cc=sgarzare@redhat.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux.dev \
--cc=xuanzhuo@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®