From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 B3D712D0C8B for ; Tue, 21 Oct 2025 23:47:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090430; cv=none; b=PEefl/fHnCzLcLJhf/r6C7VDaQmnUzfXM64gSZ2FHiEB7lJ57Lv1x9kNIJEnEqDgcBo8i1A8/sw+DE6uVV2LCpNGQcnjKFTfWW86oENeXf7jKH3WI3eHjUd00JUu+vpM+XwZcoo2oCwHzsgbZtoyrqwPmt6zQzcX3B9UDgd3PhI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090430; c=relaxed/simple; bh=vT+Tq/xDspn4kgfcPG0WM13a7POPaOaQ9NQCIKNs450=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FYksXscvojjkWM4DQNNOl1vjtVrtgwHcOXvoXS7H+Y6+/Iagvr/Q5p5+whrQ4AmcveAIvfvxo4ZdqE4L9GxLfkuU4cHLgQL7YlfU+YGMUaxqU1IZkKG7LJp9N1m/a2ISMq0wLRiMRo5fWTuGb5XYz5vM7dYwX43YlUtcZkd3nF4= 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=ksSNl8rS; arc=none smtp.client-ip=209.85.215.171 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="ksSNl8rS" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-b5507d3ccd8so5101061a12.0 for ; Tue, 21 Oct 2025 16:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090425; x=1761695225; 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=bXXMjozyE7G9hxBpLov8fPEzcD6yFRLl/EC2MbvXbp0=; b=ksSNl8rSs/x7+c5KO2kvCG4tGr4iz0ROYTQHCJYtDGQoA67UShXZfx/CjhCjSqcYsi JjlnmeqlvsTXGB2B0ww71VvrjQxBUlmjYtGa3jcJHSths5a/G5nmQWy1BwN2KNdivGR9 oluKd6K5sbwclGGjE3g+o9ND92rKghvD22owOdpIZ5DC8JAqrx+W6eggE2I845+EQZNY s9Krzjo294mBKNv1ZbxmTthON7OIEvIPYJUgup2EvozvDRLrx4y+pjX7ytxKoguWqudo 5rJkaP5wdyr96ykf6OpeRhLkGqbJDmNJg/ZRKDMnzNH+QcBOnNqUHlp8a6A5RHBDjmHQ 8sSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090425; x=1761695225; 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=bXXMjozyE7G9hxBpLov8fPEzcD6yFRLl/EC2MbvXbp0=; b=Akzgj64moyydQlBIC6cOHfv8wjq9lmBfPXPZ3NocuYS4I8Qn1dBk1PRYX4eeCT7pIQ Svxhpnz6v8VlPNzrXw6tVZg3w6z2pHCw+A1jeFKSRQcFT2OhtVDFeKb0LtINwXS8R8UA BOTXDi/8F0jzZw/Vz1t91WROLGYz6x+S0CKzo4XUgns7aUWcTeYnDlL0i8ZFoz9P7cY9 wzHrwRcsSeWBeOKA/IVh40AWIOuZhSXTHShPb15anBdle+HQ3IJD2NKLTFrAEtF+nuzZ Ww7znb3UsWORO4gpJdX6xFMd0H0qcE/jnJzjp28zi1CjP9IkE9mczfB1XBuaohIrh4+q 60BA== X-Forwarded-Encrypted: i=1; AJvYcCUE6mHEAi2ADhHvUsG18C1vTN3k3X2x1lmdWW8vi30QbXhtSnBkJHZ6KvRt49LpyvXUsA1KKBSE9C+LJwU=@vger.kernel.org X-Gm-Message-State: AOJu0YzRFKw+/y6hlc8D1c0RQPyILrftokTpmKtgThujGPDktQwPI1Li HMJhyeaV2pZbWS1XzLW6dQ8G3JifWVqDPSUufuEHpfL04ZNzMe3Uauif X-Gm-Gg: ASbGnctmjF3qaoVxabetjuv7ziM0ENCd2u75/lXzwRNa719NHsi8f/GAerRYK71utEQ xamrstG+FfbbfuBxe+WGX+AMIzwGfhh0/mpXvt8L3m2skWp3K7eJxWGCoUrwD3CIw+TemhjFtFI aiDJgi0qHPUI3cJv8fsrjaOx0uEBHv5fxsAM6++3iHL2vbIP0nJiWxRoaRtUYADMJ8vSDM3m55p L8LD5eIukBGSTD68KyhPUQ7yQ5Blw8FZq3AeJgsXJIfB5r5WjuaPA6nbd8KvE7x1qkb6YB4oKd4 5wA4VL2ON/MuAamoASrrlWevBYQWh7EOxy83JWf0by2emGbgGY0Uii+DChNOq2WPy7fgbmcZG99 dMJgwNPp2ciCqCleS7w7O3BVxLZC2pMSZwl7DBnVPxcPYo6SPNURubUQgRiXrUst59mpUWSn35D PmBte11m68 X-Google-Smtp-Source: AGHT+IGisn1W6av3z2asOwJINc4Pm13WD84loloJNSHettssMRmm84ISrxessn3f1FRQqEXghoDjxg== X-Received: by 2002:a17:902:d584:b0:290:bd1b:cb3d with SMTP id d9443c01a7336-290c9ce67c0mr235162115ad.27.1761090424797; Tue, 21 Oct 2025 16:47:04 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292472197desm120682725ad.115.2025.10.21.16.47.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:04 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:49 -0700 Subject: [PATCH net-next v7 06/26] vsock/virtio: add netns to virtio transport common 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-6-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 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 --- Changes in v7: - add comment explaining the !vsk case in virtio_transport_alloc_skb() --- include/linux/virtio_vsock.h | 1 + net/vmw_vsock/virtio_transport_common.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 29290395054c..f90646f82993 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -217,6 +217,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 dcc8a1d5851e..b8e52c71920a 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -316,6 +316,15 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info * info->flags, zcopy); + /* + * If there is no corresponding socket, then we don't have a + * corresponding namespace. This only happens For VIRTIO_VSOCK_OP_RST. + */ + if (vsk) { + virtio_vsock_skb_set_net(skb, info->net); + virtio_vsock_skb_set_net_mode(skb, vsk->net_mode); + } + return skb; out: kfree_skb(skb); @@ -527,6 +536,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 +1077,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 +1093,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 +1120,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 +1158,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 */ @@ -1465,6 +1479,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 +1593,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 net_mode = virtio_vsock_skb_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 +1623,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); + sk = vsock_find_connected_socket_net(&src, &dst, net, net_mode); if (!sk) { - sk = vsock_find_bound_socket(&dst); + sk = vsock_find_bound_socket_net(&dst, net, net_mode); if (!sk) { (void)virtio_transport_reset_no_sock(t, skb); goto free_pkt; -- 2.47.3