From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 F3F1B2F3C2B for ; Tue, 16 Sep 2025 23:43:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066242; cv=none; b=EZhP3Uil4zR/dgrXfi6wV5nC44l9FpyyIwDjxpAbZJuxjlsO/crU8ANI1eOCAfE4GDOxz7bpDx0B/Ti+kPHgWKRc5PCmIC7XYuuSA0v7bX3hokktO38kv6W7EqsgS87V5htdjITXIoiQ/fRQ1enr41cLm/UIvP9fsDJjxhpOgck= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066242; c=relaxed/simple; bh=EH9ooYSziv5KhjIFRNdY5bYLFFDgOaXRzl70F+kjAYk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CdqbM9Pa5MKSgNw1xnADxpHBCnZTNL+TzblGFd5QyeDjSbKH7yF9ggIYVYRYCphRscr7nY6A+LZngQ3EJVa4M6DWAc40j8UCX4LXnusUREoAVgMqUZtpzXGm9dSzOrdrDXzIist5NlKa97TO6ncaUhEqGYIc6fUuvJ/z5FQ84s0= 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=RsIvOElp; arc=none smtp.client-ip=209.85.210.173 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="RsIvOElp" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7762021c574so3666721b3a.0 for ; Tue, 16 Sep 2025 16:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758066239; x=1758671039; 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=GVUMTjnbN6eX5riUEyr4WxlmQzTb3YpJ8a1+nr7efDY=; b=RsIvOElp2Gw0bwnNvVCtO5RYXXLSqQXv3+1QCCFE3o58NRCVGzRS05scwKA/bVW18V MMuJGgsHHsRfb8GK8Ba0OlbG3BrV5hgX9ahv5ObNLaOodKLMY6iv9lEJml+SbmNSrmim JMvXvWvS0XQY2GkZ+LC/oRTBfmTnn2s2KTDS2nZdojgBQHzNSnHHnOZ1xRycoLcXlUs7 k77RA0CQwh3GE4BvuBM85XOGZflm4nK3+YzjmdHZFmn9KvYh7seKBJVX5ucBi6e60Tm5 cZLtikKT0x0UbfrCaQ1DzrQgDMTwHMz3dtd0nXFrPwZxcOk+VpbGTToV/iN4KzX46Q7f LY/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758066239; x=1758671039; 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=GVUMTjnbN6eX5riUEyr4WxlmQzTb3YpJ8a1+nr7efDY=; b=M4L6WJzRhs86iiH82cHtYwwdxM0If6dvNBtdSUuxEZnxVsNpjPB2KaSl4qSe5SQgzj FaW3q4Bsu58GqvZacynaBf+UpZwF+NxlvKUninl8AoF4f3/mqJ8K5Q5ivS9YxdNci+4/ DevJqP0A3YJssluCaiHj+slNSQAX0z8ZqO3jEdO5zhGOEr5qsc2G/+DFMTanPyplWMKM Bpy8ZI0asW+5g9mrx8MrkzFcr9CVuHyClMQ69rvTJmfjqQU9cWKy2IAfxMlurttQheBf s7sr1nTGLIZB69sbFV7+/Ed2EH3zWk7svgNdKisToR/zXfiFwMr/qxQeO6dpXnf87XtJ 68RA== X-Forwarded-Encrypted: i=1; AJvYcCVuOd6pOLDh6ypFKY0vw9LpLrpqDmno1Q5xHA1KfPJsPqzB3uDyHqjt/f7Gu/S8HDrCOfo6kJo=@vger.kernel.org X-Gm-Message-State: AOJu0YzJ1wdqXFYs+Y2TtbFcIe6uDQ8KP36I72gHDse7rtjV8O5Zt5Ns bWqaFtLblfWgJl8ufS5yX8Vnh0oTHprVIOfQx1sQ7t4B9FdkHJe1no1R X-Gm-Gg: ASbGnctH8FtlLTrv8qgFAl+aUzIQPkqnWdnWiYxluIOe9yMU3yUKoXL3gbPcVmh/A20 0cwlo/92tEOw+6vefxr6ML6G0UlFyH5eMfF+0SL2Vri6VO5Xl6ui2AjaU3++HX1pv/GOO7MBeJe Q8yEa+4xQJ49I8yut3in+jLI4qM8XeOBasgghR3BgIzq/YUGmbOTzGRm0Mh9l0av3V0eTC0dejD 09iiSR5yR2RK8bT7UzrqtOPlTLYF2y7cvLwdbOFjW1NJk9Lzf+vHSi0JbuQzDM8ELLfFDyiZm4F mJqxxaZq7t0dG8FEN/oFwDjgl2/mw66Hwed639UJW0i6mIHYaR8FiTTIJCJXSBry/izqyT4zevN C+77a5EdmpvfMw3aKlCcYSiiN3QCucDdcq/zkAYDQBA== X-Google-Smtp-Source: AGHT+IHh73YIhkH04jOcSNkz8qf8UKgUb5SUQdLJktTvor8RNRMCdjI+LaMxqb5RVFwojQ7SBvQpvw== X-Received: by 2002:a05:6a00:3e1a:b0:772:260f:d7b1 with SMTP id d2e1a72fcca58-77bf8c7796emr66050b3a.16.1758066239010; Tue, 16 Sep 2025 16:43:59 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:48::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-776210c4a5bsm11338744b3a.47.2025.09.16.16.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 16:43:58 -0700 (PDT) From: Bobby Eshleman Date: Tue, 16 Sep 2025 16:43:49 -0700 Subject: [PATCH net-next v6 5/9] vsock/virtio: add netns to virtio transport common Precedence: bulk X-Mailing-List: netdev@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: <20250916-vsock-vmtest-v6-5-064d2eb0c89d@meta.com> References: <20250916-vsock-vmtest-v6-0-064d2eb0c89d@meta.com> In-Reply-To: <20250916-vsock-vmtest-v6-0-064d2eb0c89d@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 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, Bobby Eshleman , berrange@redhat.com, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Add support to the virtio-vsock common code for passing around net namespace pointers (tx and rx). The series still requires vhost/virtio transport support to be added by future patches. Signed-off-by: Bobby Eshleman --- include/linux/virtio_vsock.h | 1 + net/vmw_vsock/virtio_transport_common.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index ea955892488a..165157580cb8 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -196,6 +196,7 @@ struct virtio_vsock_pkt_info { u32 remote_cid, remote_port; struct vsock_sock *vsk; struct msghdr *msg; + struct net *net; u32 pkt_len; u16 type; u16 op; diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 1a9129e33d51..8a08a5103e7c 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -316,6 +316,11 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info * info->flags, zcopy); + virtio_vsock_skb_set_net(skb, info->net); + + if (vsk) + virtio_vsock_skb_set_orig_net_mode(skb, vsk->orig_net_mode); + return skb; out: kfree_skb(skb); @@ -527,6 +532,7 @@ static int virtio_transport_send_credit_update(struct vsock_sock *vsk) struct virtio_vsock_pkt_info info = { .op = VIRTIO_VSOCK_OP_CREDIT_UPDATE, .vsk = vsk, + .net = sock_net(sk_vsock(vsk)), }; return virtio_transport_send_pkt_info(vsk, &info); @@ -1067,6 +1073,7 @@ int virtio_transport_connect(struct vsock_sock *vsk) struct virtio_vsock_pkt_info info = { .op = VIRTIO_VSOCK_OP_REQUEST, .vsk = vsk, + .net = sock_net(sk_vsock(vsk)), }; return virtio_transport_send_pkt_info(vsk, &info); @@ -1082,6 +1089,7 @@ int virtio_transport_shutdown(struct vsock_sock *vsk, int mode) (mode & SEND_SHUTDOWN ? VIRTIO_VSOCK_SHUTDOWN_SEND : 0), .vsk = vsk, + .net = sock_net(sk_vsock(vsk)), }; return virtio_transport_send_pkt_info(vsk, &info); @@ -1108,6 +1116,7 @@ virtio_transport_stream_enqueue(struct vsock_sock *vsk, .msg = msg, .pkt_len = len, .vsk = vsk, + .net = sock_net(sk_vsock(vsk)), }; return virtio_transport_send_pkt_info(vsk, &info); @@ -1145,6 +1154,7 @@ static int virtio_transport_reset(struct vsock_sock *vsk, .op = VIRTIO_VSOCK_OP_RST, .reply = !!skb, .vsk = vsk, + .net = sock_net(sk_vsock(vsk)), }; /* Send RST only if the original pkt is not a RST pkt */ @@ -1165,6 +1175,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t, .op = VIRTIO_VSOCK_OP_RST, .type = le16_to_cpu(hdr->type), .reply = true, + .net = virtio_vsock_skb_net(skb), }; struct sk_buff *reply; @@ -1465,6 +1476,7 @@ virtio_transport_send_response(struct vsock_sock *vsk, .remote_port = le32_to_cpu(hdr->src_port), .reply = true, .vsk = vsk, + .net = sock_net(sk_vsock(vsk)), }; return virtio_transport_send_pkt_info(vsk, &info); @@ -1578,7 +1590,9 @@ static bool virtio_transport_valid_type(u16 type) void virtio_transport_recv_pkt(struct virtio_transport *t, struct sk_buff *skb) { + enum vsock_net_mode orig_net_mode = virtio_vsock_skb_orig_net_mode(skb); struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); + struct net *net = virtio_vsock_skb_net(skb); struct sockaddr_vm src, dst; struct vsock_sock *vsk; struct sock *sk; @@ -1606,9 +1620,9 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, /* The socket must be in connected or bound table * otherwise send reset back */ - sk = vsock_find_connected_socket(&src, &dst, vsock_global_dummy_net()); + sk = vsock_find_connected_socket(&src, &dst, net, orig_net_mode); if (!sk) { - sk = vsock_find_bound_socket(&dst, vsock_global_dummy_net()); + sk = vsock_find_bound_socket(&dst, net, orig_net_mode); if (!sk) { (void)virtio_transport_reset_no_sock(t, skb); goto free_pkt; -- 2.47.3