From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 8BA6A242D69 for ; Tue, 21 Oct 2025 23:47:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090423; cv=none; b=jX4BNFa/KM4hbcgCbcfd7pjghGe8TPjvaMAUsdZqDyroXHTA4ghq1e5PfL9IOterarSGliuTxbfqxukmKfb98eB9h9CR570AgAt0/nAfaQr56aCrtz2zyeanWoN2E3vwQXR8OBRrho8q8Uyy1Hyl951cLyOTwrdjs8Swrcw59CA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090423; c=relaxed/simple; bh=i/0blcvw30L2XmsZDP8JwezkIYQz0CtWUOjE1zydzXY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u54hqmiVXwaalFjQXdwoEo2mck0lSKltPp1CcGDXznDBlSNcQgVZ2wWyY/g7WCWZOdEjJGbU0Lr/0I57i66f7y3iT6ItNzkvivPKFss24kuEkfLhVaYNhAAbCt4B9T4GWYvUGgh6jVQwCZZPz8qKPktGeFhWz2Z6j0SksN3qz3c= 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.45 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-f45.google.com with SMTP id 98e67ed59e1d1-33b9dc8d517so5620966a91.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=mB7g4EFOgyLYBdL9mkFupmpApog8q/ecEX5QIixHwV45+4MfZdC/i9rjSXZu9QRiI1 wXwFjGnaEeYp2xdZNlAhXlx+ryVL9IvWaSQX4cbFOR7frX0xz2ZflOqx3ZqyySULmL5u M7utMuTNdYP7DXRXkioyk+ryurjmyAX+8yi2Ruhfhzrs5Gx/I4N0ZnTaQ2O1yPC0EPjs XPLEttz7x9rmYguBdHonMHQ5DLa29IOy1oYG5l0Mui3kPgdepZbfjsXQ9pdjhlvixNHi GSmadoymZD0bb5ZTl/9Q9sxWacRv2pqHg79vOWOKYp4X7Nwres4vuse33iZ1wzPAHdA3 IvLw== X-Forwarded-Encrypted: i=1; AJvYcCVfrZ35lR2+S9O4Kaqg71xSIdXbJQRQ9vkqNgzpbhiSXXMhq+/KmZxfvUoEyl0xG0yuFXIX4K4yFQo5BVM=@vger.kernel.org X-Gm-Message-State: AOJu0YywgiDkI2VqP2vfncZaVD/PAV7Zc86KubDgvgdBn3OguY8CSfZY LD9WRlkI/7+9yAhpQbOHUYP02JuXREXcMANXXEKVuD+y1M7ILzG3Sf4N X-Gm-Gg: ASbGncsHpvnapIyt1uDzG0lBfSpe5hWgRjrmUzkjNNQQ3fbw5rkeU4OvV5UEQOVBUpQ 4sGyVIigqbUE83C5hYUEDCJ3YhZNX1lWtPbmGRDW9jgwlPmyPK1uvuotKIukA0hMaeX+3EUn2Tv GZp3Ovm3yYolhQCO9h4HPJhBjaWSgfte0j5G7TSLpqIxPgenn54YMQ9GCnm6h4opJ+W5YS/vSEB kZmxxLcckeGKiaE1XRkiHWUcNDHcPwXt85H28RrXPUmyUVWp+OrhzP14LNlvdq0eW5eEUqMDuqa dH9qsEHjl+rK8bi+ERGW5m73xSFQkYAojHHLmVQhJ3qdK45H3Hw00YCnPlgT8FJQTVQkLS8RhXU XE+5hmnxLtL+SEQJof97UWZf6iB4Lm6QdvXRStBppowWboCkiNUHhPYgD1cLnqSJ/vPodKFOZ 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 =3D=3D VSOCK_NET_MODE_GLOBAL && orig_net_mode = =3D=3D 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 @@ =20 #include #include +#include #include #include =20 @@ -65,6 +66,7 @@ struct vsock_sock { u32 peer_shutdown; bool sent_request; bool ignore_connecting_rst; + enum vsock_net_mode net_mode; =20 /* Protected by lock_sock(sk) */ u64 buffer_size; @@ -256,4 +258,66 @@ static inline bool vsock_msgzerocopy_allow(const struc= t 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 =3D 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 =3D false; + goto skip; + } + + net->vsock.mode =3D mode; + net->vsock.mode_locked =3D true; + ret =3D 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_mo= de 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 =3D=3D VSOCK_NET_MODE_GLOBAL && mode0 =3D=3D 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; =20 #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 */ --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 68E11242D79 for ; Tue, 21 Oct 2025 23:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090423; cv=none; b=jURQydFbd6j6Ag+yH9cD2vfHETE8xVqbG79dXDofs643K3HGTL0wJ4zPvNANH2XbFfRxATnVt+EZ9lsGp1IFym1s9FqtatasBWm7CP5FiHj0footQKWu+CKQaw+9v7bfsjvuk67j6PJ4Slf0OO2rTowRwn8BKI0mgyKzuTVjjPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090423; c=relaxed/simple; bh=5ZnZPrVDfdO+Z9/UM3e8BCikhyLuP+zNDA80rKqdbMY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iTeOXHYanjXO+01upWypGtMtNXSz2/PMo6ZrTvJrHeI02B4aKmbAmu/EENpzrEuh7s39wmYwdkfYBUDXTEk2f9975aOCbIyEysfS7LoSI9YO7RE9qwtMFYt0Nn9TlvjjrbXjr8hkESLAPBRFir51Zh4dnL6AdVwntQptSgT67q0= 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=Vqdj+cUa; arc=none smtp.client-ip=209.85.216.51 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="Vqdj+cUa" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-33bda2306c5so4910636a91.0 for ; Tue, 21 Oct 2025 16:47:01 -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=j0IJv9dMDzYNAhk3DeojEckJoVGEYAGQr1mrX7CZmVI=; b=Vqdj+cUaCyzRB2LdHTMt+fj0JxAaquTyxp/ZrCnavf+AB3YESX1HVyy9YKyIhibLvm v9vbK2HR8036+s7W2/lSpQV1lLNcvG3u9ham/tkcWXd7h290PF/S+F8TK5qTza5K5LOQ mxW+p0SlwMB9qYC0Jvd780awJhLkxdqw7XlsujJ6Ik8QcC1TIQrC7rzVqL6XX9btXDNx L3XlnfBgqiDAtjPflEwwLyGyKV+LPw0CAvp0nDUeNVnQIfkF0UgEDSs/faSySvPN2I3B ReC4M+pysdIsU0eGyxfWUZBGdemrI/7KtCBmmDkbe2r1NcyxRx4MZgKI14iZ8+bh3YqC 0CwQ== 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=j0IJv9dMDzYNAhk3DeojEckJoVGEYAGQr1mrX7CZmVI=; b=WC8A/Z0C55kJdgLSdQ3Ui97dXz5w4w6CwstXpuhdS68rpvtuBs3g3KbF2cfbq3ElNP WLyUGn33ZecqEZfYotAytkFQVtIPTm8RpneH4eIUWtxR2lprl9nj1MW5qr3PUJp44w1v ii4YW5+IcySp/J7vffcRHDTjGuk118EQUCfEN2Y0EoczpczkmsUGWEe/2qZjNMTLB9AL ewvInFAboCa9dOKEUJyjduM/YPahBpPaV6ezlIZzVcNrjkudl8JjfKyaqxaDgYsO4WqT lDQTJnrmPJ9lMl5d2AwjGoEezQnl2U0kOiiGtx6r5oUMGdJKQ2kYrd04yEVvhhvY0MmF pFQg== X-Forwarded-Encrypted: i=1; AJvYcCXakoL7ybPEUOjyoqL8Yrv71ggqQ8vf2vsOq92KsoHMhrDK3QcnGJ/IsN5Ig+O+4j4iqUOGL6wVF03Lx+w=@vger.kernel.org X-Gm-Message-State: AOJu0YydVcm0i6knZeBCdyyTvcXZey4RbDG29hC6CCdg1vZ7yNxJqEKS p5Xq5Notva+QH8xPgfNKEPzYXJZmyPOJbUUvgn1ii8cJwWf85SblT1W/ X-Gm-Gg: ASbGncsRAbnt5eHocI8oJSXCR0V3OZ+uW6G2DqfRfECyvrZJT70ki+wKcpKhVD3lPk5 sl95qGRaAsPBh1ogByYEGBcRp7Zomze9FNR8wf1SnuPquaVEnPxc8cNzZkJ/SEeK+hNVbuXbTLa cSMPd7D7MYnobFpcOgXJ7WOwZrPCqMaygz01R0gNPHBRNDEq9sCOULsiDOnpnxGgxGJ6Cd8timY 85X78N8uZOy0JwCg2WccIsOZLhX5ylXyjnFrmzcebaZl/ycvZHx+Vyyp4YiFZi3kJHt7rcKnaYT dbe6Dg7ExPQehMNTAqvvPdsZ5DHj6rUrAnjXBQEeg52vKV6LDNGgEUChS0rlydsX2hAqQTz1+Y3 vWb1PCeQRdXv+gFFmnZOEBSLIjswRzVkW4e6dHINeDL4nW+M15G/5Ln8aegkvoWWIMl07oELocC oj1cRJN6ey9tSHJ+1I9Nk= X-Google-Smtp-Source: AGHT+IENkRWCpby5KoDuBC94CdB6Y+P0mIUVkUr8FgnjZ2JlIaa5Ku2Bjeg3lNWDeg1OBhPgmqH52g== X-Received: by 2002:a17:90b:28c4:b0:327:c0c6:8829 with SMTP id 98e67ed59e1d1-33bcf8e4f50mr24622081a91.24.1761090420572; Tue, 21 Oct 2025 16:47:00 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6a76645c61sm11811785a12.3.2025.10.21.16.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:00 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:45 -0700 Subject: [PATCH net-next v7 02/26] vsock/virtio: pack struct virtio_vsock_skb_cb Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-2-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 Reduce holes in struct virtio_vsock_skb_cb. As this struct continues to grow, we want to keep it trimmed down so it doesn't exceed the size of skb->cb (currently 48 bytes). Eliminating the 2 byte hole provides an additional two bytes for new fields at the end of the structure. It does not shrink the total size, however. Future work could include combining fields like reply and tap_delivered into a single bitfield, but currently doing so will not make the total struct size smaller (although, would extend the tail-end padding area by one byte). Before this patch: struct virtio_vsock_skb_cb { bool reply; /* 0 1 */ bool tap_delivered; /* 1 1 */ /* XXX 2 bytes hole, try to pack */ u32 offset; /* 4 4 */ /* size: 8, cachelines: 1, members: 3 */ /* sum members: 6, holes: 1, sum holes: 2 */ /* last cacheline: 8 bytes */ }; ; After this patch: struct virtio_vsock_skb_cb { u32 offset; /* 0 4 */ bool reply; /* 4 1 */ bool tap_delivered; /* 5 1 */ /* size: 8, cachelines: 1, members: 3 */ /* padding: 2 */ /* last cacheline: 8 bytes */ }; Signed-off-by: Bobby Eshleman --- include/linux/virtio_vsock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 0c67543a45c8..87cf4dcac78a 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -10,9 +10,9 @@ #define VIRTIO_VSOCK_SKB_HEADROOM (sizeof(struct virtio_vsock_hdr)) =20 struct virtio_vsock_skb_cb { + u32 offset; bool reply; bool tap_delivered; - u32 offset; }; =20 #define VIRTIO_VSOCK_SKB_CB(skb) ((struct virtio_vsock_skb_cb *)((skb)->cb= )) --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 6B70A24DCF9 for ; Tue, 21 Oct 2025 23:47:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090424; cv=none; b=Y1Ld1OdyhVEhfq/O6UKnsQ/SBrEcYSh8yPZHANEgItZqHcDTQAhPEUnDlTsSBVkNQMKv8Cjb0QYWtrMmBU7broTiPqHWlUtAomwgYV4PRFtcWzUKO2MYPhiL8W9MEgS6QUocs/Z2PJlRzCxBL709fcSj1HpWQDqC4NZnb9HhXq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090424; c=relaxed/simple; bh=5lT5a275Jig/x0y4MU1RBKKAqav6WdTww5TZeVBwOjY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C3StSxRXbavI6072VElWwGb/hGUlARxMeWZt17OzrcN2ed6Ic1LBXTltV/psq55/9cD7OwlDrPNgJV3V3Vr3LKqj/WnFArQ9ByglHh47tNsn2s7EZhAAof3FPs+75bj+5TNpgwRUQWA6FLjW5FNCptTre3HGSVRajLjvEL0+EsY= 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=fpaFAJxZ; arc=none smtp.client-ip=209.85.216.53 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="fpaFAJxZ" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-33b9dc8d517so5620989a91.0 for ; Tue, 21 Oct 2025 16:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090421; x=1761695221; 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=z8QAc03+caTvAAzxQiYsQ8xN61QvIP62Vy0HUa32Vyw=; b=fpaFAJxZILo96dTdXQYE9qtnCzZGvnNfx9C1TGKWaKTTtCljcSQWt7cq0lbPn8L5bK Dj14By71004rbyJLs+BpOdTQorjgq9zF9T9YkNu3J0odu5r4T36DNJbYR1hEL0zPPbNN 0oXkB2kqaZqO8isDfoMDnyPf/yljTJ3uhuG69qgxGIH4A+VcvSCYILTCT9IyUmygzPZ/ ZUH2QGJxbMZzApyTPtVKqn0F6pkU244es9W+haffDeiwLa5Cntuh6xxVrX3WeclGNPd6 E0MiDd2O3g0jFRaH0jzBhlFW/o9GH6EeOWqCsaIQSzMnz3CzFw4Rb0Pdojr3/+wrzTs3 I8RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090421; x=1761695221; 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=z8QAc03+caTvAAzxQiYsQ8xN61QvIP62Vy0HUa32Vyw=; b=Hd9nAknEt0AKSTKvawc0ogvqH3i/qVkyd/rAzWNEaQMiRR5Y6y/HMb5C1FEYAEd+Qn LXwqYWBUiBdMABbGyfu/k1d9d/IYz2PHPdB8Pd4fWDYjOWG8vWlHmuLWB7KvnhQtUkW4 Y0AOMNbb1P3qudgXweaKt1IckUDFENuiimtOiJJiBZi869pccKUQEyUl4X2C7JZfWu42 5kQDDk04FQ3pFLD9Z5QnY+941EfkvjrgkU6rR5sQVh9gOjPeV4Sfizx4P3FltTSrRoPm +yvc7By0/xbhykhZRwy29F5Zr8cXMC7Hqzo1ycEytvqhRxDdb/S+wD0dA8j4uoMfe0OM rpzg== X-Forwarded-Encrypted: i=1; AJvYcCXTCGtW/bbZCS1CDBkTxvuPCxOSmH1hZdI9PnPcXio2zZTepuRb1FriNltLxcQTxXEKhbmkHFa6SV7v3iw=@vger.kernel.org X-Gm-Message-State: AOJu0YxMqjj1PTa6mUZx99DcA3DzbhsrtGgu0/yQLvyWbKwlYiMWv7Tv +oxYfms3x221j068p6YehReszEISuzkGXptQjUQJMdpF0zzuhX7Uo0Qm X-Gm-Gg: ASbGncsXl2QP2K26E9h/UuUOeplzqGt9GS0tWXM4u0BhpuHBeVZXm51U5dOX4OY0oSZ DrnvUhpLbSYldMvJNdXAfSr5KxeV3pg+TB8g9PfTn5StFdZV42U8VE6bsdH2nX4bCZ1SRQy7asQ q3liP7hTZT43CGYvgUK790KZX0969SdoF0xypSutRoIl6ex1w6AMqscg7NiS2GikG2inYsuILlk dj4Awi8grw3pee8wcn5Knh/Ea/wkvMVrNpDlp/2aPq/xn1T7/iel93grzZ0flWtVcaoEhfXZil2 lzllJdXAXJ0t/2pICIyd1XSQvLHLKLca5NBj3omfCS21oYS9z57YbbtWdq3pSXfALUqzorRkI9c RuiNnyq8zHWQ2KU5VVEvSG9zHKkyGfStmdx9j5yzQr5V2xHKRlO5BAJZX4wgEcLiyuRB8g9ld7X ckPCyGfL0= X-Google-Smtp-Source: AGHT+IFnLd8MEBHJWDP/6T0bT9CF6tUU40IwqT7WMWTgte724ObVfh7g7Y965ujhPSVyLp4smF4h2g== X-Received: by 2002:a17:90b:3942:b0:336:bfce:3b48 with SMTP id 98e67ed59e1d1-33bcf87f431mr27158450a91.9.1761090421527; Tue, 21 Oct 2025 16:47:01 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33e22428b1esm708138a91.22.2025.10.21.16.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:01 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:46 -0700 Subject: [PATCH net-next v7 03/26] vsock: add netns to vsock skb cb Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-3-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 a net pointer and net_mode to the vsock skb and helpers for getting/setting them. When skbs are received the transport needs a way to tell the vsock layer and/or virtio common layer which namespace and what namespace mode the packet belongs to. This will be used by those upper layers for finding the correct socket object. This patch stashes these fields in the skb control buffer. This extends virtio_vsock_skb_cb to 24 bytes: struct virtio_vsock_skb_cb { struct net * net; /* 0 8 */ enum vsock_net_mode net_mode; /* 8 4 */ u32 offset; /* 12 4 */ bool reply; /* 16 1 */ bool tap_delivered; /* 17 1 */ /* size: 24, cachelines: 1, members: 5 */ /* padding: 6 */ /* last cacheline: 24 bytes */ }; Signed-off-by: Bobby Eshleman --- Changes in v7: - rename `orig_net_mode` to `net_mode` - update commit message with a more complete explanation of changes Changes in v5: - some diff context change due to rebase to current net-next --- include/linux/virtio_vsock.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 87cf4dcac78a..7f334a32133c 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -10,6 +10,8 @@ #define VIRTIO_VSOCK_SKB_HEADROOM (sizeof(struct virtio_vsock_hdr)) =20 struct virtio_vsock_skb_cb { + struct net *net; + enum vsock_net_mode net_mode; u32 offset; bool reply; bool tap_delivered; @@ -130,6 +132,27 @@ static inline size_t virtio_vsock_skb_len(struct sk_bu= ff *skb) return (size_t)(skb_end_pointer(skb) - skb->head); } =20 +static inline struct net *virtio_vsock_skb_net(struct sk_buff *skb) +{ + return VIRTIO_VSOCK_SKB_CB(skb)->net; +} + +static inline void virtio_vsock_skb_set_net(struct sk_buff *skb, struct ne= t *net) +{ + VIRTIO_VSOCK_SKB_CB(skb)->net =3D net; +} + +static inline enum vsock_net_mode virtio_vsock_skb_net_mode(struct sk_buff= *skb) +{ + return VIRTIO_VSOCK_SKB_CB(skb)->net_mode; +} + +static inline void virtio_vsock_skb_set_net_mode(struct sk_buff *skb, + enum vsock_net_mode net_mode) +{ + VIRTIO_VSOCK_SKB_CB(skb)->net_mode =3D net_mode; +} + /* Dimension the RX SKB so that the entire thing fits exactly into * a single 4KiB page. This avoids wasting memory due to alloc_skb() * rounding up to the next page order and also means that we --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 BA38A27E7F0 for ; Tue, 21 Oct 2025 23:47:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090429; cv=none; b=P0RXvZiXQzdJ0jtdJPjL5eTf4UsyFtMJD/DPV65ojItGXVFIWpRsQUBvJx/VIZPrxmxSSX+eOcNLINgS0lU3Nn2OrQNZLM53rkIqwsTYvbZpQ2GLI4L6CPdAXOJKbwo5fY/yeGHay7xCmFlJfaIHX3gZ+8bMNs6hebPnFb4IYP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090429; c=relaxed/simple; bh=GtyaFuzJJX8jfKCqFonp4Cj4tskZ5I+JWcBskB+9s6c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nmZt5/kGY+yhMrn0yn7fkuLudSnqmFv7g1QF40lOr+iCq+FKiSrAjIcFXja8QVXVZm4zPOqj3CRbAU1n5KyGalmv5hQ5n3pvjHLn+6WqUEpsV1I9eg2SYKMmRwrrpqQnfaY13jdA79mWgTYj+k35dgFluQdXmax3BoXtcOh+E9U= 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=HQdYE0pe; arc=none smtp.client-ip=209.85.214.174 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="HQdYE0pe" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2697899a202so3042585ad.0 for ; Tue, 21 Oct 2025 16:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090423; x=1761695223; 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=DVT8/vbk2Dwkc2btDL18ryDEaCXcT4l9KMvPSWvGOYI=; b=HQdYE0peEkwwBgT3joT+Hj6jW9n7wEahkVcTGxc7OMUIClo1ft7LwUnM9n2ve9pT8J U8l1LCHuo6w6e78F0DXNnARiFYAwBoSMJ9kP0OOQuoFzjCXs457HjGD3944kBmutj0YG PpzE1UrOL+WJB526YVGyXfhRY/01NM2po12Km6DhnvCYNrCNRyIPekdAnAAu6jEuJBSW gCEp28Vzrk9eZ9wHnuAza7S1XrDFH1WXAUlsjwlNWsQMcQFmq2P6ECj1BmONQM1rvPvb FlPJmu+s5QD4q9M4xyNRYUpYKcDhga03QZriC1TbLVfk6g1u7RcPBiWKhhwoFNXpoiZ8 Ac0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090423; x=1761695223; 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=DVT8/vbk2Dwkc2btDL18ryDEaCXcT4l9KMvPSWvGOYI=; b=c7Ob06w02Zwa4tp6kuqZGAqrKJiQrWZ4YJseioJUCQvldHO2ZE4Ey3AMx7GGn3D6qs ZJM43cnhZSujefiMfgX5F0NbJf48PzLtUWNqa/KU5XjJaAjnDwaMhE+i48Y/8znHoI9m m/yq8CfEJ4nQbS648gdJfUDM+bhDZ82nyKC9UfvozYydhmpApMMOhyJgkY2AsA1bCLJK 7wStJZJpZGII2b8MUc1NiZJ2b5F1UN2oE0JWT/kltAg8fd16DTmF3dqWKLHg5pHKKP9a 7xE2zb4zgWzAmWxb0s8yH4vV8krK7cCiTqGnaTGoIsWYRfPXO6g0FIPbWVbTjhxqOzWl v7Hw== X-Forwarded-Encrypted: i=1; AJvYcCVWaY88QisleuwYNC4isOB4EGTLxJRq+PFFie/y72D3G0VCnjS8FxU4wKJwns9WQ9NLk7wRfxzKOYLdWws=@vger.kernel.org X-Gm-Message-State: AOJu0Yzm6pDXEfAI302yVna1+2lhbfteZc8ZoPTauN7FYqvRY5y1u0dd eRnAy4D2lJMhlhPeiAejS7tvvyMPWaNqqCEKQPZjwQhUwTmjNQ00RsaG X-Gm-Gg: ASbGncuXk+xinBZEinLhbF6kfkqrqizYu4jmBeT3uqrB2B2ewi2SMmbKpiL2fUrCLt6 nT/24OBcMbkZhMBmIG8VCP55oP6bIowNb9HoQ1u9pN5k9cFMV1uipdkFp8oPwOtOeq2HLAjXeq1 v1WIFEwmr/QDtFh4ep+MLnmRgvIn8OVykuUDGN8UzhMXkJvXmkJ3fBtzmxNKz1VX4vOmlBpNdFt 5O8uYNQu96oNGvcrCPofacdBQeTWkDFr/3bZ2xgv8j+CCM52CX70POJZweDb1uMHzM2sX+Oc5go 42Kj89ZbEDcRoFcjnaa0Q7q3MT/c2QddqttIik5kcXTJw6zpDzUKktzZT80WCbrYhtg5+5E7G3l FtRZ0POSo47fS6nHAwWzAJvmTOwd7h7JiEoWt/Xw5FGo6J2rwDW+sl9ufww7N6/0SMf1EBPcctw == X-Google-Smtp-Source: AGHT+IGsla5uQbo7baJpMMbqxDNWNN5X/yyfI2WtWFNCLvR6MbNErjTDjVu0GTw7Flf8fecDXkXlBA== X-Received: by 2002:a17:903:37c3:b0:25c:43f7:7e40 with SMTP id d9443c01a7336-292ffbd13afmr20146345ad.10.1761090422531; Tue, 21 Oct 2025 16:47:02 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292471d5c0bsm120140175ad.69.2025.10.21.16.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:02 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:47 -0700 Subject: [PATCH net-next v7 04/26] vsock: add netns to vsock core Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-4-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 netns logic to vsock core. Additionally, modify transport hook prototypes to be used by later transport-specific patches (e.g., *_seqpacket_allow()). Namespaces are supported primarily by changing socket lookup functions (e.g., vsock_find_connected_socket()) to take into account the socket namespace and the namespace mode before considering a candidate socket a "match". Introduce a dummy namespace struct, __vsock_global_dummy_net, to be used by transports that do not support namespacing. This dummy always has mode "global" to preserve previous CID behavior. This patch also introduces the sysctl /proc/sys/net/vsock/ns_mode that accepts the "global" or "local" mode strings. The transports (besides vhost) are modified to use the global dummy, which makes them behave as if always in the global namespace. Vhost is an exception because it inherits its namespace from the process that opens the vhost device. Add netns functionality (initialization, passing to transports, procfs, etc...) to the af_vsock socket layer. Later patches that add netns support to transports depend on this patch. seqpacket_allow() callbacks are modified to take a vsk so that transport implementations can inspect sock_net(sk) and vsk->net_mode when performing lookups (e.g., vhost does this in its future netns patch). Because the API change affects all transports, it seemed more appropriate to make this internal API change in the "vsock core" patch then in the "vhost" patch. Signed-off-by: Bobby Eshleman --- Changes in v7: - hv_sock: fix hyperv build error - explain why vhost does not use the dummy - explain usage of __vsock_global_dummy_net - explain why VSOCK_NET_MODE_STR_MAX is 8 characters - use switch-case in vsock_net_mode_string() - avoid changing transports as much as possible - add vsock_find_{bound,connected}_socket_net() - rename `vsock_hdr` to `sysctl_hdr` - add virtio_vsock_alloc_linear_skb() wrapper for setting dummy net and global mode for virtio-vsock, move skb->cb zero-ing into wrapper - explain seqpacket_allow() change - move net setting to __vsock_create() instead of vsock_create() so that child sockets also have their net assigned upon accept() Changes in v6: - unregister sysctl ops in vsock_exit() - af_vsock: clarify description of CID behavior - af_vsock: fix buf vs buffer naming, and length checking - af_vsock: fix length checking w/ correct ctl_table->maxlen Changes in v5: - vsock_global_net() -> vsock_global_dummy_net() - update comments for new uAPI - use /proc/sys/net/vsock/ns_mode instead of /proc/net/vsock_ns_mode - add prototype changes so patch remains compilable --- drivers/vhost/vsock.c | 4 +- include/linux/virtio_vsock.h | 21 ++++ include/net/af_vsock.h | 14 ++- net/vmw_vsock/af_vsock.c | 264 +++++++++++++++++++++++++++++++++++= +--- net/vmw_vsock/virtio_transport.c | 7 +- net/vmw_vsock/vsock_loopback.c | 4 +- 6 files changed, 288 insertions(+), 26 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index ae01457ea2cd..34adf0cf9124 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -404,7 +404,7 @@ static bool vhost_transport_msgzerocopy_allow(void) return true; } =20 -static bool vhost_transport_seqpacket_allow(u32 remote_cid); +static bool vhost_transport_seqpacket_allow(struct vsock_sock *vsk, u32 re= mote_cid); =20 static struct virtio_transport vhost_transport =3D { .transport =3D { @@ -460,7 +460,7 @@ static struct virtio_transport vhost_transport =3D { .send_pkt =3D vhost_transport_send_pkt, }; =20 -static bool vhost_transport_seqpacket_allow(u32 remote_cid) +static bool vhost_transport_seqpacket_allow(struct vsock_sock *vsk, u32 re= mote_cid) { struct vhost_vsock *vsock; bool seqpacket_allow =3D false; diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 7f334a32133c..29290395054c 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -153,6 +153,27 @@ static inline void virtio_vsock_skb_set_net_mode(struc= t sk_buff *skb, VIRTIO_VSOCK_SKB_CB(skb)->net_mode =3D net_mode; } =20 +static inline struct sk_buff * +virtio_vsock_alloc_rx_skb(unsigned int size, gfp_t mask) +{ + struct sk_buff *skb; + + skb =3D virtio_vsock_alloc_linear_skb(size, mask); + if (!skb) + return NULL; + + memset(skb->head, 0, VIRTIO_VSOCK_SKB_HEADROOM); + + /* virtio-vsock does not yet support namespaces, so on receive + * we force legacy namespace behavior using the global dummy net + * and global net mode. + */ + virtio_vsock_skb_set_net(skb, vsock_global_dummy_net()); + virtio_vsock_skb_set_net_mode(skb, VSOCK_NET_MODE_GLOBAL); + + return skb; +} + /* Dimension the RX SKB so that the entire thing fits exactly into * a single 4KiB page. This avoids wasting memory due to alloc_skb() * rounding up to the next page order and also means that we diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index a1053d3668cf..30e65f677550 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -145,7 +145,7 @@ struct vsock_transport { int flags); int (*seqpacket_enqueue)(struct vsock_sock *vsk, struct msghdr *msg, size_t len); - bool (*seqpacket_allow)(u32 remote_cid); + bool (*seqpacket_allow)(struct vsock_sock *vsk, u32 remote_cid); u32 (*seqpacket_has_data)(struct vsock_sock *vsk); =20 /* Notification. */ @@ -218,6 +218,12 @@ void vsock_remove_connected(struct vsock_sock *vsk); struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr); struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, struct sockaddr_vm *dst); +struct sock *vsock_find_bound_socket_net(struct sockaddr_vm *addr, struct = net *net, + enum vsock_net_mode net_mode); +struct sock *vsock_find_connected_socket_net(struct sockaddr_vm *src, + struct sockaddr_vm *dst, + struct net *net, + enum vsock_net_mode net_mode); void vsock_remove_sock(struct vsock_sock *vsk); void vsock_for_each_connected_socket(struct vsock_transport *transport, void (*fn)(struct sock *sk)); @@ -259,6 +265,12 @@ static inline bool vsock_msgzerocopy_allow(const struc= t vsock_transport *t) return t->msgzerocopy_allow && t->msgzerocopy_allow(); } =20 +extern struct net __vsock_global_dummy_net; +static inline struct net *vsock_global_dummy_net(void) +{ + return &__vsock_global_dummy_net; +} + static inline enum vsock_net_mode vsock_net_mode(struct net *net) { enum vsock_net_mode ret; diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 4c2db6cca557..656a78810c68 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -83,6 +83,35 @@ * TCP_ESTABLISHED - connected * TCP_CLOSING - disconnecting * TCP_LISTEN - listening + * + * - Namespaces in vsock support two different modes configured + * through /proc/sys/net/vsock/ns_mode. The modes are "local" and "globa= l". + * Each mode defines how the namespace interacts with CIDs. + * /proc/sys/net/vsock/ns_mode is write-once, so that it may be configur= ed + * and locked down by a namespace manager. The default is "global". The = mode + * is set per-namespace. + * + * The modes affect the allocation and accessibility of CIDs as follows: + * + * - global - access and allocation are all system-wide + * - all CID allocation from global namespaces draw from the same + * system-wide pool + * - if one global namespace has already allocated some CID, another + * global namespace will not be able to allocate the same CID + * - global mode AF_VSOCK sockets can reach any VM or socket in any g= lobal + * namespace, they are not contained to only their own namespace + * - AF_VSOCK sockets in a global mode namespace cannot reach VMs or + * sockets in any local mode namespace + * - local - access and allocation are contained within the namespace + * - CID allocation draws only from a private pool local only to the + * namespace, and does not affect the CIDs available for allocation = in any + * other namespace (global or local) + * - VMs in a local namespace do not collide with CIDs in any other lo= cal + * namespace or any global namespace. For example, if a VM in a loca= l mode + * namespace is given CID 10, then CID 10 is still available for + * allocation in any other namespace, but not in the same namespace + * - AF_VSOCK sockets in a local mode namespace can connect only to VM= s or + * other sockets within their own namespace. */ =20 #include @@ -100,6 +129,7 @@ #include #include #include +#include #include #include #include @@ -111,9 +141,18 @@ #include #include #include +#include #include #include =20 +#define VSOCK_NET_MODE_STR_GLOBAL "global" +#define VSOCK_NET_MODE_STR_LOCAL "local" + +/* 6 chars for "global", 1 for null-terminator, and 1 more for '\n'. + * The newline is added by proc_dostring() for read operations. + */ +#define VSOCK_NET_MODE_STR_MAX 8 + static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); static void vsock_sk_destruct(struct sock *sk); static int vsock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); @@ -149,6 +188,15 @@ static const struct vsock_transport *transport_dgram; static const struct vsock_transport *transport_local; static DEFINE_MUTEX(vsock_register_mutex); =20 +/* This net is used only for transports that do support namespaces. It is = never + * registered with the namespace subsystem and always has + * VSOCK_NET_MODE_GLOBAL. Pass this net to the net lookup functions (e.g., + * vsock_find_bound_socket_net()) when you want to force global-mode or the + * same behavior as before namespaces were supported. + */ +struct net __vsock_global_dummy_net; +EXPORT_SYMBOL_GPL(__vsock_global_dummy_net); + /**** UTILS ****/ =20 /* Each bound VSocket is stored in the bind hash table and each connected @@ -235,33 +283,44 @@ static void __vsock_remove_connected(struct vsock_soc= k *vsk) sock_put(&vsk->sk); } =20 -static struct sock *__vsock_find_bound_socket(struct sockaddr_vm *addr) +static struct sock *__vsock_find_bound_socket_net(struct sockaddr_vm *addr, + struct net *net, + enum vsock_net_mode net_mode) { struct vsock_sock *vsk; =20 list_for_each_entry(vsk, vsock_bound_sockets(addr), bound_table) { - if (vsock_addr_equals_addr(addr, &vsk->local_addr)) - return sk_vsock(vsk); + struct sock *sk =3D sk_vsock(vsk); + + if (vsock_addr_equals_addr(addr, &vsk->local_addr) && + vsock_net_check_mode(sock_net(sk), vsk->net_mode, net, net_mode)) + return sk; =20 if (addr->svm_port =3D=3D vsk->local_addr.svm_port && (vsk->local_addr.svm_cid =3D=3D VMADDR_CID_ANY || - addr->svm_cid =3D=3D VMADDR_CID_ANY)) - return sk_vsock(vsk); + addr->svm_cid =3D=3D VMADDR_CID_ANY) && + vsock_net_check_mode(sock_net(sk), vsk->net_mode, net, net_mode)) + return sk; } =20 return NULL; } =20 -static struct sock *__vsock_find_connected_socket(struct sockaddr_vm *src, - struct sockaddr_vm *dst) +static struct sock *__vsock_find_connected_socket_net(struct sockaddr_vm *= src, + struct sockaddr_vm *dst, + struct net *net, + enum vsock_net_mode net_mode) { struct vsock_sock *vsk; =20 list_for_each_entry(vsk, vsock_connected_sockets(src, dst), connected_table) { + struct sock *sk =3D sk_vsock(vsk); + if (vsock_addr_equals_addr(src, &vsk->remote_addr) && - dst->svm_port =3D=3D vsk->local_addr.svm_port) { - return sk_vsock(vsk); + dst->svm_port =3D=3D vsk->local_addr.svm_port && + vsock_net_check_mode(sock_net(sk), vsk->net_mode, net, net_mode)) { + return sk; } } =20 @@ -304,12 +363,14 @@ void vsock_remove_connected(struct vsock_sock *vsk) } EXPORT_SYMBOL_GPL(vsock_remove_connected); =20 -struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr) +struct sock *vsock_find_bound_socket_net(struct sockaddr_vm *addr, + struct net *net, + enum vsock_net_mode net_mode) { struct sock *sk; =20 spin_lock_bh(&vsock_table_lock); - sk =3D __vsock_find_bound_socket(addr); + sk =3D __vsock_find_bound_socket_net(addr, net, net_mode); if (sk) sock_hold(sk); =20 @@ -317,15 +378,24 @@ struct sock *vsock_find_bound_socket(struct sockaddr_= vm *addr) =20 return sk; } +EXPORT_SYMBOL_GPL(vsock_find_bound_socket_net); + +struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr) +{ + return vsock_find_bound_socket_net(addr, vsock_global_dummy_net(), + VSOCK_NET_MODE_GLOBAL); +} EXPORT_SYMBOL_GPL(vsock_find_bound_socket); =20 -struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, - struct sockaddr_vm *dst) +struct sock *vsock_find_connected_socket_net(struct sockaddr_vm *src, + struct sockaddr_vm *dst, + struct net *net, + enum vsock_net_mode net_mode) { struct sock *sk; =20 spin_lock_bh(&vsock_table_lock); - sk =3D __vsock_find_connected_socket(src, dst); + sk =3D __vsock_find_connected_socket_net(src, dst, net, net_mode); if (sk) sock_hold(sk); =20 @@ -333,6 +403,15 @@ struct sock *vsock_find_connected_socket(struct sockad= dr_vm *src, =20 return sk; } +EXPORT_SYMBOL_GPL(vsock_find_connected_socket_net); + +struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, + struct sockaddr_vm *dst) +{ + return vsock_find_connected_socket_net(src, dst, + vsock_global_dummy_net(), + VSOCK_NET_MODE_GLOBAL); +} EXPORT_SYMBOL_GPL(vsock_find_connected_socket); =20 void vsock_remove_sock(struct vsock_sock *vsk) @@ -528,7 +607,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, stru= ct vsock_sock *psk) =20 if (sk->sk_type =3D=3D SOCK_SEQPACKET) { if (!new_transport->seqpacket_allow || - !new_transport->seqpacket_allow(remote_cid)) { + !new_transport->seqpacket_allow(vsk, remote_cid)) { module_put(new_transport->module); return -ESOCKTNOSUPPORT; } @@ -676,6 +755,7 @@ static void vsock_pending_work(struct work_struct *work) static int __vsock_bind_connectible(struct vsock_sock *vsk, struct sockaddr_vm *addr) { + struct net *net =3D sock_net(sk_vsock(vsk)); static u32 port; struct sockaddr_vm new_addr; =20 @@ -695,7 +775,8 @@ static int __vsock_bind_connectible(struct vsock_sock *= vsk, =20 new_addr.svm_port =3D port++; =20 - if (!__vsock_find_bound_socket(&new_addr)) { + if (!__vsock_find_bound_socket_net(&new_addr, net, + vsk->net_mode)) { found =3D true; break; } @@ -712,7 +793,8 @@ static int __vsock_bind_connectible(struct vsock_sock *= vsk, return -EACCES; } =20 - if (__vsock_find_bound_socket(&new_addr)) + if (__vsock_find_bound_socket_net(&new_addr, net, + vsk->net_mode)) return -EADDRINUSE; } =20 @@ -836,6 +918,8 @@ static struct sock *__vsock_create(struct net *net, vsk->buffer_max_size =3D VSOCK_DEFAULT_BUFFER_MAX_SIZE; } =20 + vsk->net_mode =3D vsock_net_mode(net); + return sk; } =20 @@ -2636,6 +2720,142 @@ static struct miscdevice vsock_device =3D { .fops =3D &vsock_device_ops, }; =20 +static int vsock_net_mode_string(const struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) +{ + char data[VSOCK_NET_MODE_STR_MAX] =3D {0}; + enum vsock_net_mode mode; + struct ctl_table tmp; + struct net *net; + int ret; + + if (!table->data || !table->maxlen || !*lenp) { + *lenp =3D 0; + return 0; + } + + net =3D current->nsproxy->net_ns; + tmp =3D *table; + tmp.data =3D data; + + if (!write) { + const char *p; + + mode =3D vsock_net_mode(net); + + switch (mode) { + case VSOCK_NET_MODE_GLOBAL: + p =3D VSOCK_NET_MODE_STR_GLOBAL; + break; + case VSOCK_NET_MODE_LOCAL: + p =3D VSOCK_NET_MODE_STR_LOCAL; + break; + default: + WARN_ONCE(true, "netns has invalid vsock mode"); + *lenp =3D 0; + return 0; + } + + strscpy(data, p, sizeof(data)); + tmp.maxlen =3D strlen(p); + } + + ret =3D proc_dostring(&tmp, write, buffer, lenp, ppos); + if (ret) + return ret; + + if (write) { + if (*lenp >=3D sizeof(data)) + return -EINVAL; + + if (!strncmp(data, VSOCK_NET_MODE_STR_GLOBAL, sizeof(data))) + mode =3D VSOCK_NET_MODE_GLOBAL; + else if (!strncmp(data, VSOCK_NET_MODE_STR_LOCAL, sizeof(data))) + mode =3D VSOCK_NET_MODE_LOCAL; + else + return -EINVAL; + + if (!vsock_net_write_mode(net, mode)) + return -EPERM; + } + + return 0; +} + +static struct ctl_table vsock_table[] =3D { + { + .procname =3D "ns_mode", + .data =3D &init_net.vsock.mode, + .maxlen =3D VSOCK_NET_MODE_STR_MAX, + .mode =3D 0644, + .proc_handler =3D vsock_net_mode_string + }, +}; + +static int __net_init vsock_sysctl_register(struct net *net) +{ + struct ctl_table *table; + + if (net_eq(net, &init_net)) { + table =3D vsock_table; + } else { + table =3D kmemdup(vsock_table, sizeof(vsock_table), GFP_KERNEL); + if (!table) + goto err_alloc; + + table[0].data =3D &net->vsock.mode; + } + + net->vsock.sysctl_hdr =3D register_net_sysctl_sz(net, "net/vsock", table, + ARRAY_SIZE(vsock_table)); + if (!net->vsock.sysctl_hdr) + goto err_reg; + + return 0; + +err_reg: + if (!net_eq(net, &init_net)) + kfree(table); +err_alloc: + return -ENOMEM; +} + +static void vsock_sysctl_unregister(struct net *net) +{ + const struct ctl_table *table; + + table =3D net->vsock.sysctl_hdr->ctl_table_arg; + unregister_net_sysctl_table(net->vsock.sysctl_hdr); + if (!net_eq(net, &init_net)) + kfree(table); +} + +static void vsock_net_init(struct net *net) +{ + spin_lock_init(&net->vsock.lock); + net->vsock.mode =3D VSOCK_NET_MODE_GLOBAL; +} + +static __net_init int vsock_sysctl_init_net(struct net *net) +{ + vsock_net_init(net); + + if (vsock_sysctl_register(net)) + return -ENOMEM; + + return 0; +} + +static __net_exit void vsock_sysctl_exit_net(struct net *net) +{ + vsock_sysctl_unregister(net); +} + +static struct pernet_operations vsock_sysctl_ops __net_initdata =3D { + .init =3D vsock_sysctl_init_net, + .exit =3D vsock_sysctl_exit_net, +}; + static int __init vsock_init(void) { int err =3D 0; @@ -2663,10 +2883,19 @@ static int __init vsock_init(void) goto err_unregister_proto; } =20 + if (register_pernet_subsys(&vsock_sysctl_ops)) { + err =3D -ENOMEM; + goto err_unregister_sock; + } + + vsock_net_init(&init_net); + vsock_net_init(vsock_global_dummy_net()); vsock_bpf_build_proto(); =20 return 0; =20 +err_unregister_sock: + sock_unregister(AF_VSOCK); err_unregister_proto: proto_unregister(&vsock_proto); err_deregister_misc: @@ -2680,6 +2909,7 @@ static void __exit vsock_exit(void) misc_deregister(&vsock_device); sock_unregister(AF_VSOCK); proto_unregister(&vsock_proto); + unregister_pernet_subsys(&vsock_sysctl_ops); } =20 const struct vsock_transport *vsock_core_get_transport(struct vsock_sock *= vsk) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transp= ort.c index 8c867023a2e5..6abec6b9b5bc 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -316,11 +316,10 @@ static void virtio_vsock_rx_fill(struct virtio_vsock = *vsock) vq =3D vsock->vqs[VSOCK_VQ_RX]; =20 do { - skb =3D virtio_vsock_alloc_linear_skb(total_len, GFP_KERNEL); + skb =3D virtio_vsock_alloc_rx_skb(total_len, GFP_KERNEL); if (!skb) break; =20 - memset(skb->head, 0, VIRTIO_VSOCK_SKB_HEADROOM); sg_init_one(&pkt, virtio_vsock_hdr(skb), total_len); p =3D &pkt; ret =3D virtqueue_add_sgs(vq, &p, 0, 1, skb, GFP_KERNEL); @@ -536,7 +535,7 @@ static bool virtio_transport_msgzerocopy_allow(void) return true; } =20 -static bool virtio_transport_seqpacket_allow(u32 remote_cid); +static bool virtio_transport_seqpacket_allow(struct vsock_sock *vsk, u32 r= emote_cid); =20 static struct virtio_transport virtio_transport =3D { .transport =3D { @@ -593,7 +592,7 @@ static struct virtio_transport virtio_transport =3D { .can_msgzerocopy =3D virtio_transport_can_msgzerocopy, }; =20 -static bool virtio_transport_seqpacket_allow(u32 remote_cid) +static bool virtio_transport_seqpacket_allow(struct vsock_sock *vsk, u32 r= emote_cid) { struct virtio_vsock *vsock; bool seqpacket_allow; diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c index bc2ff918b315..a8f218f0c5a3 100644 --- a/net/vmw_vsock/vsock_loopback.c +++ b/net/vmw_vsock/vsock_loopback.c @@ -46,7 +46,7 @@ static int vsock_loopback_cancel_pkt(struct vsock_sock *v= sk) return 0; } =20 -static bool vsock_loopback_seqpacket_allow(u32 remote_cid); +static bool vsock_loopback_seqpacket_allow(struct vsock_sock *vsk, u32 rem= ote_cid); static bool vsock_loopback_msgzerocopy_allow(void) { return true; @@ -106,7 +106,7 @@ static struct virtio_transport loopback_transport =3D { .send_pkt =3D vsock_loopback_send_pkt, }; =20 -static bool vsock_loopback_seqpacket_allow(u32 remote_cid) +static bool vsock_loopback_seqpacket_allow(struct vsock_sock *vsk, u32 rem= ote_cid) { return true; } --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 BC8652BE7CB for ; Tue, 21 Oct 2025 23:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090427; cv=none; b=AIGy/VVYZtdWtiMU7cwPWVDwCdPXxBRWS1TKJCS50pT4FLeGdb+Gs7jP22I1sWOmR6HnKU1P+qMlo9mFgGlvL297zDEApcnzDnnlpqs1tL3AffNR/6jsMMzDv2X8JUsHuB+hHzZisbFAjxvIIsavhLgBY+yP+zWe9QlxP6x803o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090427; c=relaxed/simple; bh=K7K94rKvWTIzHY+qdRUWp611m4kTE9R26xFksOdXz/E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ISrgDnWOjhRVBhbMd8tTOjSIhoTxEisOHQxddwEBRHHSMHxM779/Mgv19LgRf4rKpDOsBaNeJtuj1cC4NhZ7lewzU4M8dZs9Hxob2ANdEbUj3NsTcB1e6kIdU3E4ZY11w06ME1kPahu7aZ7glolFZi/AdBzcK69d2GF2YRkczao= 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=XfqXNf4K; arc=none smtp.client-ip=209.85.215.177 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="XfqXNf4K" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-b6cdba26639so317364a12.1 for ; Tue, 21 Oct 2025 16:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090424; x=1761695224; 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=7KJsmAxJEMJpeWSL0BwDVZk3RWnsnJFLrlQXVYpzX98=; b=XfqXNf4K6DI686KK23iYiyX0kIJtKB4wvPJ/TIN9rBi9ya9PkONLtXxdQAPVEDEsrz mLqwkp6H9Q1AcV/YWj8NL3c3NZkAZ6jyP1hj0jF82O+l+z4RX7msKgI/hEdlWC1fry7B LBMiU8gw+xVMzXR7OY7oGYxCUGL0EulWjdi8RQnRtC/Mf+M/7yAYX4BFtLM23T5TazdY eFDrmx8I4aXYByoH8zYM4bvffGuCVwPhCO7acsW+BcM34oGiTOtPWxdTSDkMjfNOMrK9 HdJOfoUxg5eX10adH5C3BLQSXd+viu2da8zHG9vqn3r7WExhOgIEnDyN/DsIa11DDa9J 5V1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090424; x=1761695224; 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=7KJsmAxJEMJpeWSL0BwDVZk3RWnsnJFLrlQXVYpzX98=; b=ZbEJnK8mBSopts7Tq60wFxvtefdcyQeZdNK++vSxLPHnrKulcaPIo5uOQy5L6hArcD JNjGu7G0e/x38moxX/EZeTD2EmUP2THUxNX3Heb8xVuwJr9/vvJBWUWsZMCikB2Yl+Ix Hl9lJBNmv2RdRFtAwbooOXuAlWF593kU4cLs7EsY4uXC5ta/xZD22jZHAw6BVtTUGzgy gqiLFLEPo9ksg9uTE1WAIAiovjTQKPdoRYnEo+DN4jLlwBoseR3Ua4CAD5Ewg8wwzEUN 8uGD9DXSXrAVglGDxrUAFp7WkOp/QD83qbOJZO/+COCbA01ywpm41xXtQk60XYjB6hlB iCOw== X-Forwarded-Encrypted: i=1; AJvYcCUx6WTRT/jwBB/2jnWgU7iK9CV/1AyZr8WvKqx7XR4dEbKYDzT295AiUxNKsH0iuSOIJNyoMGssu0tRZXw=@vger.kernel.org X-Gm-Message-State: AOJu0YyuNjJ2auGBH3pkjYcXRGlfTcpMJ349ZlfIV1QTo44GY3cxSBD0 SBiIl1rUaiiEbcTmpTmVA+9tTbf/523xkOyu75VBAWG3SyzLDvt1NI2Q X-Gm-Gg: ASbGncugYb866VBP7vyfZ8vUthdCzFo082QbF8JQnHRUZD4CWBLzyCq7ADpyirdfIYZ 1m6j04bovNJcUs7G+ApZh4t48RBBRQUAPp9WLU6usYTE77blPzt8F8aWFZww1OXdL5JsYY4SrBl 6bWyt5x8mUkj/OUbMouHPMd5WS/AA+26Jk1pT5r7vcZ+hhMr/ffEM/tOK9kMhmFDAH5x7yz8NZw KOXU5CRKxIn/dX/ZfB9uPAyfP8PAJNrq/VuxnPPNUbGromfNZ/JN29TJ+TY99o6lsDVzuX/7L3O LBXDXnruLOjc75X6og3xjCpRnI5Kdpb3geV6Wy1QgelLtXGe0a29jP1AuqsxY73xh1Y6Urb7539 wqQSgD67vGeV4PJOfOh+82P4zTD2jJVvCI/0Se08NlD6Y/dzMgNzSmmGSOyKWug34qwZAO7hJOQ == X-Google-Smtp-Source: AGHT+IFCrufQGCbNqmEJ7tzIn5lW6dCh+SlfvQIPR+toK95JiZPUcURBDL/+GeryRebw/OetDSF4kg== X-Received: by 2002:a17:903:249:b0:267:44e6:11d6 with SMTP id d9443c01a7336-292ffba4632mr17882415ad.6.1761090423876; Tue, 21 Oct 2025 16:47:03 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:43::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246ebcf06sm121037085ad.24.2025.10.21.16.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:03 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:48 -0700 Subject: [PATCH net-next v7 05/26] vsock/loopback: add netns support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-5-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 NS support to vsock loopback. Sockets in a global mode netns communicate with each other, regardless of namespace. Sockets in a local mode netns may only communicate with other sockets within the same namespace. Use pernet_ops to install a vsock_loopback for every namespace that is created (to be used if local mode is enabled). Retroactively call init/exit on every namespace when the vsock_loopback module is loaded in order to initialize the per-ns device. Signed-off-by: Bobby Eshleman --- Changes in v7: - drop for_each_net() init/exit, drop net_rwsem, the pernet registration handles this automatically and race-free - flush workqueue before destruction, purge pkt list - remember net_mode instead of current net mode - keep space after INIT_WORK() - change vsock_loopback in netns_vsock to ->priv void ptr - rename `orig_net_mode` to `net_mode` - remove useless comment - protect `register_pernet_subsys()` with `net_rwsem` - do cleanup before releasing `net_rwsem` when failure happens - call `unregister_pernet_subsys()` in `vsock_loopback_exit()` - call `vsock_loopback_deinit_vsock()` in `vsock_loopback_exit()` Changes in v6: - init pernet ops for vsock_loopback module - vsock_loopback: add space in struct to clarify lock protection - do proper cleanup/unregister on vsock_loopback_exit() - vsock_loopback: use virtio_vsock_skb_net() Changes in v5: - add callbacks code to avoid reverse dependency - add logic for handling vsock_loopback setup for already existing namespaces --- include/net/netns/vsock.h | 2 + net/vmw_vsock/vsock_loopback.c | 85 ++++++++++++++++++++++++++++++++++++--= ---- 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/include/net/netns/vsock.h b/include/net/netns/vsock.h index c9a438ad52f2..9d0d8e2fbc37 100644 --- a/include/net/netns/vsock.h +++ b/include/net/netns/vsock.h @@ -16,5 +16,7 @@ struct netns_vsock { /* protected by lock */ enum vsock_net_mode mode; bool mode_locked; + + void *priv; }; #endif /* __NET_NET_NAMESPACE_VSOCK_H */ diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c index a8f218f0c5a3..474083d4cfcb 100644 --- a/net/vmw_vsock/vsock_loopback.c +++ b/net/vmw_vsock/vsock_loopback.c @@ -28,8 +28,16 @@ static u32 vsock_loopback_get_local_cid(void) =20 static int vsock_loopback_send_pkt(struct sk_buff *skb) { - struct vsock_loopback *vsock =3D &the_vsock_loopback; + struct vsock_loopback *vsock; int len =3D skb->len; + struct net *net; + + net =3D virtio_vsock_skb_net(skb); + + if (virtio_vsock_skb_net_mode(skb) =3D=3D VSOCK_NET_MODE_LOCAL) + vsock =3D (struct vsock_loopback *)net->vsock.priv; + else + vsock =3D &the_vsock_loopback; =20 virtio_vsock_skb_queue_tail(&vsock->pkt_queue, skb); queue_work(vsock->workqueue, &vsock->pkt_work); @@ -134,11 +142,8 @@ static void vsock_loopback_work(struct work_struct *wo= rk) } } =20 -static int __init vsock_loopback_init(void) +static int vsock_loopback_init_vsock(struct vsock_loopback *vsock) { - struct vsock_loopback *vsock =3D &the_vsock_loopback; - int ret; - vsock->workqueue =3D alloc_workqueue("vsock-loopback", WQ_PERCPU, 0); if (!vsock->workqueue) return -ENOMEM; @@ -146,15 +151,73 @@ static int __init vsock_loopback_init(void) skb_queue_head_init(&vsock->pkt_queue); INIT_WORK(&vsock->pkt_work, vsock_loopback_work); =20 + return 0; +} + +static void vsock_loopback_deinit_vsock(struct vsock_loopback *vsock) +{ + if (vsock->workqueue) { + flush_work(&vsock->pkt_work); + virtio_vsock_skb_queue_purge(&vsock->pkt_queue); + destroy_workqueue(vsock->workqueue); + vsock->workqueue =3D NULL; + } +} + +static int vsock_loopback_init_net(struct net *net) +{ + int ret; + + net->vsock.priv =3D kzalloc(sizeof(struct vsock_loopback), GFP_KERNEL); + if (!net->vsock.priv) + return -ENOMEM; + + ret =3D vsock_loopback_init_vsock((struct vsock_loopback *)net->vsock.pri= v); + if (ret < 0) { + kfree(net->vsock.priv); + net->vsock.priv =3D NULL; + return ret; + } + + return 0; +} + +static void vsock_loopback_exit_net(struct net *net) +{ + vsock_loopback_deinit_vsock(net->vsock.priv); + kfree(net->vsock.priv); + net->vsock.priv =3D NULL; +} + +static struct pernet_operations vsock_loopback_net_ops =3D { + .init =3D vsock_loopback_init_net, + .exit =3D vsock_loopback_exit_net, +}; + +static int __init vsock_loopback_init(void) +{ + struct vsock_loopback *vsock =3D &the_vsock_loopback; + int ret; + + ret =3D vsock_loopback_init_vsock(vsock); + if (ret < 0) + return ret; + + ret =3D register_pernet_subsys(&vsock_loopback_net_ops); + if (ret < 0) + goto out_deinit_vsock; + ret =3D vsock_core_register(&loopback_transport.transport, VSOCK_TRANSPORT_F_LOCAL); if (ret) - goto out_wq; + goto out_unregister_pernet_subsys; =20 return 0; =20 -out_wq: - destroy_workqueue(vsock->workqueue); +out_unregister_pernet_subsys: + unregister_pernet_subsys(&vsock_loopback_net_ops); +out_deinit_vsock: + vsock_loopback_deinit_vsock(vsock); return ret; } =20 @@ -164,11 +227,9 @@ static void __exit vsock_loopback_exit(void) =20 vsock_core_unregister(&loopback_transport.transport); =20 - flush_work(&vsock->pkt_work); - - virtio_vsock_skb_queue_purge(&vsock->pkt_queue); + unregister_pernet_subsys(&vsock_loopback_net_ops); =20 - destroy_workqueue(vsock->workqueue); + vsock_loopback_deinit_vsock(vsock); } =20 module_init(vsock_loopback_init); --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.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 B274D2D0C63 for ; Tue, 21 Oct 2025 23:47:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090430; cv=none; b=UU8b4IWjFTjRXN3aO2eyX5ocaAvOGwjHkQUcbBcrvHn9lp5MrMHF1hxtlPmd2P4bzB12A7t25MirsZdDoDnTVl5UrY9HKuHIWbei7zLiZ65QulnsBSqhvETqF0WVhkHmTp/eglXb2mTzuOngpfPbBbxXuL+X9wouj/8Z6Ir+DCs= 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.214.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="ksSNl8rS" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-27eec33b737so93164895ad.1 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=os5A++vWr0Jg05HJdc9foZvUrjJKUDbxGaFeOqzfbILP03Y0/Cs4qzSKeyJY4/Y+Pi aYJlqgnGy0cx6LeJyLfqxi5uBsyiQk1M4/qiwZW6vM7Z1tnX19odk4Wi++jFbHC2/wjB 3RShStTE/zKWxKcyjOXpws7McwtQSXAycDxIuealtsoE41F/cYuD7g7yMjXyaM5Yy7JQ XKh5idsktwnSQv8VP4bBpZGbrh3WEfGzvwwZ0iFqsa2qmG5rEwdlw041zMZIYjifnhre //rY5BDI2y9y/LfYp0uxpjH4wqa8NZJHBbKQimxkmbneDKzjIZI8DrOtBg7xZlmW+93C QBoA== X-Forwarded-Encrypted: i=1; AJvYcCXm7jnxPzpxL3hqjP1iqf0bPw6oIf0c0VjEnCsuK488MZYvSFaE3kBmB9K7Ledm2SUDsR7H2DI8cDqrbeU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8lTO3JXGgddlNHJ2bKdnGVK/tH3D7OwTZvMCWo9Ax/1hjcXaS Pj9xHzsu6CaImQM8UE5Er1KpwhBb9dNJ6HhbmXREi62n2WEoV2C2F7mEDo7BO51u X-Gm-Gg: ASbGncuqZ2ttfC2Gdoozs2E52oldEzTMmMgFOsAKUUpPbKW2BykE8YsUxPBhtjvAaWd DVu5OVxSXbSM8jTjlOonZFKLinr4nyASMsxuqQf1ijqNdfUb07WHNHjUFXap2hPCHiYM/4YDWwG I0mkCQNsbVPsmvXJrGstMFfIgGhmhcX7LlLvhEv4ZuEUpKxuEbZnwTw8ylGKRbzRpHLIEBGfY4u 8KFDliI6bOfVK0UBncU3gLR+mIDZozotoO+xdyIxfrY7fArJpf5CDa0zkEle3BIKKwVLBiqsmeT drOWou6SxC9vIbADneryYEgaaetl9wHVu/XFEaJSynB6RdAsmgdzcR/PQ2b/Zx2rn2Ek7fkSrjZ PY0IRKEe4SMPL/mTm7r8Ch/pe4RGRctZaWnZahi/fkmIdqcGLCu0OdHOtLjFEtzgNHQ5DSkK7Ey RP+S1X62Yh 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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(stru= ct virtio_vsock_pkt_info * info->flags, zcopy); =20 + /* + * 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 v= sock_sock *vsk) struct virtio_vsock_pkt_info info =3D { .op =3D VIRTIO_VSOCK_OP_CREDIT_UPDATE, .vsk =3D vsk, + .net =3D sock_net(sk_vsock(vsk)), }; =20 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 =3D { .op =3D VIRTIO_VSOCK_OP_REQUEST, .vsk =3D vsk, + .net =3D sock_net(sk_vsock(vsk)), }; =20 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 =3D vsk, + .net =3D sock_net(sk_vsock(vsk)), }; =20 return virtio_transport_send_pkt_info(vsk, &info); @@ -1108,6 +1120,7 @@ virtio_transport_stream_enqueue(struct vsock_sock *vs= k, .msg =3D msg, .pkt_len =3D len, .vsk =3D vsk, + .net =3D sock_net(sk_vsock(vsk)), }; =20 return virtio_transport_send_pkt_info(vsk, &info); @@ -1145,6 +1158,7 @@ static int virtio_transport_reset(struct vsock_sock *= vsk, .op =3D VIRTIO_VSOCK_OP_RST, .reply =3D !!skb, .vsk =3D vsk, + .net =3D sock_net(sk_vsock(vsk)), }; =20 /* 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 =3D le32_to_cpu(hdr->src_port), .reply =3D true, .vsk =3D vsk, + .net =3D sock_net(sk_vsock(vsk)), }; =20 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 =3D virtio_vsock_skb_net_mode(skb); struct virtio_vsock_hdr *hdr =3D virtio_vsock_hdr(skb); + struct net *net =3D 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_transpor= t *t, /* The socket must be in connected or bound table * otherwise send reset back */ - sk =3D vsock_find_connected_socket(&src, &dst); + sk =3D vsock_find_connected_socket_net(&src, &dst, net, net_mode); if (!sk) { - sk =3D vsock_find_bound_socket(&dst); + sk =3D vsock_find_bound_socket_net(&dst, net, net_mode); if (!sk) { (void)virtio_transport_reset_no_sock(t, skb); goto free_pkt; --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.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 2BED42D739C for ; Tue, 21 Oct 2025 23:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090431; cv=none; b=TF/6kDile2iF/jpB9KcH7Ago3JAkAjTKroz3nWGAB9K7AGNpyy7dwG1dCYUPFSxqRa5JxUw2XixUNLK/Hb1erQ0S3KAXmRvZHrtzQPONinjrBiF42ocSh5ld83+pePdAmNoHWGjAFX18ncDBj6Y5L1SIafinUOhl+GeceJBgE+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090431; c=relaxed/simple; bh=b0fx4C78pSOxYqC0cxHVGuTmxqUvfnqQA1i++829AIo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WIfejQvgLPdpAQDnNwCWzQuWwxC+49GcvQLBqhVuCP8VQIuiCmXH0LcfSSy+IYVRsCoA4hZjhib6oeV0WHL/48rnV5QJ+zrVXpRjHe7cUHXnMXU4qH35Ppjo6MBNFFh4mXBZ12Qf3NrGrOPHpel1j0iIIoKQc8+h4SgceM/6z2A= 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=K3Tw4s/V; arc=none smtp.client-ip=209.85.215.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="K3Tw4s/V" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b6a7d3040efso2539259a12.1 for ; Tue, 21 Oct 2025 16:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090426; x=1761695226; 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=8s2iAlMKc65CfdOkkKY67qSFEWtoKyndRoIh13CYBQA=; b=K3Tw4s/V8nqCZJYlDRZdxhgYYBew4Y/ra0kH9E1L2JjMpY48P3/1BJFyBMxXVIxGiq 0XSdR29Bj8TM5qj3fiIT1jZtU2Cipg2aNRvDdaGYo2DXdG1GJqoKqUarYZ1LmeeLhJLm +sp1BfHpuKQHIfr4WRu8zHj9GCIN0zDsHZ4l1RzQ4A0cHlRtP5yedd8dZdiP0xzPXPGR SyYhICZ/jX60/uv+iOEj/mc+1ejXAEnQn+MF82hG74fcNYrNlB4mjbRKWx5RBLjRCBPR C6pZOL3MBRij7mDpxAAcvWiww/giAYK8YcxnPVhiD8KGwOjlqK7CAE4qjdLN6/eK0rcr rv7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090426; x=1761695226; 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=8s2iAlMKc65CfdOkkKY67qSFEWtoKyndRoIh13CYBQA=; b=tAXH03tdpJ7Wxt35VuSy3uIUWFKgYpgaoQQVLaYxUKzfVq8E0e5UtTGo6x/v1ZhOC4 YGnnPUcHtNhbXcVPwe//OK17wZ3Yu7VwiR4GjJJnCN+SXst0WrTvGA4N1xiVEjm6kA+p Stb2vKTnX9d/Q1txEjFT7X6Zjgt9xdDBC4pnvP6YVf2EXUzWNVI+REezZ8AQ3bjzfOCr NGN9lLoWaJsbSAp4n4V2lTxXR10GkR34yDUQZbtwYMqiOQWaE2NwbKScr5zZ7KvKOHp9 06feYkpiI6OTi5FGdRHk1AtpqqaFjz5wgxGmPkEYJ3KlZyYAA82LiUOB2jLA3O2nX3mY NV6A== X-Forwarded-Encrypted: i=1; AJvYcCXCmfwEM/m1B77h/8BlTFrY0SFXCmYJkHsLlSFT5hRlQYBOPVmdVp6ktLETR2/OiHCylIIveyBFN6fsing=@vger.kernel.org X-Gm-Message-State: AOJu0YxZfqpZgN3cSoTG+zjJs3fXmt+NLQ+HydQB1Y0OvogxkILgnCCu tLPz5N1rFLyqKBOPRUYcVFLc5D+TxuUecz7Upc/rXwYDftsskkpDLDJX X-Gm-Gg: ASbGnctznOU/ot0dY61RE9HZMQ2aQbg0yb5pHp4s8jttQq11gLF+BAG71CcmVq/0XtT Apbd/Q3kNovQuJSBtLT65wB+ms7ThOsnixeKATu7H/tQ1qRQqBiFwE+CxidQa51bl6FCyBjyQWT OGx6fcPxHeFtuzsoMFD6mgjF4ZVR4xQl87JNeLhPk3a/AucBSpN1+7rj0Ww8ANxgTWF7D4ytSbP +lZYfiErb8DDq6oJRYVKzDDrqKDLa9AZ1M6waIztwzPDwKuPiIHy1uo760MLTcBKPTTDsRZty+8 ERq5IzWN0Fg152/dZL7GK55xUCwPtqgNbGwaaxpKmK5KjC8hLez88C4K61OXVOQ5kh0O1ZnWoK1 WMXVf+JLsRlTW9tpQAXSugPbvcx49X0n4LKbeAZXLEcq7aRqf46wkJH7wuoEv9AeL4Ysdkj/l/M 7UKSB+ X-Google-Smtp-Source: AGHT+IFdsZolmIiFqyPtZksL/bCEkBQ9alY5GAJRyheOzwEUfAbu76rqKE+4kW6zc2Tl2YxsalyEyw== X-Received: by 2002:a17:902:fc4b:b0:290:8d7b:4047 with SMTP id d9443c01a7336-290c9cbc4c9mr215031465ad.21.1761090425791; Tue, 21 Oct 2025 16:47:05 -0700 (PDT) Received: from localhost ([2a03:2880:2ff::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2924721b6cfsm121026415ad.107.2025.10.21.16.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:05 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:50 -0700 Subject: [PATCH net-next v7 07/26] vhost/vsock: add netns support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-7-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 ability to isolate vhost-vsock flows using namespaces. The VM, via the vhost_vsock struct, inherits its namespace from the process that opens the vhost-vsock device. vhost_vsock lookup functions are modified to take into account the mode (e.g., if CIDs are matching but modes don't align, then return NULL). vhost_vsock now acquires a reference to the namespace. Signed-off-by: Bobby Eshleman --- Changes in v7: - remove the check_global flag of vhost_vsock_get(), that logic was both wrong and not necessary, reuse vsock_net_check_mode() instead - remove 'delete me' comment Changes in v5: - respect pid namespaces when assigning namespace to vhost_vsock --- drivers/vhost/vsock.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 34adf0cf9124..df6136633cd8 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -46,6 +46,11 @@ static DEFINE_READ_MOSTLY_HASHTABLE(vhost_vsock_hash, 8); struct vhost_vsock { struct vhost_dev dev; struct vhost_virtqueue vqs[2]; + struct net *net; + netns_tracker ns_tracker; + + /* The ns mode at the time vhost_vsock was created */ + enum vsock_net_mode net_mode; =20 /* Link to global vhost_vsock_hash, writes use vhost_vsock_mutex */ struct hlist_node hash; @@ -67,7 +72,8 @@ static u32 vhost_transport_get_local_cid(void) /* Callers that dereference the return value must hold vhost_vsock_mutex o= r the * RCU read lock. */ -static struct vhost_vsock *vhost_vsock_get(u32 guest_cid) +static struct vhost_vsock *vhost_vsock_get(u32 guest_cid, struct net *net, + enum vsock_net_mode mode) { struct vhost_vsock *vsock; =20 @@ -78,9 +84,9 @@ static struct vhost_vsock *vhost_vsock_get(u32 guest_cid) if (other_cid =3D=3D 0) continue; =20 - if (other_cid =3D=3D guest_cid) + if (other_cid =3D=3D guest_cid && + vsock_net_check_mode(net, mode, vsock->net, vsock->net_mode)) return vsock; - } =20 return NULL; @@ -271,14 +277,16 @@ static void vhost_transport_send_pkt_work(struct vhos= t_work *work) static int vhost_transport_send_pkt(struct sk_buff *skb) { + enum vsock_net_mode mode =3D virtio_vsock_skb_net_mode(skb); struct virtio_vsock_hdr *hdr =3D virtio_vsock_hdr(skb); + struct net *net =3D virtio_vsock_skb_net(skb); struct vhost_vsock *vsock; int len =3D skb->len; =20 rcu_read_lock(); =20 /* Find the vhost_vsock according to guest context id */ - vsock =3D vhost_vsock_get(le64_to_cpu(hdr->dst_cid)); + vsock =3D vhost_vsock_get(le64_to_cpu(hdr->dst_cid), net, mode); if (!vsock) { rcu_read_unlock(); kfree_skb(skb); @@ -305,7 +313,8 @@ vhost_transport_cancel_pkt(struct vsock_sock *vsk) rcu_read_lock(); =20 /* Find the vhost_vsock according to guest context id */ - vsock =3D vhost_vsock_get(vsk->remote_addr.svm_cid); + vsock =3D vhost_vsock_get(vsk->remote_addr.svm_cid, + sock_net(sk_vsock(vsk)), vsk->net_mode); if (!vsock) goto out; =20 @@ -327,7 +336,7 @@ vhost_transport_cancel_pkt(struct vsock_sock *vsk) } =20 static struct sk_buff * -vhost_vsock_alloc_skb(struct vhost_virtqueue *vq, +vhost_vsock_alloc_skb(struct vhost_vsock *vsock, struct vhost_virtqueue *v= q, unsigned int out, unsigned int in) { struct virtio_vsock_hdr *hdr; @@ -353,6 +362,9 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq, if (!skb) return NULL; =20 + virtio_vsock_skb_set_net(skb, vsock->net); + virtio_vsock_skb_set_net_mode(skb, vsock->net_mode); + iov_iter_init(&iov_iter, ITER_SOURCE, vq->iov, out, len); =20 hdr =3D virtio_vsock_hdr(skb); @@ -462,11 +474,12 @@ static struct virtio_transport vhost_transport =3D { =20 static bool vhost_transport_seqpacket_allow(struct vsock_sock *vsk, u32 re= mote_cid) { + struct net *net =3D sock_net(sk_vsock(vsk)); struct vhost_vsock *vsock; bool seqpacket_allow =3D false; =20 rcu_read_lock(); - vsock =3D vhost_vsock_get(remote_cid); + vsock =3D vhost_vsock_get(remote_cid, net, vsk->net_mode); =20 if (vsock) seqpacket_allow =3D vsock->seqpacket_allow; @@ -520,7 +533,7 @@ static void vhost_vsock_handle_tx_kick(struct vhost_wor= k *work) break; } =20 - skb =3D vhost_vsock_alloc_skb(vq, out, in); + skb =3D vhost_vsock_alloc_skb(vsock, vq, out, in); if (!skb) { vq_err(vq, "Faulted on pkt\n"); continue; @@ -652,8 +665,10 @@ static void vhost_vsock_free(struct vhost_vsock *vsock) =20 static int vhost_vsock_dev_open(struct inode *inode, struct file *file) { + struct vhost_virtqueue **vqs; struct vhost_vsock *vsock; + struct net *net; int ret; =20 /* This struct is large and allocation could fail, fall back to vmalloc @@ -669,6 +684,14 @@ static int vhost_vsock_dev_open(struct inode *inode, s= truct file *file) goto out; } =20 + net =3D current->nsproxy->net_ns; + vsock->net =3D get_net_track(net, &vsock->ns_tracker, GFP_KERNEL); + + /* Cache the mode of the namespace so that if that netns mode changes, + * the vhost_vsock will continue to function as expected. + */ + vsock->net_mode =3D vsock_net_mode(net); + vsock->guest_cid =3D 0; /* no CID assigned yet */ vsock->seqpacket_allow =3D false; =20 @@ -708,7 +731,7 @@ static void vhost_vsock_reset_orphans(struct sock *sk) */ =20 /* If the peer is still valid, no need to reset connection */ - if (vhost_vsock_get(vsk->remote_addr.svm_cid)) + if (vhost_vsock_get(vsk->remote_addr.svm_cid, sock_net(sk), vsk->net_mode= )) return; =20 /* If the close timeout is pending, let it expire. This avoids races @@ -753,6 +776,7 @@ static int vhost_vsock_dev_release(struct inode *inode,= struct file *file) virtio_vsock_skb_queue_purge(&vsock->send_pkt_queue); =20 vhost_dev_cleanup(&vsock->dev); + put_net_track(vsock->net, &vsock->ns_tracker); kfree(vsock->dev.vqs); vhost_vsock_free(vsock); return 0; @@ -779,7 +803,7 @@ static int vhost_vsock_set_cid(struct vhost_vsock *vsoc= k, u64 guest_cid) =20 /* Refuse if CID is already in use */ mutex_lock(&vhost_vsock_mutex); - other =3D vhost_vsock_get(guest_cid); + other =3D vhost_vsock_get(guest_cid, vsock->net, vsock->net_mode); if (other && other !=3D vsock) { mutex_unlock(&vhost_vsock_mutex); return -EADDRINUSE; --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.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 2C2312D73A7 for ; Tue, 21 Oct 2025 23:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090432; cv=none; b=NgICrgy+/h8+6rppVBVN1mabIhDEbg43SMmwp9h/VG/GuxWSUQ4nuCusv0NUC0gLin3uTtUXcasQmi7f0h3bPA+bUZPYXvEa/dpN3n0xQMVrtH3paKbCQYfWy6QMsJQ8nss3txLKyFEESjQZktfHcbSZyh6gYX2LtMf3m/StyBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090432; c=relaxed/simple; bh=h2iUgP5lADnjNH3SbBUo+celMr6DnQLxrTcJCu026ao=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rEyj1ATa9N4kwkH0yHP/VpSmVVwoc7UGTiX4UGpJCJcRYOyBc6G9bhmbhgIY+tkJFzJ4tLyi2Sg6Qf9ikImjSy0Ru2TH9y0v+TdpcJOYPYXbwuWXbLlifJ+XI3RUmaJ6mR1IjpR1SlNJVdku+wSiab4bE7P/2nz1f3X6dVlAEk8= 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=GX3EBNQ9; arc=none smtp.client-ip=209.85.210.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="GX3EBNQ9" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-781997d195aso4740907b3a.3 for ; Tue, 21 Oct 2025 16:47:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090427; x=1761695227; 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=7P1Xj55GhlsWB1ZKcQ5fn70bvfX9BN/deFezi9SaNlY=; b=GX3EBNQ9fFHKjdzzehzVDBWG4/r/fWseUy8qkDPvFyl5r3gOJ6RLN4Vx0ah8z1r7ZR +X5Jk8v98L/4F3wTTBcmfTC1JtYQEXEFIX4HzDd+CUplPp00gu64Sc4c9muLW6i4TgSQ jyV5iYhMS5FGMPbfkpN9XCpU73zMcOBlzoQwMQl5ypsFo51OaptiWAVkLhhnr3mCTmhQ OPrffl3bCr1fOR3RB/EAJ8Sr+9r+xzPZCJ4QU8sS3ZegLMJ1Ln13EPl4FWslkoljEIZ3 OVgCrYwpczxTYqCDH7XWVs7GulgYIqSZ+wmyTDBWlozK36oC5oWiyI8Bppc2wbB83fnS 1QGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090427; x=1761695227; 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=7P1Xj55GhlsWB1ZKcQ5fn70bvfX9BN/deFezi9SaNlY=; b=gfpjiwhaotL6Pc5ykXGu0ZnkiImdNjIIoX9RuZFDNbq6jPM4a0Iin7f4RqegUro9m4 pSni4+uWtuMMSEboKIVd3CktuXQHm5aWgLIzKqR8rpPlRwyG1OEJaMYmITO3FV1zaIQh CoSian35DyDV8cKzC0TlpsL9ZNPgbUiCqD0sLv2Wx7dOtePp2l+QGIOnHjO4QUxsWUXC aP09nF/tTFA/GCr1UGeRNYkQ+PVvSn/8ad8U3bEt1HiJAhBf7wNDHww9dpTC7mAuECzp 5WTt9Xg692mpHeJCIbZMJ3mVqc+t4RGylAOVICUzmBRdcLSQk9ia5U3Wz5V1zBBHizRs 9ntQ== X-Forwarded-Encrypted: i=1; AJvYcCVns2n4wmErLWuNwU/pBwtkaMz4Nvxw+qHapQkicQxSO/Y4xuHjKUkFRA44e8trkYArnJhJ4XujrlTtDO4=@vger.kernel.org X-Gm-Message-State: AOJu0YzdFpYz9UI8dqKiBbJ4PDtm6glUgLnCPEoIf8WGwvnVEWMFt33q FBTNiILl9gDCEPVd4ekCcijNPUnLL3KmgTRN9foHahE27xiEsEtG0ZNL X-Gm-Gg: ASbGncusMPMFaBrAx/D+440fuHd1FnTxaOsHK/8MhpdKxYUzPFxygC9+0nIJF/s6DBs IPrI9QSkid7xWyIsGokltkyif2w3hMCxg2M0piT2Ik5qQ3qOj5q5aRH9/j6yBP1ZPW6WUkt8sbP U4O3JzprhfH/F97y7Wv3m/vRSEtTPp4UT4KArFrnPHgUhxb8RFIS5mvMl1p6OgWpJkYoj4uHVAy pS6gwkoi/9wpqOlbX0AF39HVZKYnviOdXv+Sq4IwUWY7EadOZk13/lzR28UdD4G5VBbwxSonXb/ 1fmlu+KqHWfnPoNx1X7tOvzVEwddrt16YL4dM3fymX2in7WlVZmdjImKAwRWeB5uZbr6aiKG8a9 BEGOwqFVD2eVCq6MowNMieHnds71aw0G7gEZUeh5FkemTp8/Kk3p0yRfG5XhsFN/JKKAY8uR3nL CzK/5GMtWEgd1wRlk= X-Google-Smtp-Source: AGHT+IHod+mi+RsSqS6cSISV/jLxrJBCc/kNex1TUjfpCP6Rs0yGTTP+zCj8Gdc/6sD+N1K7ZCxkfg== X-Received: by 2002:a05:6a00:a89:b0:781:1cc0:d0ce with SMTP id d2e1a72fcca58-7a220ab6c70mr23060744b3a.16.1761090426779; Tue, 21 Oct 2025 16:47:06 -0700 (PDT) Received: from localhost ([2a03:2880:2ff::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a2326ac189sm11874522b3a.29.2025.10.21.16.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:06 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:51 -0700 Subject: [PATCH net-next v7 08/26] selftests/vsock: improve logging in vmtest.sh Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-8-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 Improve usability of logging functions. Remove the test name prefix from logging functions so that logging calls can be made deeper into the call stack without passing down the test name or setting some global. Teach log function to accept a LOG_PREFIX variable to avoid unnecessary argument shifting. Remove log_setup() and instead use log_host(). The host/guest prefixes are useful to show whether a failure happened on the guest or host side, but "setup" doesn't really give additional useful information. Since all log_setup() calls happen on the host, lets just use log_host() instead. Signed-off-by: Bobby Eshleman --- Changes in v7: - do not use log levels, keep as on/off switch, after revising this patch series the levels became unnecessary. Could be added latter if it becomes useful. --- tools/testing/selftests/vsock/vmtest.sh | 69 ++++++++++++++---------------= ---- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index edacebfc1632..561600814bef 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -271,60 +271,51 @@ EOF =20 host_wait_for_listener() { wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_P= ERIOD_MAX}" -} - -__log_stdin() { - cat | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }' -} =20 -__log_args() { - echo "$*" | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }' } =20 log() { - local prefix=3D"$1" + local redirect + local prefix =20 - shift - local redirect=3D if [[ ${VERBOSE} -eq 0 ]]; then redirect=3D/dev/null else redirect=3D/dev/stdout fi =20 + prefix=3D"${LOG_PREFIX:-}" + if [[ "$#" -eq 0 ]]; then - __log_stdin | tee -a "${LOG}" > ${redirect} + if [[ -n "${prefix}" ]]; then + cat | awk -v prefix=3D"${prefix}" '{printf "%s: %s\n", prefix, $0}' + else + cat + fi else - __log_args "$@" | tee -a "${LOG}" > ${redirect} - fi -} - -log_setup() { - log "setup" "$@" + if [[ -n "${prefix}" ]]; then + echo "${prefix}: " "$@" + else + echo "$@" + fi + fi | tee -a "${LOG}" > ${redirect} } =20 log_host() { - local testname=3D$1 - - shift - log "test:${testname}:host" "$@" + LOG_PREFIX=3Dhost log $@ } =20 log_guest() { - local testname=3D$1 - - shift - log "test:${testname}:guest" "$@" + LOG_PREFIX=3Dguest log $@ } =20 test_vm_server_host_client() { - local testname=3D"${FUNCNAME[0]#test_}" =20 vm_ssh -- "${VSOCK_TEST}" \ --mode=3Dserver \ --control-port=3D"${TEST_GUEST_PORT}" \ --peer-cid=3D2 \ - 2>&1 | log_guest "${testname}" & + 2>&1 | log_guest & =20 vm_wait_for_listener "${TEST_GUEST_PORT}" =20 @@ -332,18 +323,17 @@ test_vm_server_host_client() { --mode=3Dclient \ --control-host=3D127.0.0.1 \ --peer-cid=3D"${VSOCK_CID}" \ - --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host "${testname}" + --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host =20 return $? } =20 test_vm_client_host_server() { - local testname=3D"${FUNCNAME[0]#test_}" =20 ${VSOCK_TEST} \ --mode "server" \ --control-port "${TEST_HOST_PORT_LISTENER}" \ - --peer-cid "${VSOCK_CID}" 2>&1 | log_host "${testname}" & + --peer-cid "${VSOCK_CID}" 2>&1 | log_host & =20 host_wait_for_listener =20 @@ -351,19 +341,18 @@ test_vm_client_host_server() { --mode=3Dclient \ --control-host=3D10.0.2.2 \ --peer-cid=3D2 \ - --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest "${testna= me}" + --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest =20 return $? } =20 test_vm_loopback() { - local testname=3D"${FUNCNAME[0]#test_}" local port=3D60000 # non-forwarded local port =20 vm_ssh -- "${VSOCK_TEST}" \ --mode=3Dserver \ --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest "${testname}" & + --peer-cid=3D1 2>&1 | log_guest & =20 vm_wait_for_listener "${port}" =20 @@ -371,7 +360,7 @@ test_vm_loopback() { --mode=3Dclient \ --control-host=3D"127.0.0.1" \ --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest "${testname}" + --peer-cid=3D1 2>&1 | log_guest =20 return $? } @@ -399,25 +388,25 @@ run_test() { =20 host_oops_cnt_after=3D$(dmesg | grep -i 'Oops' | wc -l) if [[ ${host_oops_cnt_after} -gt ${host_oops_cnt_before} ]]; then - echo "FAIL: kernel oops detected on host" | log_host "${name}" + echo "FAIL: kernel oops detected on host" | log_host rc=3D$KSFT_FAIL fi =20 host_warn_cnt_after=3D$(dmesg --level=3Dwarn | wc -l) if [[ ${host_warn_cnt_after} -gt ${host_warn_cnt_before} ]]; then - echo "FAIL: kernel warning detected on host" | log_host "${name}" + echo "FAIL: kernel warning detected on host" | log_host rc=3D$KSFT_FAIL fi =20 vm_oops_cnt_after=3D$(vm_ssh -- dmesg | grep -i 'Oops' | wc -l) if [[ ${vm_oops_cnt_after} -gt ${vm_oops_cnt_before} ]]; then - echo "FAIL: kernel oops detected on vm" | log_host "${name}" + echo "FAIL: kernel oops detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 vm_warn_cnt_after=3D$(vm_ssh -- dmesg --level=3Dwarn | wc -l) if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then - echo "FAIL: kernel warning detected on vm" | log_host "${name}" + echo "FAIL: kernel warning detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 @@ -452,10 +441,10 @@ handle_build =20 echo "1..${#ARGS[@]}" =20 -log_setup "Booting up VM" +log_host "Booting up VM" vm_start vm_wait_for_ssh -log_setup "VM booted up" +log_host "VM booted up" =20 cnt_pass=3D0 cnt_fail=3D0 --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 B7D042DCC05 for ; Tue, 21 Oct 2025 23:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090433; cv=none; b=FJhfRRa0nvKtNQAGt7Jxi+t/cF4R2v8oapDeMY8ZM4McM3Wm2e06QRErR+ZeGnt4QjKeesh99jCA0HAm1jXK+y/VlIfxzFcEQChpelmM+vGinJxR9jch2FAu7x7xfI8aH/xCvv+rNRtsP2LO9NDkkhz1BI0YSmd8ctiLBhBmTak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090433; c=relaxed/simple; bh=WLRIEtshDzL84rzcliCGLW0ha/QAvCdjX7baGObipwo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gbsF0+5dLaWbfBg8PlFcuBgtBZwPePpiEO2HpwCBmdYSDpGNXD+p8H0wUQCzYojKwA/HtGC66fMVC1+54Qy+NIhJ14KVCFBkcDRvW1+2T9VzWOOfjt0S+N/PkwLnkYMuzNEJ62D1knSFivY3+Fry8o0rc0B7J2hhbwR5YRu3HIQ= 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=isRGfygX; arc=none smtp.client-ip=209.85.210.181 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="isRGfygX" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-78af743c232so4888149b3a.1 for ; Tue, 21 Oct 2025 16:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090428; x=1761695228; 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=qRr57c0ypvpAqUCBQClyFAT6EHQRTScPRNGmNmK0UxI=; b=isRGfygX3j3kiY9X/b4OtfvTwWRvJM/VJ6cfmc/v7sH/L+5YBWxqGOIarwcO8xCJyk QXIiM/pCYVIbiAujF9qK//A3Sj006l9IYbDfDgPXINjzmRdchl5LCHumRxFKPLbkiGG3 OGYMruJUyIqmbFHhlMtARC0wST+P1gYQCcIC/KCU9iOxMiLpPr7+I5dUd0aawRVWFqNL nM43YRXl/+Rv9Jf3iChLrMf91XTatMhHShIJOHp/Outx5iIbPeS1EGt1O0RRKYHZH5kI IGSs2qXy0N3M2sd1aOEaWzv9bLkQcUwy3Ksu/VePPRkbhDJrncH1Cx9rk899OC9MP+Hr 431g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090428; x=1761695228; 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=qRr57c0ypvpAqUCBQClyFAT6EHQRTScPRNGmNmK0UxI=; b=d36Q3Gb7atzkswyaubJ1ajd1++xV/5KCfzXMvsZK3FSy+szhQDfVhyo34bC3QpB6/I 9IiuM4Fdm4ot+mxQEWm4As5eS5kCqsCrjlnrzYVwmNp5JM2FJAcylXBxD2N45DRghKdR zsw6GKXzjVb8Q7P0U8HapbD6HK9ggebC+0N99eAAgOI8fY3e8h+1YdLg7TOgIfR4BZUY qA9nwYvJjfDw1OoT7JRNYgrOu5VbVbolCTTftb8+YNgeLBgmUTZR98tsbZTDo+XOkvGh yD9VNaIn/18XKvhb9knKkLlA3SfNv8YwoBrcUnGQJQf0jY/NFKqZnkmFDKkEWgwP6LQg 9AYQ== X-Forwarded-Encrypted: i=1; AJvYcCUWVKq7O3r8/V70bzt9vbPqzruW4RpU1TQT/VxsPj76W/43FOJLcSooEHb81SzAmnPf8AEOa3su6TwyKaY=@vger.kernel.org X-Gm-Message-State: AOJu0YwUL4twiWinWEf5KkH14QPu6AvPMY3czreriT9cx01f02pmj/zh PcXS5NrzP6V5ihO2nBao7G4YLHbMgtDaDEg7QYRJ+drrI8s0NmllwvP9 X-Gm-Gg: ASbGnct/X6tu/EXn+Fe2IaQcNmx3i4WMIsbkG7Kj6+zqI/v3PoEo2XDwKUYMWkKyxCk bDb83Jzlt/aTCDG2fTQgafJifjzefupxxFq0eDCoZgi7WMQGyvLUrPsDxjlK038kULSeBzi89nn Z+WhIn7Y+DnZCGYJTO0u7Dlc5K42EC6Nqh3r6fVseoFaetLED8cwGM/pRbRg+A64RPmECTZSHkN eEhwA3w2kB2zpOSBx7zmRRWsqaiv9LNzr3tuD229bKARTz3Xw3LCBzPuJCg82yRlMYRF8SN4b05 VzNsRuA3jSqhhsAX7Dh8VJb4fNXchwIlfGtCQqV1fcgDrHAPt+6QN3aVAdOPHmqD09RGvqMwkJv xIz+8SywNWkX1UybW5cgLEBISzMFJwziPqLLFXYSKpMsYEwIe5xgy5A24y8oZyPZZSiq2k0PjpQ == X-Google-Smtp-Source: AGHT+IGw80QlQNTM0vsCWt4Xrwj7+OMB8f2A+GUNehs8ToYoF6rhSNtapD7Jyv42u/TS1+BhlWruNw== X-Received: by 2002:a17:902:ea03:b0:28e:7567:3c45 with SMTP id d9443c01a7336-290c9c897damr245660295ad.9.1761090427698; Tue, 21 Oct 2025 16:47:07 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292472197desm120683495ad.115.2025.10.21.16.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:07 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:52 -0700 Subject: [PATCH net-next v7 09/26] selftests/vsock: make wait_for_listener() work even if pipefail is on Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-9-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 Save/restore pipefail to not mistakenly trip the if-condition in wait_for_listener(). awk doesn't gracefully handle SIGPIPE with a non-zero exit code, so grep exiting upon finding a match causes false-positives when the pipefail option is used. This will enable pipefail usage, so that we can losing failures when piping test output into log() functions. Fixes: a4a65c6fe08b ("selftests/vsock: add initial vmtest.sh for vsock") Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 561600814bef..ec3ff443f49a 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -243,6 +243,7 @@ wait_for_listener() local port=3D$1 local interval=3D$2 local max_intervals=3D$3 + local old_pipefail local protocol=3Dtcp local pattern local i @@ -251,6 +252,13 @@ wait_for_listener() =20 # for tcp protocol additionally check the socket state [ "${protocol}" =3D "tcp" ] && pattern=3D"${pattern}0A" + + # 'grep -q' exits on match, sending SIGPIPE to 'awk', which exits with + # an error, causing the if-condition to fail when pipefail is set. + # Instead, temporarily disable pipefail and restore it later. + old_pipefail=3D$(set -o | awk '/^pipefail[[:space:]]+(on|off)$/{print $2}= ') + set +o pipefail + for i in $(seq "${max_intervals}"); do if awk '{print $2" "$4}' /proc/net/"${protocol}"* | \ grep -q "${pattern}"; then @@ -258,6 +266,10 @@ wait_for_listener() fi sleep "${interval}" done + + if [[ "${old_pipefail}" =3D=3D on ]]; then + set -o pipefail + fi } =20 vm_wait_for_listener() { --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 B894E2DCF4C for ; Tue, 21 Oct 2025 23:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090432; cv=none; b=PzlVLjh/Ry4LNeBT+zGr4/EMwkLaHdkTZkPKM0Tu3XAKYeZvoum0Q94UXs+vi0ukfoW3wAuouZT+nmojvDkK3Zd2iedDh4HaY32VfHTb04X/LaqK7/kRD1caOqYXkft0y/1ADDMVv8dBDprV1MaO6oEH/pcYeS2MeglC500k7es= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090432; c=relaxed/simple; bh=bLgJRj0B3l4I9LRxTwg4ipTz6i5xRpftUXJZZBIn7VI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pyz7S3pRPRKeiKnJqvmsVPB/nuJhnBCNKkeE/R9tk4o0D+XSL9V0Pkh1L51z7vH94opVHkJezKebzMs/0Q1kcR89UpdR6YFFpqvCfJdMlMb6H5iZ8TTgYd2anVHgHlAT4PP/tSaJdyxKv9vaWF7eT40dBUJwOWF2OH+VqDuY2r8= 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=WWc1v91H; arc=none smtp.client-ip=209.85.210.179 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="WWc1v91H" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7a213c3c3f5so8063044b3a.3 for ; Tue, 21 Oct 2025 16:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090429; x=1761695229; 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=ysnAf5Q6/F37oVxnktahtq8MWGwMsYn3elO8YpXbx58=; b=WWc1v91HrI0aX0IVlRuS9CMwS78uNFi5IhWxvqoBKtmul+3fGRFloPkHbfh/QwQnqE Q7JFpeMIHePBAcMlQMy0lN88yIXcm2r7p4J6Xtv8PVqfgsB7o5ZsgCxjU+HwiTYsAdry S/WT2cxKpMj57Ta/9D7Z5+jt/0Wa/3MbWkKDDFGoSy1z/rlcH0D3dTOgFeN8ER67qf2S Pb26dukHqsR/6lZ/tDbLmJ6f6TlbCA2vnRIGJa4Cvc4iuKZOnAOU3F2IyKxLy4rYaV/C JOv6BDAFJbZnyWoPrKoOzqkaAFluha74bd3zhwCTbcicdLM232cKgi3PjhORkIbIvn3J 844g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090429; x=1761695229; 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=ysnAf5Q6/F37oVxnktahtq8MWGwMsYn3elO8YpXbx58=; b=vmK/vdNz9lPYV1E2L/JCDg/caDB4odNWnetVk+XQki148HzmzxMlh0a8xJV5bKkz2u iCWQ2w2giVU53OfVanAJhBHsQ2lEGJlApR8bNyI0a+TlwpWvMkHiVGi2Z5xQFPwI/Fey tVsJEQrigxS3VIiwFXibCKMA8A5473mcROFUjnNKZW/jqTTGVSSDFiT4Vouhqv+/GkEO D8RjJAWOnrXcK5P5/P6Cv/qAc8Io/ZjBkn8hw4/BeCVwMQq5erKEcRyaP2S+AhoIudeh 1Hqj02pRxYhSVYRcLVZquwMgzl9Yx+xzUyV7fQsvhydvW9xoF0hNQ7mzGHBwAszNYR+7 jRdw== X-Forwarded-Encrypted: i=1; AJvYcCWTLKojRq6WtZw4lwvNFFCd0N8IXIT3dmYJ+PkRONntqv3eKiwIsyE1nOmlkavQJVS8EEVCnr0Rqutoz2w=@vger.kernel.org X-Gm-Message-State: AOJu0YxT0Q6TX8ds/D7UcpkJ85NKdiKRThs/oYghhgsIdYL1Fl882pAT XrgpjalIefHqn8K7H37TAqd0lOV287Ns05eJ0xCtaUyDWJo6Ls7rxDsJ X-Gm-Gg: ASbGncus/764mrAAP4atXZpXzulmtr+R/zIWihmhzKwzAXex8Tvrygi7+ZgqWnjyq7n 6RKB8xfcupDvwdDo8NbpSOFEzzLLT+kJeZ5rCRAqIVxupH0BP31UECPkKtkNL+ub0ehQup5gS27 GVzln2XlUPOnI4cTipVLP5eKPumsHUe3RD5igZm9oPfu+vCTV2Hf8JQDG2AY71Q5kZNiE2OvL5u U51iJ68un621rXE0JKxis9gy8puuNbzr3ubxFTuFbp+pkNX0hdxLwz1ip7wZRawSeajJOzFLmqN WyVulhuG2DDoEsSnXUoPKLoZeaA+0qnM39+g1+i/sUGq8DHrgKoTG4ckXIX3z52q9zn3cIHNcsR HB3IZoHMgApfyMdCmVobIDLBGqsDqxJDF81K++EyR5umi4sWK5eEPAL3zcyOvcqaIYQP4MVoZ X-Google-Smtp-Source: AGHT+IESeY2Sh9LyXvlNWSBcoIwZ1r/2aMHLIXNnNKYEULemMRlMzJHh0W4ok0D91ZgsuVhYMMaokA== X-Received: by 2002:a05:6a20:1611:b0:2ae:dee:4ba with SMTP id adf61e73a8af0-334a85bb208mr23055148637.50.1761090428628; Tue, 21 Oct 2025 16:47:08 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:2::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a22ff5d76bsm12490315b3a.33.2025.10.21.16.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:08 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:53 -0700 Subject: [PATCH net-next v7 10/26] selftests/vsock: reuse logic for vsock_test through wrapper functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-10-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 wrapper functions vm_vsock_test() and host_vsock_test() to invoke the vsock_test binary. This encapsulates several items of repeat logic, such as waiting for the server to reach listening state and enabling/disabling the bash option pipefail to avoid pipe-style logging from hiding failures. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 131 ++++++++++++++++++++++------= ---- 1 file changed, 92 insertions(+), 39 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index ec3ff443f49a..29b36b4d301d 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -283,7 +283,78 @@ EOF =20 host_wait_for_listener() { wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_P= ERIOD_MAX}" +} + +vm_vsock_test() { + local host=3D$1 + local cid=3D$2 + local port=3D$3 + local rc + + set -o pipefail + if [[ "${host}" !=3D server ]]; then + # log output and use pipefail to respect vsock_test errors + vm_ssh -- "${VSOCK_TEST}" \ + --mode=3Dclient \ + --control-host=3D"${host}" \ + --peer-cid=3D"${cid}" \ + --control-port=3D"${port}" \ + 2>&1 | log_guest + rc=3D$? + else + # log output and use pipefail to respect vsock_test errors + vm_ssh -- "${VSOCK_TEST}" \ + --mode=3Dserver \ + --peer-cid=3D"${cid}" \ + --control-port=3D"${port}" \ + 2>&1 | log_guest & + rc=3D$? + + if [[ $rc -ne 0 ]]; then + set +o pipefail + return $rc + fi + + vm_wait_for_listener "${port}" + rc=3D$? + fi + set +o pipefail =20 + return $rc +} + +host_vsock_test() { + local host=3D$1 + local cid=3D$2 + local port=3D$3 + local rc + + # log output and use pipefail to respect vsock_test errors + set -o pipefail + if [[ "${host}" !=3D server ]]; then + ${VSOCK_TEST} \ + --mode=3Dclient \ + --peer-cid=3D"${cid}" \ + --control-host=3D"${host}" \ + --control-port=3D"${port}" 2>&1 | log_host + rc=3D$? + else + ${VSOCK_TEST} \ + --mode=3Dserver \ + --peer-cid=3D"${cid}" \ + --control-port=3D"${port}" 2>&1 | log_host & + rc=3D$? + + if [[ $rc -ne 0 ]]; then + return $rc + fi + + host_wait_for_listener "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}" + rc=3D$? + fi + set +o pipefail + + return $rc } =20 log() { @@ -322,59 +393,41 @@ log_guest() { } =20 test_vm_server_host_client() { + if ! vm_vsock_test "server" 2 "${TEST_GUEST_PORT}"; then + return "${KSFT_FAIL}" + fi =20 - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dserver \ - --control-port=3D"${TEST_GUEST_PORT}" \ - --peer-cid=3D2 \ - 2>&1 | log_guest & - - vm_wait_for_listener "${TEST_GUEST_PORT}" - - ${VSOCK_TEST} \ - --mode=3Dclient \ - --control-host=3D127.0.0.1 \ - --peer-cid=3D"${VSOCK_CID}" \ - --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host + if ! host_vsock_test "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}"; then + return "${KSFT_FAIL}" + fi =20 - return $? + return "${KSFT_PASS}" } =20 test_vm_client_host_server() { + if ! host_vsock_test "server" "${VSOCK_CID}" "${TEST_HOST_PORT_LISTENER}"= ; then + return "${KSFT_FAIL}" + fi =20 - ${VSOCK_TEST} \ - --mode "server" \ - --control-port "${TEST_HOST_PORT_LISTENER}" \ - --peer-cid "${VSOCK_CID}" 2>&1 | log_host & - - host_wait_for_listener - - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dclient \ - --control-host=3D10.0.2.2 \ - --peer-cid=3D2 \ - --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest + if ! vm_vsock_test "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}"; then + return "${KSFT_FAIL}" + fi =20 - return $? + return "${KSFT_PASS}" } =20 test_vm_loopback() { local port=3D60000 # non-forwarded local port =20 - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dserver \ - --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest & - - vm_wait_for_listener "${port}" + if ! vm_vsock_test "server" 1 "${port}"; then + return "${KSFT_FAIL}" + fi =20 - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dclient \ - --control-host=3D"127.0.0.1" \ - --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest + if ! vm_vsock_test "127.0.0.1" 1 "${port}"; then + return "${KSFT_FAIL}" + fi =20 - return $? + return "${KSFT_PASS}" } =20 run_test() { --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 7F1A72505AF for ; Tue, 21 Oct 2025 23:47:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090434; cv=none; b=YNjQBMT4VgIHSH821UJmLbpptSvJN4hwcQ9wmCGPcYjH0d5+U+jVBnjxrctmjUxcTpq7JWadzH04hYtpvaBys71aTd89ClDgbgvnbqnmeyqAFiEIQeUuq8+NEUexNgq0aMpJIhe5Yj/VLNkTCAgRJzEZQITZaPpQAiqn95yOKf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090434; c=relaxed/simple; bh=1TJpetkZxtBQiB7nUe4Rc6HDEslWsfWsLeGiK/zQyW0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Sq/1GZEwW6pxDBMlippu0rf6f1zA7ZDf4OB47J/RGAiq2MxmqHEJ2vIUMvYTExPgrwxtdt48skiekDp7eG48RF6jppzZaLEk+l4LgTRyPpLOZnOQLgEMr9067vmRSFWB4VpJQ7myN86WqCnNPSuq01jCLHRsr3NSfMzTN8pM9ko= 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=T/25T2Bd; arc=none smtp.client-ip=209.85.210.174 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="T/25T2Bd" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-781010ff051so4625449b3a.0 for ; Tue, 21 Oct 2025 16:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090429; x=1761695229; 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=bp4Nw6yXc3Wo3rOJsEv9cE/uO6VvL+09gH92ff2ezzc=; b=T/25T2Bdj+e1EgSp8QyZaPBc6GRNHzdwS8hilo/vEDQREmT84YiYUYxl4K9+WjY4rS ZsoElTzdHbxvUMcIi+boXwJqGqzpqTaop95hmNc7uSXn9h/QJBw/MnvRqoXiF5rCkXsn /hG1Jixn+Axlett/YZcVSVz4+IdktVd7h10FBFEdozP6BlBsnKmrGqmJ1Z4VXO+JH/Os hBkKCvN4wOCEM++6PMIy62lhVrRcxdSQ5td3+47692sK4T3lNkmOEisJFK2paNLDuUcr me42/3zOs4jwDSe8/pACiPmpS0ZzBYCNJLoCHJbUqe5Bm6FGhVIC3rDXbqbRHjCWrQfv Lskw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090429; x=1761695229; 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=bp4Nw6yXc3Wo3rOJsEv9cE/uO6VvL+09gH92ff2ezzc=; b=b7PWklzsqe9LhdxKZoyNKBdxBdsEQAz7F+rZzsmTxkbzdf/6bUomFMiqPzbGIFyIRL FsuRKZUUT2+cnEY632PLHpY3DID1VL1qSTPHOCIjBaoM2JNkIjExYcCzjkFX+CD6d6IZ 13eB8ZaiHAp1wnXEgNEiXR5uHjxVRRMjFapNdwb/iEEpEMc1ZRo2xTxTsqpKMoomtpbu T1n11R1cS5K9/3a9u4l3otQfjae/IbTF7xLsAgH3LmfoRU579Gx4UjtLYLKVD5nM8Bbc xQlMl37l3BF3wLle/x6zQZkAK4ZxfMEaiG/T4ew3FLOqC8FYPEQUvA9EF8bJrcBo9J/+ neNA== X-Forwarded-Encrypted: i=1; AJvYcCXr4gj+T+VSH+jojO/SczD5foAZ21cOsPogDmHx5wOeGHRYpQ1KYpHGbe5ZiM+zyZ/tQkQ9kmBVt+5qDOk=@vger.kernel.org X-Gm-Message-State: AOJu0YzrYccw7ZbgUsQDnN1E0GadgfcP27BB4ZWjNU99d+KlSeQ9JrSr nVIkdrbOmsaKncHGvsl5oAF7xcss1VAl7OIqJU850pjIOVVISsKtk9xD X-Gm-Gg: ASbGncsPRQIOPSUVJ5JePE+I6EdE8SzqFmk9cKmpwkToBxoiXxct6O+rztDJ7P7OZCF z9V8PDs78QNTiiUH8Mn1Tp/yCdXfPSFJDIqbv3ViwHv4v9TgZvAF2WQ6s+1Xud6AI05rCBh5iHr t50PbxFsdzNV4RwhY8koYc1xjQFbr8KSsOIXAqa3lgzUYuX5c4yu5AoDTRshjFP+ddM/g8ROoGd vWN3Xv6x4biMRaMxGx2dGSZ81v3n1CYxQpT/ZClqeh8DOil49hbyau2/2tGpoeGg886wzYkT0sw mAumd3UNA5sXunlvG4InmcHJjVKD2KDv7GUJJnOzOPhidQmg1+ZLP19+SPK/wR+AGhYAoq0BtGr sf/AwzZfc+0+7fIixqLZlaLmXDZhvlOkEmHgUErapFermyr1NIkKGOmr5PX7PPTHxr7SOgOtU6t WqoIno6jw= X-Google-Smtp-Source: AGHT+IFtE7kUaxGGBCIPvCA5xq+X+CjTxjkLXDamZJvTdeDWKXgLXL+jJ+B0+JzhKzpp/1MhbmJcug== X-Received: by 2002:a05:6a21:7e8a:b0:338:614f:aac4 with SMTP id adf61e73a8af0-338614fab5amr6788012637.29.1761090429512; Tue, 21 Oct 2025 16:47:09 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a25f41ad15sm2272286b3a.41.2025.10.21.16.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:09 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:54 -0700 Subject: [PATCH net-next v7 11/26] selftests/vsock: avoid multi-VM pidfile collisions with QEMU Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-11-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 Change QEMU to use generated pidfile names instead of just a single globally-defined pidfile. This allows multiple QEMU instances to co-exist with different pidfiles. This is required for future tests that use multiple VMs to check for CID collissions. Additionally, this also places the burden of killing the QEMU process and cleaning up the pidfile on the caller of vm_start(). To help with this, a function terminate_pidfiles() is introduced that callers use to perform the cleanup. The terminate_pidfiles() function supports multiple pidfile removals because future patches will need to process two pidfiles at a time. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 51 +++++++++++++++++++----------= ---- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 29b36b4d301d..9958b3250520 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -23,7 +23,7 @@ readonly VSOCK_CID=3D1234 readonly WAIT_PERIOD=3D3 readonly WAIT_PERIOD_MAX=3D60 readonly WAIT_TOTAL=3D$(( WAIT_PERIOD * WAIT_PERIOD_MAX )) -readonly QEMU_PIDFILE=3D$(mktemp /tmp/qemu_vsock_vmtest_XXXX.pid) +readonly PIDFILE_TEMPLATE=3D/tmp/vsock_vmtest_XXXX.pid =20 # virtme-ng offers a netdev for ssh when using "--ssh", but we also need a # control port forwarded for vsock_test. Because virtme-ng doesn't support @@ -33,12 +33,6 @@ readonly QEMU_PIDFILE=3D$(mktemp /tmp/qemu_vsock_vmtest_= XXXX.pid) # add the kernel cmdline options that virtme-init uses to setup the interf= ace. readonly QEMU_TEST_PORT_FWD=3D"hostfwd=3Dtcp::${TEST_HOST_PORT}-:${TEST_GU= EST_PORT}" readonly QEMU_SSH_PORT_FWD=3D"hostfwd=3Dtcp::${SSH_HOST_PORT}-:${SSH_GUEST= _PORT}" -readonly QEMU_OPTS=3D"\ - -netdev user,id=3Dn0,${QEMU_TEST_PORT_FWD},${QEMU_SSH_PORT_FWD} \ - -device virtio-net-pci,netdev=3Dn0 \ - -device vhost-vsock-pci,guest-cid=3D${VSOCK_CID} \ - --pidfile ${QEMU_PIDFILE} \ -" readonly KERNEL_CMDLINE=3D"\ virtme.dhcp net.ifnames=3D0 biosdevname=3D0 \ virtme.ssh virtme_ssh_channel=3Dtcp virtme_ssh_user=3D$USER \ @@ -89,17 +83,6 @@ vm_ssh() { return $? } =20 -cleanup() { - if [[ -s "${QEMU_PIDFILE}" ]]; then - pkill -SIGTERM -F "${QEMU_PIDFILE}" > /dev/null 2>&1 - fi - - # If failure occurred during or before qemu start up, then we need - # to clean this up ourselves. - if [[ -e "${QEMU_PIDFILE}" ]]; then - rm "${QEMU_PIDFILE}" - fi -} =20 check_args() { local found @@ -188,10 +171,26 @@ handle_build() { popd &>/dev/null } =20 +terminate_pidfiles() { + local pidfile + + for pidfile in "$@"; do + if [[ -s "${pidfile}" ]]; then + pkill -SIGTERM -F "${pidfile}" > /dev/null 2>&1 + fi + + if [[ -e "${pidfile}" ]]; then + rm -f "${pidfile}" + fi + done +} + vm_start() { + local pidfile=3D$1 local logfile=3D/dev/null local verbose_opt=3D"" local kernel_opt=3D"" + local qemu_opts=3D"" local qemu =20 qemu=3D$(command -v "${QEMU}") @@ -201,6 +200,13 @@ vm_start() { logfile=3D/dev/stdout fi =20 + qemu_opts=3D"\ + -netdev user,id=3Dn0,${QEMU_TEST_PORT_FWD},${QEMU_SSH_PORT_FWD} \ + -device virtio-net-pci,netdev=3Dn0 \ + -device vhost-vsock-pci,guest-cid=3D${VSOCK_CID} \ + --pidfile ${pidfile} + " + if [[ "${BUILD}" -eq 1 ]]; then kernel_opt=3D"${KERNEL_CHECKOUT}" fi @@ -209,14 +215,14 @@ vm_start() { --run \ ${kernel_opt} \ ${verbose_opt} \ - --qemu-opts=3D"${QEMU_OPTS}" \ + --qemu-opts=3D"${qemu_opts}" \ --qemu=3D"${qemu}" \ --user root \ --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & =20 if ! timeout ${WAIT_TOTAL} \ - bash -c 'while [[ ! -s '"${QEMU_PIDFILE}"' ]]; do sleep 1; done; exit 0'= ; then + bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'; then die "failed to boot VM" fi } @@ -507,7 +513,8 @@ handle_build echo "1..${#ARGS[@]}" =20 log_host "Booting up VM" -vm_start +pidfile=3D"$(mktemp -u $PIDFILE_TEMPLATE)" +vm_start "${pidfile}" vm_wait_for_ssh log_host "VM booted up" =20 @@ -531,6 +538,8 @@ for arg in "${ARGS[@]}"; do cnt_total=3D$(( cnt_total + 1 )) done =20 +terminate_pidfiles "${pidfile}" + echo "SUMMARY: PASS=3D${cnt_pass} SKIP=3D${cnt_skip} FAIL=3D${cnt_fail}" echo "Log: ${LOG}" =20 --=20 2.47.3 From nobody Sun Feb 8 07:58:31 2026 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 F33732E5B0D for ; Tue, 21 Oct 2025 23:47:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090434; cv=none; b=FeXhryXzBRSxlDntqYcaC1ywtyeYYoojZneRufD8qoqCeQPpVzTEuqSbZxuvMcQbMkG3IbB9xyvni5kBGA7h/ARQnsQUn0T+DPmDFIhktJn4OtsCwDbYBnT2v7g+EJdvc4CHVEhRKzhP2H9taqwZzNWtk2rgtIyHWfPKBNGNsZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090434; c=relaxed/simple; bh=sFmiWiqcfg8xXVngUspNtrgGk8pAsdPv+UUIRplZPLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uEnGo64+Rqp73x3Fnjdtcn03sHU4kOZy8IeK9dMgA9fINN45ehGBQhGPkmcx3NmMDOYsLwga4G+tsu9Apo5N6u0cdtdhpBu7tzwAguslpDjZc110VE15zznL428j2RoQjOTqPNk6UVSnFvfPzLYBH/g8fS57KqiyAZuWW0Ye62A= 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=V5w6B0ZJ; arc=none smtp.client-ip=209.85.210.169 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="V5w6B0ZJ" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-793021f348fso5548291b3a.1 for ; Tue, 21 Oct 2025 16:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090430; x=1761695230; 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=6Lx0Vsy3+YgWmRX9GABJkmBtAr8R5JRasWccNZRzMeM=; b=V5w6B0ZJQCwTfCtO7I91J2tvyL/SZY+dKcKM/ZSTCGmXFn+uZS3Zgy9/vw/BmVhkJw Fo7qWb/fhwFDmXhHgWiEH6lTicnillbZmtMOG24ahvMSpaaZ+V0FMB2ob3F9X3W5MXvg eU6SdHEC32W7j0DyAIPbXGZ2gdnKRn4EonlVaavHMJ0a7rx30dEPOaeKw1wXVmx6unVW kyApOWzSE4uEG4ObG6H0kk5ooKvjCeo0o5fvKb+KxPSCkNFoKrjYLJwiVfDBA6QqaZ3A kts6xEGkq1UHN0AL7BQEw7x6L7ZKkpPnsQz0KIQaee9Rf1Oi3lyUg5c+I4mwnnR+Xn6R CDWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090430; x=1761695230; 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=6Lx0Vsy3+YgWmRX9GABJkmBtAr8R5JRasWccNZRzMeM=; b=SoyMWDUiod2yy4KX7I4WjRgiA0XDSTebyEAd+9hIOV3VhjnAd1EmVhLulIICbW4mpr Ehc9PD7aNzhjfavG4raupcIHZup9r4onVS9sdiJcqonTlt3mGOIOvLP7OUaO4LPwVQW1 He0VaRn5LK95fvShTz2yoRkko6/g8z6mtUYn8ANrdb/W8EkdK1ml9lFO6HO+krSTWyjQ CbShTM+5VOfWdEQct7IOKledtgx2zzdoFtYGgYXW440WRIwfOZamfm/My3PTxhf+bHHd Wjn77amFSndaufbPQlI63gk5r5ByalOr1jHnSVsG18+ZyicPSzMRbq/4909aQ6nwzq0d nI0A== X-Forwarded-Encrypted: i=1; AJvYcCU2Dk8uD3YP134iUAwa2epqHwnsPqmlNc+womX7Dg9ELjhCO/Kz2iW2lHtuN6S8j1jmYx7e5xb3AJBMmac=@vger.kernel.org X-Gm-Message-State: AOJu0YxxKjPQYnDbGHschNfRZkofN3XcY7dtqVq4POEwzZQzCwZvzQMM GT9CRtLG2UpcHqjezHpAgmJcOK5kag3R+9BLhEzHd744nK+mXZzqgzF7 X-Gm-Gg: ASbGnctUt80il/MQDdZOHQvavY6i/vJB/jqL+MkWF7HlcMq+IiWJ9yoVmLDUudZYhw8 vaXJSZ8GvSr++Mqa8Zwdq7m+JmBaCVL1Zi1h8+e4DIUMza4GcUCfcjBP1ItXs0z6I1wTsw/QiCF OVoqz3XE1LaBNSGpZDL/86xqzNPybG7W/sYttny6Tsb5Ku6sRd/eLi3cLIVWnjkuzBpv1Evx/ZK fXSekYkJv/dbxKpKz7nENx2q/sFUy6zpj1j4r+TfI89mfgdlvRHIkSuE5z9p2ptR/bgWx4+RH+o ZrRzL2OX4UL5dkik9wPw5Su8yNShxBKdvXu2l2MComgJ8QQtJADwjpGQhyaxwyrf5lkrzzM1m5J tK2o3DTzOaqXwal2YAOeN0R5375XSXYaIoJLXVRKT/oTV1FDlr4QzTSr1ocMgh3d94ejt1qaBau nbnpX520bBbUpk8uyRyAg= X-Google-Smtp-Source: AGHT+IHBIC1WFg0H2qiLSSMrqYIuCevWaKcWLpJLUcG8eiGjix0DgQfBr2qDeIJoI8W1LO6p9Cikzw== X-Received: by 2002:a05:6a00:130e:b0:77e:8130:fda with SMTP id d2e1a72fcca58-7a220aa090dmr21331246b3a.13.1761090430385; Tue, 21 Oct 2025 16:47:10 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a22ff1599dsm12619953b3a.4.2025.10.21.16.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:10 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:55 -0700 Subject: [PATCH net-next v7 12/26] selftests/vsock: do not unconditionally die if qemu fails Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-12-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 If QEMU fails to boot, then set the returncode (via timeout) instead of unconditionally dying. This is in preparation for tests that expect QEMU to fail to boot. In that case, we just want to know if the boot failed or not so we can test the pass/fail criteria, and continue executing the next test. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 9958b3250520..d53dd25f5b48 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -221,10 +221,8 @@ vm_start() { --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & =20 - if ! timeout ${WAIT_TOTAL} \ - bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'; then - die "failed to boot VM" - fi + timeout "${WAIT_TOTAL}" \ + bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0' } =20 vm_wait_for_ssh() { --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 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 A39A82E2EEF for ; Tue, 21 Oct 2025 23:47:12 +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=1761090438; cv=none; b=JEEL25COS/m5VeXN9odL2lskVCH8fNPlgQ8dl1t+oL2sqeDeygP4tgTQkz3qPo2/MxNjhkPir3ITNCD4oOafPxozRCxidRLep1AUhXUD7VR4VOwQBz1756gWzLdOKaZhJOCRQZljIoTivwC3thMrhGMt3Rkcki9ZwMu73s0YoVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090438; c=relaxed/simple; bh=Ah75iXsh0T8yhCIpU6zRS0eJQetFgIMRMgUlS91SRJ0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bezkgZX7qzLx2mRO3LlqE6+u72/UyysubBQYxNKaGiKOnbS0uTPVUxxZiEV+wmNdNEDnihh8+QctepFFJqsSRR1CWtAf0QkBbp/QyBRLtnhiMsZCeuy5SbyYZ8l1WpP9SMb5tj6lS+hqxjBTDGtzHU8SdNVwuJsfjGgd3xAmXW4= 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=HszNB7Zm; 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="HszNB7Zm" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-781206cce18so511076b3a.0 for ; Tue, 21 Oct 2025 16:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090431; x=1761695231; 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=fnzs2zs6t5aqxB+IKVfd3RCQCLiGKiLLTWmUAKIpb/I=; b=HszNB7ZmWL1j0OpgxNRQ8G5r/LEmWqQPTqK/vSouCT3KFep+YG5xltDqXPiMH/E8xQ Wivc7hlRjGXZwwWu0MPONn0MTOV7qtYbeTaK5JyETTZULIPJUIDLwLaI/PUsUH3zlRqQ v5yN2FH5/bN/XN7IMV2mNwIvFmZNKFYAHPXGFEBQFUtb4LOKNZ0VS590DPlmSXtjszy0 hSQWxOvH6di4vL2oWH8m/T5v04ylrdNiGHexQNgWEcjNgn81rH/kemiXZd5G2WSyLXdC Xt4aEmQ5EVEKJnOHcXbUASObth3aqKhmxlfCudv+D4jOhZDRGJZ5Il5G5RIevnAir6qf KDuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090431; x=1761695231; 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=fnzs2zs6t5aqxB+IKVfd3RCQCLiGKiLLTWmUAKIpb/I=; b=uK3iUncobbY2nwcw5HJj7f+TLuKF6LO8eqIKvoFpgKdKPvjXxbSb554g8oTM9czQZQ rajrT0o9fUa8dbnTetUu/yo4oJhb1zNG3PazFRufyjkVaUAcQrf21eY59kLruJhj2V9u bkbUV8BGS6HcILsoqR2QXjz+Yjs+LMPyQ0Za6rTzw4jy4351dD6YUkr1cxu33WXhjwvP 7UGJ2vv8kujw7xPGIvxLXEV2O7cdmdCqBA1J+XRjZ29HLIrO62tQPeLCRv3bFkemW1SC mDI19hkfQ/N2IKoD3o858QmO9YdbuaVhKsXvpNqPq9qOweYXzigdsDHDTukXtwhR3aGa Q0GQ== X-Forwarded-Encrypted: i=1; AJvYcCU9tfbPDPwjgVSzFv1s/8sfT1/3gIHrXu4VJJJwcxXTaF2c2giFG9wqFMnyWDzbEcZmdPjhV0gXteSJaT8=@vger.kernel.org X-Gm-Message-State: AOJu0YzvcT1tbCV9O73Z+YbaWg7a4Hmbo1vJP30CZmJXlyiFJ8atAOFp w9su9mKjTBz843CJMI8hrMhKDf2SCrwZxDeXZ+KAzFl8BGKqniE5nu2r X-Gm-Gg: ASbGnctscZxvBq+mIrZWDGyR4x3juacgHCwxw7t/upiJVw+/4g16VOPHrkhedOTxHwD V4OpvghN2k7NSIxTtalqgHoGbC64tYKmPyJkvj50imOOcKZ3CyYSxBNhal55vMz/ZmY/ck2p+UN FjbGe2plp/JFdMPnDckmVA+LNLNS6fN87XnTf9C+9dUvK8x/pU/s/gG03TWHvTC20Jsi6fGDz6F rOZkbSxXm7SsvnxNCfTBJ/6Q0zoJYcD+2P4EP4nYH1BQyh7UCiPH4D57KjNi8bDx/8xXTqqpvHp SvM2kAwU2qSxheFRcsoXSPvB8mkaunQgHNQ2J3J39C/UBJnRSUn+V7rL6suN47a/FJAJEWOsAMz 1qBBYHl6vJcQScW16o62HPGNAbo3J0ub9QFwjdMMvmmo/v6il1TuSqmNtFqHT67/U0JCS1flwkg RNM1yLFo38 X-Google-Smtp-Source: AGHT+IFbTUe9F4h1LyVbUwgCQ1C/DV9vJaiYH1suq6bPPsdLXWTdUfcRVma8kaGj52ddQduYiLM0Cg== X-Received: by 2002:a05:6a20:6a1e:b0:339:7f7c:bce5 with SMTP id adf61e73a8af0-33a9fb9f872mr2206937637.9.1761090431314; Tue, 21 Oct 2025 16:47:11 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6a7664b30dsm11118178a12.7.2025.10.21.16.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:11 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:56 -0700 Subject: [PATCH net-next v7 13/26] selftests/vsock: speed up tests by reducing the QEMU pidfile timeout Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-13-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 Reduce the time waiting for the QEMU pidfile from three minutes to five seconds. The three minute time window was chosen to make sure QEMU had enough time to fully boot up. This, however, is an unreasonably long delay for QEMU to write the pidfile, which happens earlier when the QEMU process starts (not after VM boot). The three minute delay becomes noticeably wasteful in future tests that expect QEMU to fail and wait a full three minutes for a pidfile that will never exist. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index d53dd25f5b48..020796e1c31a 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -22,7 +22,7 @@ readonly SSH_HOST_PORT=3D2222 readonly VSOCK_CID=3D1234 readonly WAIT_PERIOD=3D3 readonly WAIT_PERIOD_MAX=3D60 -readonly WAIT_TOTAL=3D$(( WAIT_PERIOD * WAIT_PERIOD_MAX )) +readonly WAIT_QEMU=3D5 readonly PIDFILE_TEMPLATE=3D/tmp/vsock_vmtest_XXXX.pid =20 # virtme-ng offers a netdev for ssh when using "--ssh", but we also need a @@ -221,7 +221,7 @@ vm_start() { --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & =20 - timeout "${WAIT_TOTAL}" \ + timeout "${WAIT_QEMU}" \ bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0' } =20 --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 2B5B62BEFE7 for ; Tue, 21 Oct 2025 23:47:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090438; cv=none; b=LCsL0S7dr/FGYPiF+jq9bJL2hylPmKXRZlIQ92jagPCtE/BA+9kZSk6hCbko1cO8NcecP82jrUvZeVN+kgSftpIl54OMvxNFYh2ceFqaRRY7aD3KQgz1AOT2e89ZG5r3SZULXKuky9kIJKSPCS88aSs0RL7py6No413CW+455FY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090438; c=relaxed/simple; bh=cSAsRDqBVRjV5+J5lLGOrcD4Yn/sBflKtNCYHEuiaRw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lPRuAkrXhMkntopCC7tUVs/4SDD3U6St/B7h9hRRrM+P85dxOR2YQZoainflQ/MXwJdwxeF/K6T/TaMg5tGXjNRiMnw4AwqBg6rLSHkTk3jSy0iyPwXuPj2dG47Wc5nIMuib8gs7N/3j1s9ATGugDTDL0GOjesySoJOrIl/wlvM= 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=FaeNva2E; arc=none smtp.client-ip=209.85.215.181 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="FaeNva2E" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-b6cdd7e5736so130974a12.3 for ; Tue, 21 Oct 2025 16:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090432; x=1761695232; 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=ERN+jbjLqe2GDwDaLELjNRkAEJw/pLWXwhebqrcXkEc=; b=FaeNva2EiD/NGgDwWGw28Af1TvmhCwwSrssU24IT9UtinFqoiRii3VR64u6+V/Rv5D NTk1K1Ju3nWPjPVkR5DXWNM8Zuf6cjMWjfI6JQf8u0z+P4pnKVasSVJV0vJvlM9xmTl4 MpmYgR+PXE5M8B92PdVIhvSNYgVI0oX10aC0qq5iVvpsbaomVVS6SsXQ4nt918Kv55VQ DkDyQx+FrZqJ55dpT1i71vEJ6gYtvDK+FDFuqfEExcNimUiMRcMtHVMOOYQhLk/+oViV Q0hx0qxLdDO16BFZ7ICU3thERrmCamimPO2osMnPtC+U1NLhk/Ir16wcU4eydcsn6QCa ll5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090432; x=1761695232; 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=ERN+jbjLqe2GDwDaLELjNRkAEJw/pLWXwhebqrcXkEc=; b=ow06Gth4c/DbfmdT5R3/9pNmHZeozPNg+nc4+7R7k339W8eEai3xWmsdwdM7NYCOU7 kq6S/lueQxusJkHhKuXJmQvkNunPHViEeUIAxf6rGuO7TWjPtht94oNeze2Hm7JboeUP guwBEgiPcOPQHbJrlKwlThOmfgtlJsjyNWL2zcAsDb2qHL7xl2+1w8/k02qkChCTnAWO 0jp7m6ziaKf22ZY0atD8lxkkqUatB3zelz0lqO37haK3epb+Dke2HOwC1pEtg6Wr7SrO vWZw0kATChbIyV1XAziQC6C35AMSz98rIBjf7uxnyX9yF1+o0CmyhtNysu4jjBaQyY6R SYEg== X-Forwarded-Encrypted: i=1; AJvYcCVlPLrD+n/NKW1koCvNeyPipMeUHZOFhe/3bWJafjeHkvGUG0zj7fPkLGMY+rdOkBLKqk01VKsc6ZXGv0o=@vger.kernel.org X-Gm-Message-State: AOJu0YwT/g9WxpAsiV8JvCfh6+sI1A42/E3PG2SEOjaXBTqkmv0Rfnra j7z/nP5Sy6zKRgG5DR4GRlESspfVfQZZv8RZXH8OkwQVpaxsXMLS+dZJ X-Gm-Gg: ASbGncvhHXLNA/LAuwlbitIL1B4/U6Ua56aUKkyAsh8tJdLAenZdSj4OUBmQ2e/cbRY k4k9ZguCJboUh3zr/MHJTpPazkvq9Qup/aNJPRS+u8/nYomh7K4ZqVkQSACN9+nEIdjTd7D0sTw rc0uAvK4r5VKuAa+BNEnxNsIQG5IZRb1bclEj6idNv3oJE/WTcCtOYEESck7AQyV62Anr2nQxgH AuIgrlGCGo6ZNWI215YUbb0b3FWDHav6EXLy4oKj7x6VjiDdsQRhGfgGCOiFaS4GZlfwqc1lZXv 3B01NLDpC1cG/XvQ+Av0SkPJ8K/r26oNs1RHXaCjLvMK4UNGdmMXlwzv83ub1noobKmj7QRfH7u EyMWss7vgkVA4euRoJOpcB1W0Dk4CQAfl7BY+TK6XM2hldTxFG2cifR8xINeITo+wX3xFrvhkMW HyXsC/6SbCJvrqzmh8ag== X-Google-Smtp-Source: AGHT+IFGmvrlTRJrVB5IZHQoRBZsqDSzVsYhhC0KT8URosDDz4O0ZlQ6n+lydCzN5y/3yUEEnGsBVg== X-Received: by 2002:a17:902:cf0b:b0:24c:cb60:f6f0 with SMTP id d9443c01a7336-290cb66025amr253714265ad.58.1761090432218; Tue, 21 Oct 2025 16:47:12 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246fcc2e0sm120841465ad.34.2025.10.21.16.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:11 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:57 -0700 Subject: [PATCH net-next v7 14/26] selftests/vsock: add check_result() for pass/fail counting Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-14-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 check_result() function to reuse logic for incrementing the pass/fail counters. This function will get used by different callers as we add different types of tests in future patches (namely, namespace and non-namespace tests will be called at different places, and re-use this function). Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 32 +++++++++++++++++++++--------= --- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 020796e1c31a..5368ec7b1895 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -78,6 +78,26 @@ die() { exit "${KSFT_FAIL}" } =20 +check_result() { + local rc num + + rc=3D$1 + num=3D$(( cnt_total + 1 )) + + if [[ ${rc} -eq $KSFT_PASS ]]; then + cnt_pass=3D$(( cnt_pass + 1 )) + echo "ok ${num} ${arg}" + elif [[ ${rc} -eq $KSFT_SKIP ]]; then + cnt_skip=3D$(( cnt_skip + 1 )) + echo "ok ${num} ${arg} # SKIP" + elif [[ ${rc} -eq $KSFT_FAIL ]]; then + cnt_fail=3D$(( cnt_fail + 1 )) + echo "not ok ${num} ${arg} # exit=3D$rc" + fi + + cnt_total=3D$(( cnt_total + 1 )) +} + vm_ssh() { ssh -q -o UserKnownHostsFile=3D/dev/null -p ${SSH_HOST_PORT} localhost "$= @" return $? @@ -523,17 +543,7 @@ cnt_total=3D0 for arg in "${ARGS[@]}"; do run_test "${arg}" rc=3D$? - if [[ ${rc} -eq $KSFT_PASS ]]; then - cnt_pass=3D$(( cnt_pass + 1 )) - echo "ok ${cnt_total} ${arg}" - elif [[ ${rc} -eq $KSFT_SKIP ]]; then - cnt_skip=3D$(( cnt_skip + 1 )) - echo "ok ${cnt_total} ${arg} # SKIP" - elif [[ ${rc} -eq $KSFT_FAIL ]]; then - cnt_fail=3D$(( cnt_fail + 1 )) - echo "not ok ${cnt_total} ${arg} # exit=3D$rc" - fi - cnt_total=3D$(( cnt_total + 1 )) + check_result ${rc} done =20 terminate_pidfiles "${pidfile}" --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 BD6482EBB9B for ; Tue, 21 Oct 2025 23:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090439; cv=none; b=ev4GpKPRvzwSWR11zeL/zmMOKDZl8IPxcIOSs3flXfdqY9RjnY1LzNx+SR8E7mz4X6eXihXv2j1j/fHlENUpdISpfrdv12Gq7ypiaLEMuVRaneKio10j3nEtsJo5toFpOFjcN27QQHaWRh/Uiuvbz5Z6Og9iLK4QNZDRChvSY+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090439; c=relaxed/simple; bh=BO9LQWlKtI1shvhDlqPu16W9qVY6XwRMkI/EUMrjZE0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GGvAhjiSRjx7Swk9HVb57zPpFYfQ4dyuxk/I6wPlkJjUvgZ2fII7o2nJnqIhNfxRyOrWMwsKIhQQ9Gte6k1Ixb3NRzOnWeTotXov7ZhVnNXR/0csrxmHhVpDuYnYVBQkX2Reo9a8iDigGw43E8Sv7XMpB7uhus/uV5ZtVvO8veQ= 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=P7Wl0tIy; arc=none smtp.client-ip=209.85.214.182 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="P7Wl0tIy" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-290dc630a07so33209345ad.1 for ; Tue, 21 Oct 2025 16:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090433; x=1761695233; 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=uUo2ea9cpuDIObzkB+5zIj/xuLOHXIXFOy7ynypiC8o=; b=P7Wl0tIy0xZg5AkLjFTiA3CCE8IS61M2SuZhBvxwtKbZHQbOnRVMfUyHuwICv33eee akIrPGh0t4mp0Xes6zl0bKGgR2cpgBhDY6fL7hNd+Voua35NTWu1+S/V2bzljT+FT29E FeOliG/2dYsgTJY1yCZ9hO/mdTpJ6X7i1tYTYMIVCMcluI6XFIKPzwXaVUdbztem50qj JHxTcLMi/ljpqwovfLP//bjxGHzjx9/V+RlLSeZzOQAWxdYfrs6oDFrqfW5O7LNQDrxP Hxwdad5fu+M7FIwd5H6SefRAJpL3AYRY0A+iUeHbOCoV6tUcPA7fhWjD8F4CQQIcX//K bVgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090433; x=1761695233; 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=uUo2ea9cpuDIObzkB+5zIj/xuLOHXIXFOy7ynypiC8o=; b=rNiPu9ppgq1TX1yQ+hmvs6pbtqIjvzmmHTxeyuzeACV1zCeo1sbDA2YVhtBFoE5CcD /K66Kmjx/dV5YH6sznuTOR37/8OdrPtP8UdXmAQMlZrJzEYpw0tMY1gkGwa/7rbRjj3r Fs3S70bP585X7ELcK8ENz1PWM0zxAcUsYM5uaFrTr6mvdXjP3wvDl7NArW00adrvT/0P /RDYO/GLGnzzl4DZv0g8cB7v3LJI5CIcIDNkCkh+vWy5uY9HRA29V2Mcl3yZIwEpqrdG 3s1+kKaiYBVGZh6viG9h7LJAueY3REPPys00Ee71P2i4qs4TJuarxPYmx3QFz2NLxmlo 4U8w== X-Forwarded-Encrypted: i=1; AJvYcCXSKf0d28bKEag5fBtsQcCMvmgWf92Hysy4kscRChGW5G4Dl16wxcP5rm2jQ7r3i2QpLhP8F3AkILHvzkU=@vger.kernel.org X-Gm-Message-State: AOJu0YyDlQB+ybt4hePxFegg/3MkdDv2zf8Wk7YwQmU+UDBeoXN5IMCg FGM1j6rknXMSEtBrDL0QbIjp1tFgPc536yRs6oNcPqELFb+EO0HkqN3H X-Gm-Gg: ASbGncu8OIWXNI0tocn2uohS7gWcRB/x3VESh0kLXQomL2oGBDWtscKUqNH3t7py9wK vZLB1e5UUfFatkUlwPwdeZS7Q1H59QF4AKz9mpRPrTtQZ0LsQ+GiS/kqG7EFwo//iBIYfGznH7L NIYHZF1sbC0SVMKhSchSMGiBUZ0+QC/nXPcHBAaCogrANXbRCQjNZuC/2/fbkOv7eAlGi+vAB9p xpooYMm9phlBDYihYlQ4zaek415zMhCZAjBg1kseaDpkLJhQSvzzbSLDgL2sjCV+28PI+YArFFT oWgAuJoMZdgMnkgdVonorl0gIJnQ4LcU8oDNWCSxLhGWXSWbv35O1EgFqMQgRhq433+8e27wTvJ phL9E20GlEvDN53pwRnBHflqVxDbBzBh8JVCxOFsV0mvedM7FpHY16qhfvrmtb3/oTxcHlqr6fA == X-Google-Smtp-Source: AGHT+IG4mF21y9b4ILzi1VUa6/N8UQb6jbaApizlergIx98zJ8IQeCKiZxAt0HtWfKk/EMQPlOy3Uw== X-Received: by 2002:a17:902:e944:b0:290:b14c:4f36 with SMTP id d9443c01a7336-290cba4edaemr218306105ad.31.1761090433298; Tue, 21 Oct 2025 16:47:13 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6a813d4766sm9627762a12.5.2025.10.21.16.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:13 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:58 -0700 Subject: [PATCH net-next v7 15/26] selftests/vsock: identify and execute tests that can re-use VM Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-15-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 In preparation for future patches that introduce tests that cannot re-use the same VM, add functions to identify those that *can* re-use a VM. By continuing to re-use the same VM for these tests we can save time by avoiding the delay of booting a VM for every test. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 63 ++++++++++++++++++++++++++---= ---- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 5368ec7b1895..4ee77e6570e8 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -45,6 +45,8 @@ readonly TEST_DESCS=3D( "Run vsock_test using the loopback transport in the VM." ) =20 +readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) + VERBOSE=3D0 =20 usage() { @@ -454,7 +456,44 @@ test_vm_loopback() { return "${KSFT_PASS}" } =20 -run_test() { +shared_vm_test() { + local tname + + tname=3D"${1}" + + for testname in "${USE_SHARED_VM[@]}"; do + if [[ "${tname}" =3D=3D "${testname}" ]]; then + return 0 + fi + done + + return 1 +} + +shared_vm_tests_requested() { + for arg in "$@"; do + if shared_vm_test "${arg}"; then + return 0 + fi + done + + return 1 +} + +run_shared_vm_tests() { + local arg + + for arg in "$@"; do + if ! shared_vm_test "${arg}"; then + continue + fi + + run_shared_vm_test "${arg}" + check_result $? + done +} + +run_shared_vm_test() { local host_oops_cnt_before local host_warn_cnt_before local vm_oops_cnt_before @@ -530,23 +569,21 @@ handle_build =20 echo "1..${#ARGS[@]}" =20 -log_host "Booting up VM" -pidfile=3D"$(mktemp -u $PIDFILE_TEMPLATE)" -vm_start "${pidfile}" -vm_wait_for_ssh -log_host "VM booted up" - cnt_pass=3D0 cnt_fail=3D0 cnt_skip=3D0 cnt_total=3D0 -for arg in "${ARGS[@]}"; do - run_test "${arg}" - rc=3D$? - check_result ${rc} -done =20 -terminate_pidfiles "${pidfile}" +if shared_vm_tests_requested "${ARGS[@]}"; then + log_host "Booting up VM" + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + vm_start "${pidfile}" + vm_wait_for_ssh + log_host "VM booted up" + + run_shared_vm_tests "${ARGS[@]}" + terminate_pidfiles "${pidfile}" +fi =20 echo "SUMMARY: PASS=3D${cnt_pass} SKIP=3D${cnt_skip} FAIL=3D${cnt_fail}" echo "Log: ${LOG}" --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 CF8462EC0A9 for ; Tue, 21 Oct 2025 23:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090440; cv=none; b=Rj1ucUwCLINfqLYl+m9wJUS80atTtNqhchbjGHR6iEOFBCtMZk2KrqGtG5mlngy87FNT7YYJUQbMoFfjsKgNYnhhDOk3EqwSAzZm2qcOBubbabXvRJISk3XrkD0vMTNkeoSpGldC/Gu3ip3QoDSPpr6BjTXAM5ZbQBS5DXHScoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090440; c=relaxed/simple; bh=X9WzUQups8TkdsWmkHEfnPyp3k1TVWabO4OwH0YlSZ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nmB84i7EmUKHsrcilte9tXZc4PJUOyUsM+7+nwlS1CHrvCE4wXV81gDy9Dgt+8tg949+OSoO0fpUECVUHiQpzeNzMW74u0vj6J3nmmDtFGXWQ+zwcxTp1kTKuI0nn8edqzashcFroKb0PPnmY1IEydqNRdvCAG4t9LQLTJJ1WDg= 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=H92IHcDq; arc=none smtp.client-ip=209.85.215.182 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="H92IHcDq" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-b5526b7c54eso3990744a12.0 for ; Tue, 21 Oct 2025 16:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090434; x=1761695234; 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=ExL6guYlGMpC9HoFsJPCjZr8NPSDth7dE4rzR6CctFc=; b=H92IHcDqAOBl+0N4MTZ+rK0vKqOC/cVUE2BVySlhzWIYtSKBRbnZLDQZztI0Nw2Ycp i7Md4C8ArGNcoGruR8l5xxve9Ak7vuSKxxVuOHriYtweHZgLp5spVyDheuCxj/e0UbLS FLLg96sJIAne/k0FFHiP3y+ExhV1V0Fr2P2cvoWH0fEkkcnNsTReFskJYCmgcUGuMuOx LZzAW1Xxwkzg2o4jhAxpUOaWK59ghe/JDPr/SiCmRF6esklRVVs0jXc6Bdj3XJN6yXti 2lmNVsc8eTF2zHXqG9BPIYBnaZtVcKyWKVZdT8bUvVSLCh+Bi35gsnEnHuLLbi+AeK8k 0QRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090434; x=1761695234; 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=ExL6guYlGMpC9HoFsJPCjZr8NPSDth7dE4rzR6CctFc=; b=Tmmayk1FcLVsNhOqzr3jSD6eQGHDKdAVnjcm0KdW/z3xpY8twQKNytzD0/+iya7eaB WZaK/KzTkmDvYa+FQMlw4oBmNRxs1jo4LemNFFcdMWgYE79JnlV4b8PLLePNcN0FDlB7 O8N+jz+4nTv8WTTfrPTQXa6Kct74DjrJCUUFEfLHW0N7Vs1AspPLnZh9mXMAWwHMZg90 uo6H0YZ026bmRgV/y/iretf2K6Q0MeXnBb/cp0OvModnGxccZDKaGj7uTY/6XPsPdmFD HtrZ/bDIeGQxsBupn+b2Y4P9xk6Lir8F1HRI/YaXrk3k8YGYvbwUTBn5n6Zoo7QoONtB SYhQ== X-Forwarded-Encrypted: i=1; AJvYcCU4uuE3qaYcM6aplO1QY2YlmAXtD9OALGdTMwQNadSzQREdx8pKy33eAfT+xbxLm4xOQPSK5/wOYaKAl/U=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1Dk3g5q3pspwGjD9kD4rUtm1dUKDuRDuePVQ1mBf4CUVhRAXH Q1StIQzOrTbTJjSzpCb6nDbQAX1sxIDidMiupZa6iq657+C9+ImlULXS X-Gm-Gg: ASbGncsM9L9CSIHWsDfN+/eWXR0JWwFX0VGSwB1JoegWRJl5YUIVg/NbNcHmsLmd833 sryhr+hmCJgJcWljoHCTMUerxww3DHR7WZxQUtzeSTYQM5zGIXChpf0piz5vkYHvLTdPCRyx++d +Um44IcGd1dcm3Td44aYIieG+2AQKsXuGM4eoGUr8bIP5RNCDhd245ssczPFwMoRKdlHTSCglo4 p31NkXd3YKFdclteh1ImjElEsRjkmcjm8ZivNTJUCuchTOLYc7ZXcxMuHGzPjIxqNrFGe093CNb aXu6V2eQV2Vd2r25hwa6CtxLpiTzNfv4OXvXkh0zMFTJXYry+jmpHwGcdOP0DURpfrGskzPTXAj BR3DMYbtAyvTeTuJWsaVNyqYdtFCJwNlqFcu79t3dC+oMOPyqa1//ijWlmbLQcCjHWPINl9OH X-Google-Smtp-Source: AGHT+IGFjlVJaAVI5l1l9XcDArSqr800gCJXUHbkf8qJCt41RTFarYvpfL88FKlbpibTKt7cQQNqLw== X-Received: by 2002:a17:902:f548:b0:276:76e1:2e84 with SMTP id d9443c01a7336-290c9c8941dmr231390815ad.3.1761090434188; Tue, 21 Oct 2025 16:47:14 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292471fdcc1sm120666255ad.82.2025.10.21.16.47.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:13 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:46:59 -0700 Subject: [PATCH net-next v7 16/26] selftests/vsock: add namespace initialization function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-16-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 functions for initializing namespaces with the different vsock NS modes. Callers can use add_namespaces() and del_namespaces() to create namespaces global0, global1, local0, and local1. The init_namespaces() function initializes global0, local0, etc... with their respective vsock NS mode. This function is separate so that tests that depend on this initialization can use it, while other tests that want to test the initialization interface itself can start with a clean slate by omitting this call. This patch is in preparation for later namespace tests. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 40 +++++++++++++++++++++++++++++= ++++ 1 file changed, 40 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 4ee77e6570e8..914d7c873ad9 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -46,6 +46,7 @@ readonly TEST_DESCS=3D( ) =20 readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) +readonly NS_MODES=3D("local" "global") =20 VERBOSE=3D0 =20 @@ -100,6 +101,45 @@ check_result() { cnt_total=3D$(( cnt_total + 1 )) } =20 +add_namespaces() { + # add namespaces local0, local1, global0, and global1 + for mode in "${NS_MODES[@]}"; do + ip netns add "${mode}0" 2>/dev/null + ip netns add "${mode}1" 2>/dev/null + done +} + +init_namespaces() { + for mode in "${NS_MODES[@]}"; do + ns_set_mode "${mode}0" "${mode}" + ns_set_mode "${mode}1" "${mode}" + + log_host "set ns ${mode}0 to mode ${mode}" + log_host "set ns ${mode}1 to mode ${mode}" + + # we need lo for qemu port forwarding + ip netns exec "${mode}0" ip link set dev lo up + ip netns exec "${mode}1" ip link set dev lo up + done +} + +del_namespaces() { + for mode in "${NS_MODES[@]}"; do + ip netns del "${mode}0" &>/dev/null + ip netns del "${mode}1" &>/dev/null + log_host "removed ns ${mode}0" + log_host "removed ns ${mode}1" + done +} + +ns_set_mode() { + local ns=3D$1 + local mode=3D$2 + + echo "${mode}" | ip netns exec "${ns}" \ + tee /proc/sys/net/vsock/ns_mode &>/dev/null +} + vm_ssh() { ssh -q -o UserKnownHostsFile=3D/dev/null -p ${SSH_HOST_PORT} localhost "$= @" return $? --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 0FEFB2EFDA6 for ; Tue, 21 Oct 2025 23:47:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090442; cv=none; b=aKdQ2e3Vn9dv2warWzADapOET6P9RiFcEGV1GaSedncg25+sfHABqCdDd6IFHuGnuE7DjvajTrk48xFxnz+/XLAhb7VCbHoPFhcocBXpT/WTARbHRPxvit224hL4eGO4xJtXHkzknqCQZabBcDyHE963A7b7G6vHr56BgNkIbHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090442; c=relaxed/simple; bh=MF/czfrq9R+gzUXq3nakRInrzOwnmvgXgQyREpFMOsQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fgrK+n3bKuc5NtMu7FPlBHZEEIw15zMr1UYLUyiTNoqqiYuf8OTZ8ITui4qPFD4Ugd4J4fH6YpBhpUes1D10RRbdwwiJNxJ144Sla8Hwvnf78SEgQpaHu33OU2aBfizt5msuy8FEmU9QBc9d6ttcEsVMTICHYfKdv5nFCZnXStQ= 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=Q+gt5wjc; arc=none smtp.client-ip=209.85.216.45 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="Q+gt5wjc" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-33bb1701ca5so5349994a91.3 for ; Tue, 21 Oct 2025 16:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090435; x=1761695235; 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=D6mUZMq9SVTZCVxtIiXitg02c6DGfDqdmAO69aX2eA4=; b=Q+gt5wjcUAWtZ1+Pa+QKWygd7P0u+N4yhjAijbU6jC2CCxufGapnDsR1Ijcr3Oi3SD ojh9jDqGB0Xnt1ExxkM7bqyKm9mi+xF830Wz1EgVDCSL/rsy/RoTL0qnEis2Y8ls1rO/ pmqxqOPscZTQEs7Z942VDGmhNBd7iw2TDBokfXWzl2kPtB1n9Es0dK2F/TxAZj72N2e+ 68M+2YfrBnwaKrYKxcwcrHHhkg9gnxyf+9GvkRuJRAoXYObbpqbFd44a3bGVhfVsfsTe AaOiI5dmeI2ucyLa0eKl9kyned47owzg3NkYy1ZHB+n3PvC0Jdy2kd/kuntVANcluzAy udrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090435; x=1761695235; 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=D6mUZMq9SVTZCVxtIiXitg02c6DGfDqdmAO69aX2eA4=; b=LljlHN67leenoaNK/JGDkVILzz4Y0SFXCBPOTL+3kEZmtnpTnzX5H/ZWaetseoXfhB 3RGbtyUw+XZaUj0AaETvnikGpnSe50+aB3oDBJwIixCE5NYMq6AQYmcPNvVydFmyyB+q 1MXJXkLMEvZ5GgRBbDU+YGb26QShdz5ApH8VCcUtyKlJCdz2df/BjDe/TufsFd7Hq+wu Pr7zcKRnVT1HOeMRgV5vjkGXyO7XMRvnEQxT5Z06l9N3QUY3YpHMBntn3aN4sMZ/rzjq eTfpK1ap0+abYwOGEa8QN5OqTU5Ku79TK/FV9R6xYJ7DzeLCHfcC6pS9Zbb3QXRKDsKg ngNA== X-Forwarded-Encrypted: i=1; AJvYcCUZCRtOmJHMHbUOyrbfuo9qJtxBLj+IPRcaa1DlCgTfQuWX8oJn/15sV3vT+H1wEC3KyLunYvJ8Nep5MfI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/3JZG4r1rdYY1BRPwBxf78AA8z6HVMSSLtaO2MTTyqKo+fT7s qUk78qSrJ9xf7rJ9yGcQIBDCCjvln+cbb5myP/np8zOT09kULKvE3mw9 X-Gm-Gg: ASbGnct/LF8f7RqFhB8CKy0Ap3+E9BvStSHvmKWJvvrcnZVLjqnhNCHKEsrRkopFOp0 +uKkUB7qib/OFuPFOAwqqxIFc2GYRnqgyabuXdfSe0vnDe0ELW/ElMF9MWslYqKb4B2KYTPQdCk zdOoxnp/uZXyM46+1a+kZoKl9DcxUaaHdVBEHyA1CikLnFcMKOo6ZBo2tmm+nP2DuZ3bmp2w+99 s53nVeeV3S/En/O7MIpUX1TS39BoIzjbyoCVxscr4DMw2fkqVtc6OZxYVLQkgkW+gskbA+001RH YGJRgicdMQoiSbLRleLlfEOAyzYJtyLHbViEw5rEV8WFfJbFs/nYdBTKqPOzXTb10Co3c+EovH4 SReUqcZQBpEHepxzDrqQs2/vf1EVXYZWGmSEzBLaCxnHekynPwmLlvHmfExjndwR5x9FZY7Wd X-Google-Smtp-Source: AGHT+IFVbMkOuOiBDnCJEvlMwLaZ7DlmhKs/V/NW1acHbQ/gNGtWZNBni32L0tz8fkkeIan2KaLV9w== X-Received: by 2002:a17:90a:d60f:b0:32e:d600:4fdb with SMTP id 98e67ed59e1d1-33bcf8e61b8mr21858888a91.18.1761090435179; Tue, 21 Oct 2025 16:47:15 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33e223e223esm711430a91.7.2025.10.21.16.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:14 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:00 -0700 Subject: [PATCH net-next v7 17/26] selftests/vsock: remove namespaces in cleanup() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-17-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 Remove the namespaces upon exiting the program in cleanup(). This is unlikely to be needed for a healthy run, but it is useful for tests that are manually killed mid-test. In that case, this patch prevents the subsequent test run from finding stale namespaces with already-write-once-locked vsock ns modes. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 914d7c873ad9..49b3dd78efad 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -145,6 +145,9 @@ vm_ssh() { return $? } =20 +cleanup() { + del_namespaces +} =20 check_args() { local found --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 DEC5025A2C2 for ; Tue, 21 Oct 2025 23:47:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090443; cv=none; b=EHi+J1cFcUaxn4Yfb7Il8SN9eCgd/DzNnauWZ5KX3JWaawz2UGn8rhqZIxXM4NnF8PgzCx/Y8TCenLNuGBPY82F7O40BMqy1h4qT7fdo7q9fCbU0SzGNxCdcL8WBJD2ZqLsQTXDROUsclA20384AipyIi4ShbA4DiinI8Be9kyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090443; c=relaxed/simple; bh=lSmQpIOx2H+wwJpTKFrN8deypuk5nLfSt39JjhPsaKs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sbvntjH5tPPLaBgwWIS88+JpifnxK9tJ1lh+/A9BTpb6YV0LY4/leCqu92RK8X9dd+ChkhD10AECTiCpcfy8FfEXUxxzNetmLPaYV5CNKv4KoI8/kaE/RYrg4gAg0jfoPdZaazzNiRQ0eHVyiILYlqqAVnP3RjXV9M0dmSO6NVM= 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=f9Kph4+0; arc=none smtp.client-ip=209.85.210.170 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="f9Kph4+0" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-796f9a8a088so5580115b3a.1 for ; Tue, 21 Oct 2025 16:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090436; x=1761695236; 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=C11MVom9GcVVigp1JH83uYh4dJ6GwBGVsbP0u+3A/D8=; b=f9Kph4+0zDcKIBxfP0+EgWXBXt+CyK8sMV/E5hmt7T3LgSiCfpUV064w/7RaIn8TfH adbMJdAhV5KTscE7C3b/PVvSLCUzaHfOhHZI1S5Y5YoZzSiBMw3k+tD82HERenF1uaZa VLtfGPecQE1mve70L7MibxDd0GU0wDAI9T+QRoO2YZRpJEmxgZM/sUyC7B+/yEsaKqiz znL1lmBQEzO92yuAdmwcVhElCRNYwi0gN2zuLJevsCevD87AXgkil5Wr8LkxM8bd6zJ3 wLiFZiSe9j6pNV39d6iTcczvLGUIbZKRKvibTz9s7KX4IYw5VjpLmB0BVZuEtrDGuIMA UpTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090436; x=1761695236; 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=C11MVom9GcVVigp1JH83uYh4dJ6GwBGVsbP0u+3A/D8=; b=Xn4GFigyZyG+WealF4Rhkpo+KLBqCSZh34PE+GL5+KkXa9JCb4cnW4xz8jq22YE5Ug YgAxPpcquIDNf4oFLCvz1ip0g47g25SDMOP+EHnqMO/1q5EBDZBNoDmzZRkHUWTE67gj ilSoI5tCyPfnYw2WFzdR+8+4ZO3WoaRGAf9578e9CgBwVyehmfZG/h55M2Dsv3FEeuxY ldZDDwC6iE5owdjKWwndXWRhd035aoaWBwtxtiwqvASEiipt4ztAWU0LT68nFCSoDbn5 uoMAFJVPNSKC56nQCwo1Ex8mcA0pfK8Eg75xuEKFTnklHLKy3HcTBE7dy237x804WGpj IfCg== X-Forwarded-Encrypted: i=1; AJvYcCUktYwXguujUMv+JHkKbLRqztZ4/oKtDhg45Xu20gRjtaxAEQpk5PWvEVn7Sc5YRwvFugX+LlFuy1xnw1A=@vger.kernel.org X-Gm-Message-State: AOJu0YzFbiaAZz9YjMTDthMrtpjOjt9QUi5qLPzmufrGwbRePDZp2rZT qNLEhWPS7/IXy5R/XRkPMYgVf08o2SzXw+OX+yEGDk/MGB8pJNbVUc7d X-Gm-Gg: ASbGnct4c6Old9HWKmIUKmnnUXqD/EyaBvrfcCS4g3Sj9QW0KBJpmtHB963jHcEMWyX 2OKwO46duvh71tsFN3SHmd1NDcLr9/7KnwJuytS0r/TY0vlwkO7iStir7V9n0U21hpp7/yowYip 2vrNt0XQdlBp0q33Kc4GzbkFRVtswINRQolnu7dH+TeANpgClD9EOAQw2WHkX/2CL4aHRAYqSqN ZkA7HYg3AxqNpEzOPWRWIcw7ILLcKFe7YWpiBExVzDkhKEzCLTXJaO74a5XhPPejn8wApM1t9kr zRJP+JpzSkzGI+KQzuLKDtqU+xpm8tSebqjb2SeRQSKyUAkNsTucSNK/sfL3HRbdXEbeAlAkjqX GjWvlf1Akrb1f7+SlTPSWYDf5NHjCaGOp9kZ7sgWptYt6uy3KC/szRrWtmqYCl4wok1R/R1kSyw == X-Google-Smtp-Source: AGHT+IFruEIphVWMplpeA2jQqUDuG27XuGu5lChapLWZrI9BuGwBvnIU/lhkYltuDcRgwCsCwNZgMg== X-Received: by 2002:a05:6a21:8881:b0:33a:86cd:1553 with SMTP id adf61e73a8af0-33a86dc7f16mr2340882637.12.1761090436048; Tue, 21 Oct 2025 16:47:16 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:74::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6cdafadb8dsm833596a12.1.2025.10.21.16.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:15 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:01 -0700 Subject: [PATCH net-next v7 18/26] selftests/vsock: prepare vm management helpers for namespaces Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-18-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 namespace support to vm management, ssh helpers, and vsock_test wrapper functions. This is in preparation for adding namespace tests that rely on SSH and spinning up VMs in different namespaces. The functions still work correctly within the init ns, though the caller must now pass "init_ns" as the requested namespace. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 102 ++++++++++++++++++++++------= ---- 1 file changed, 72 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 49b3dd78efad..e8f938419e8e 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -141,7 +141,18 @@ ns_set_mode() { } =20 vm_ssh() { - ssh -q -o UserKnownHostsFile=3D/dev/null -p ${SSH_HOST_PORT} localhost "$= @" + local ns_exec + + if [[ "${1}" =3D=3D init_ns ]]; then + ns_exec=3D"" + else + ns_exec=3D"ip netns exec ${1}" + fi + + shift + + ${ns_exec} ssh -q -o UserKnownHostsFile=3D/dev/null -p ${SSH_HOST_PORT} l= ocalhost $* + return $? } =20 @@ -252,10 +263,12 @@ terminate_pidfiles() { =20 vm_start() { local pidfile=3D$1 + local ns=3D$2 local logfile=3D/dev/null local verbose_opt=3D"" local kernel_opt=3D"" local qemu_opts=3D"" + local ns_exec=3D"" local qemu =20 qemu=3D$(command -v "${QEMU}") @@ -276,7 +289,11 @@ vm_start() { kernel_opt=3D"${KERNEL_CHECKOUT}" fi =20 - vng \ + if [[ "${ns}" !=3D "init_ns" ]]; then + ns_exec=3D"ip netns exec ${ns}" + fi + + ${ns_exec} vng \ --run \ ${kernel_opt} \ ${verbose_opt} \ @@ -291,6 +308,7 @@ vm_start() { } =20 vm_wait_for_ssh() { + local ns=3D$1 local i =20 i=3D0 @@ -298,7 +316,8 @@ vm_wait_for_ssh() { if [[ ${i} -gt ${WAIT_PERIOD_MAX} ]]; then die "Timed out waiting for guest ssh" fi - if vm_ssh -- true; then + + if vm_ssh "${ns}" -- true; then break fi i=3D$(( i + 1 )) @@ -342,28 +361,42 @@ wait_for_listener() } =20 vm_wait_for_listener() { - local port=3D$1 + local ns=3D$1 + local port=3D$2 =20 - vm_ssh <&1 | log_host rc=3D$? else - ${VSOCK_TEST} \ + ${cmd} \ --mode=3Dserver \ --peer-cid=3D"${cid}" \ --control-port=3D"${port}" 2>&1 | log_host & @@ -418,7 +457,7 @@ host_vsock_test() { return $rc fi =20 - host_wait_for_listener "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}" + host_wait_for_listener "${ns}" "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD= _MAX}" rc=3D$? fi set +o pipefail @@ -462,11 +501,11 @@ log_guest() { } =20 test_vm_server_host_client() { - if ! vm_vsock_test "server" 2 "${TEST_GUEST_PORT}"; then + if ! vm_vsock_test "init_ns" "server" 2 "${TEST_GUEST_PORT}"; then return "${KSFT_FAIL}" fi =20 - if ! host_vsock_test "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}"; then + if ! host_vsock_test "init_ns" "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PO= RT}"; then return "${KSFT_FAIL}" fi =20 @@ -474,11 +513,11 @@ test_vm_server_host_client() { } =20 test_vm_client_host_server() { - if ! host_vsock_test "server" "${VSOCK_CID}" "${TEST_HOST_PORT_LISTENER}"= ; then + if ! host_vsock_test "init_ns" "server" "${VSOCK_CID}" "${TEST_HOST_PORT_= LISTENER}"; then return "${KSFT_FAIL}" fi =20 - if ! vm_vsock_test "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}"; then + if ! vm_vsock_test "init_ns" "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}"; t= hen return "${KSFT_FAIL}" fi =20 @@ -488,11 +527,14 @@ test_vm_client_host_server() { test_vm_loopback() { local port=3D60000 # non-forwarded local port =20 - if ! vm_vsock_test "server" 1 "${port}"; then + vm_ssh "init_ns" -- modprobe vsock_loopback &> /dev/null || : + + if ! vm_vsock_test "init_ns" "server" 1 "${port}"; then return "${KSFT_FAIL}" fi =20 - if ! vm_vsock_test "127.0.0.1" 1 "${port}"; then + + if ! vm_vsock_test "init_ns" "127.0.0.1" 1 "${port}"; then return "${KSFT_FAIL}" fi =20 @@ -550,8 +592,8 @@ run_shared_vm_test() { =20 host_oops_cnt_before=3D$(dmesg | grep -c -i 'Oops') host_warn_cnt_before=3D$(dmesg --level=3Dwarn | wc -l) - vm_oops_cnt_before=3D$(vm_ssh -- dmesg | grep -c -i 'Oops') - vm_warn_cnt_before=3D$(vm_ssh -- dmesg --level=3Dwarn | wc -l) + vm_oops_cnt_before=3D$(vm_ssh "init_ns" -- dmesg | grep -c -i 'Oops') + vm_warn_cnt_before=3D$(vm_ssh "init_ns" -- dmesg --level=3Dwarn | wc -l) =20 name=3D$(echo "${1}" | awk '{ print $1 }') eval test_"${name}" @@ -569,13 +611,13 @@ run_shared_vm_test() { rc=3D$KSFT_FAIL fi =20 - vm_oops_cnt_after=3D$(vm_ssh -- dmesg | grep -i 'Oops' | wc -l) + vm_oops_cnt_after=3D$(vm_ssh "init_ns" -- dmesg | grep -i 'Oops' | wc -l) if [[ ${vm_oops_cnt_after} -gt ${vm_oops_cnt_before} ]]; then echo "FAIL: kernel oops detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 - vm_warn_cnt_after=3D$(vm_ssh -- dmesg --level=3Dwarn | wc -l) + vm_warn_cnt_after=3D$(vm_ssh "init_ns" -- dmesg --level=3Dwarn | wc -l) if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then echo "FAIL: kernel warning detected on vm" | log_host rc=3D$KSFT_FAIL @@ -620,8 +662,8 @@ cnt_total=3D0 if shared_vm_tests_requested "${ARGS[@]}"; then log_host "Booting up VM" pidfile=3D$(mktemp $PIDFILE_TEMPLATE) - vm_start "${pidfile}" - vm_wait_for_ssh + vm_start "${pidfile}" "init_ns" + vm_wait_for_ssh "init_ns" log_host "VM booted up" =20 run_shared_vm_tests "${ARGS[@]}" --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.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 613502E7637 for ; Tue, 21 Oct 2025 23:47:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090445; cv=none; b=tNj2Tksl827Bxyinh/N4xT/noLex7Qt97JwmUXHXbPk6FhvO7x4MaoalHUhmFEktP0oPGr0HUXMAZ6jAgzPBP71m62Y4fkhjYVbJSWg0pCO4lvNzcncW75m7oxgTuWe4IthADZdmZ61ND/KcppirzFX2HiDDAFKd5gGomOXgo80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090445; c=relaxed/simple; bh=Vq3JxLDexMAZpBZBOMz7RcnedkE0owAELSAnlUsmBpE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jdfm/UmHN5pMRb6bLQPpiF61AUYi95rpHA6KP3g+d0SNzeAraD0YWjrUB9TbOtzNS4N12qqB9YPU/37yc7L6DWkvSb1CMPrqIgyOTluhuTaOxvk54utoTzxVN8v38DOxGeTFSa4dnRjdInlIJKq1EX9ayRGdp8XADaPdd59RTaQ= 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=acBU5El1; arc=none smtp.client-ip=209.85.215.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="acBU5El1" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b4755f37c3eso5146182a12.3 for ; Tue, 21 Oct 2025 16:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090437; x=1761695237; 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=0ziglltQonD40PF3NaoQP9RaIb5nYxZqEFCDNXD/J6U=; b=acBU5El1XUnF5ahrQ6RY667sgPxLgA4ZdJwjIRnfSKapdKibrM29eTmpmAJGeNqGam Vcpo5EVSM/PpE88hHnTPEhkCDnqRwI4cGqC5L+itv6PdAMBrIWmxYm6c3+oEBeygAmy6 fu5bI3vqAMWu3xJuEIO0Rhb3GHPzv9pf+BzPM1LR40a9FHLJsf75hxbid5OouU2WBszC 1uLIzC2hXnfIslq5jjHwcFSVb2CGnHOC6lJ6DmmhpmukPvJhLqyOQ/Ki5YffYmkwXBwl IVfJNKxJtnLyzFbeScTbyoOKiaWotKOmkrnlWFw7QJU8JyZV0addM1hna8phjUUpizMN 04Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090437; x=1761695237; 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=0ziglltQonD40PF3NaoQP9RaIb5nYxZqEFCDNXD/J6U=; b=GNFWfbn7fTGkkdxlgJsRFVVG+q5r9tRbIfG4rJ5j5i2mj1KrPgQ1fg00t5OcrIgTEg 70H3BrUy3ge0nk0WYD2GvupGyT7xIMDe2VGL0Mz20kqtDs95oy2TnczNG7JIut652OXq Wt1Ko8NFOFL3u3AKFvWCaeaMLTgL3CK1Vs7kCb7j2843La6bePQtY1hveJx6MqrC6eaw Pe9dXj6ykncH4RHfoHqVmL5H2Jqs4rHyg05Qsn9QMoVXd9pM2KDzGcJt88pkQxtoOvHW 4mT64LhRcIgiTwIUM+NjIM1OJ3YcYraLBS/ka5gR3QncFUs01htVY/sSUb7y4LTAfIA4 1jkA== X-Forwarded-Encrypted: i=1; AJvYcCUgY7mjLNLhJaZ5oN2HTzmWO5nW/QL5y3sHXjS00mcp2Eufg/syE+kGWuJyo5lLABSVZuNFyPrOzb8iWlo=@vger.kernel.org X-Gm-Message-State: AOJu0Yza+1ZcUD0puf8wam3b/VJdFLSLgvFjkqamQqJyiRpQUT3gI3Ss lcnKp+aAZipo5mJSoOL3HO35xiKqkvv9hpLOt0OQpYR+hq/cs0u4mESx X-Gm-Gg: ASbGncvjLs4WWmPENU92qtaz8U2k7Rl66UfeD3hB7c1DSgB5TjgH/u5YmL/+7iX4GmH y5Fbqrohx6BU7jHS7ZviMAYDN3zeC4HD7YAvbKivSV4aTaMdI5xUBF7SQNOLAV2W6VWzG6FxNpI Wdu5aoVDJ9gBxTyEV5OhPNxk/jPzE5geehe1/EZpqOVJ/0566l6Lq8ZuM+9N4oIJ8L3ynU70tnp zvPcqyWM/UaULQBs5IarEiBdXsNjeDY12TCYlIa1FWT8AEhOb6ItI7Wp6fv657vcbZB02eol7KP HAqdD3wcBfps3D3oZtuFxDspA+M5ipxMIAq94I0TdkZTEfsOhUciD+J7DwQO4jYgn+q9joVqCjh 9e6KvuNybLG0eIPDTCdbLbU7UByu8nZWIgdmX8SZN1SqxOAzf6fyXFcNLcKz3SJygETDPg3Vjnb IwS1aXSzdv X-Google-Smtp-Source: AGHT+IG5dGgoFfjLOrDybopHtR5kmquL2RmRYL/ZwgLqL0f5q8OPShyxosfyQ4g18ky0R7BE1MkTfw== X-Received: by 2002:a17:902:e84b:b0:290:c0ed:de42 with SMTP id d9443c01a7336-290caf8582emr300060005ad.36.1761090436967; Tue, 21 Oct 2025 16:47:16 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292471fdd10sm120304085ad.83.2025.10.21.16.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:16 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:02 -0700 Subject: [PATCH net-next v7 19/26] selftests/vsock: add BUILD=0 definition Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-19-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 definition for BUILD and initialize it to zero. This avoids 'bash -u vmtest.sh` from throwing 'unbound variable' when BUILD is not set to 1 and is later checked for its value. Fixes: a4a65c6fe08b ("selftests/vsock: add initial vmtest.sh for vsock") Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index e8f938419e8e..9afe8177167e 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -626,6 +626,7 @@ run_shared_vm_test() { return "${rc}" } =20 +BUILD=3D0 QEMU=3D"qemu-system-$(uname -m)" =20 while getopts :hvsq:b o --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 10F732F1FDE for ; Tue, 21 Oct 2025 23:47:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090444; cv=none; b=Y+hmFSI9/TEI1GIHOmZIhIdSNhH0Q2GASJn23s/QevyVVn4mYlea7oiPee3HfX1JqRL+R1x9DrhN1Dd6RjD+EREWLlPojG046y/fR7ghR9Nyw0iUaqrbqeXbdzgvP4EPUiYgvhN/HWDXVVW1JWLuk90cY6W1GJ/K4UTItIROr3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090444; c=relaxed/simple; bh=8bOFcVzDZsUwxKg5ikgK5NJUIukOBjSEIefCk8ZnB5E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jA6wWW61QpfAhFVPC4mOen+9h3mhgyEt0m9i5F9Q+ngKqTtAQJ0x8FECgeF1wwX/Cp1PshQi22XUdia6iucfGWtq331lq123dr6n5KGSr7K7SqjSw11Pl0XSQkuVXoVOtMk5+KmdETI1xL+WnT4vq+eUIc6oHdGf3wvuEkJRdT0= 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=HvLpxZ/o; arc=none smtp.client-ip=209.85.210.176 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="HvLpxZ/o" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-781db5068b8so4764445b3a.0 for ; Tue, 21 Oct 2025 16:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090438; x=1761695238; 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=z4OFfgfpg2zuYVB97qQ4nYxxE2fA0slLU1vqJ2CVR4E=; b=HvLpxZ/oyS6/bJuVCK52e2NPKHQGvQmmYqh8/9b4AxDZ2YYK7TrE1CWlHE2reLMhun cX/LAKQcBHti7pwdZlU2FD0gdKfHtaXB2/dH+bWAJ4MFzeB102phEzkQ6vFJs+IXukjt uMwjUwdEzoFySh0OWznGnIfPjO/pqtP9StiZeoeJ0Uf0iCnRhDj9DqPV1+T/UUvvEuyO Pmr8qsSx87aT0QJixLbYmLlOxCMOosVPRb/C1R4u2p9wuqb0VgI9GgAsvUgodrgqHhvu MXACr2Hzlwox7//EKMFlLTUtAca7vOtHRPKdiKoG7me4IQnv5UN75f0ErpeJLP7Xzfkq jXDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090438; x=1761695238; 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=z4OFfgfpg2zuYVB97qQ4nYxxE2fA0slLU1vqJ2CVR4E=; b=t2DSdXAHpIt2G8mA5HPRBnU2bMr0N9fbuYEPd05Yly/uHIJ71UlGHSXloJ+Pc28NJw o+qnXu83RkgJT52P6XX3ZohCdrE9jxhnJOdUWJ7nOIEhcF9nHeQbKLepFMXW0CO1rp0g WpuGe3CB1BPH9A6yIoY5BHdkdoUVNWZDzjFfi4NtwqqxMAnpcnjSLNxwYOOu8y6CcChY 1aOhkHqc++Lh3MU6K54bkIVuH7YeSQlLlQ7sm1eIyTWluL7Sv2EA92ADOkpvG3N8PNu+ E5t+IrwHf7Kb3sGs7/PtN7ru9j0ySGYvtUzqsZjUVz+JRTHgtrcNbbmV/iyLr+FEJFlM swiw== X-Forwarded-Encrypted: i=1; AJvYcCUBsPXY2+EDR19W2ziNOvjdugvAEXkZsbgpWBQa3p2xZpNBskWQM8H0OnDDjOfbj7IuZhAOHFsuY3qsOn0=@vger.kernel.org X-Gm-Message-State: AOJu0YzkujDbPPWh0Sg7ZoKfPGL1tFeau50ib+OAO0MbMucaH2IPg8M5 Ej03iVIAksOsgrxLVhtRMT2bPW5JkQHyjaNdwg0PLh138kqXMBTZ0Qmv X-Gm-Gg: ASbGnctNsoHaPRPYjnu3JPaGhO7tPGyBX3AGXQXSRpbV7aPJsyKjRorMQDhonYk/4ax cltqDc8x3/evDh1OuHsVWHiKDHV9VSTVtJIOT1bNm8dRQmaP43wL8cdgHlZ6JlPovvF+epHv/4k TSvTDIDk6BE/aJ0Un0Bu6mGXA7TGV0bbbco2qgkgucqddG5xsn5xJzT9q01UxJ8p4zz4Rzb1ajD d/h1wUKT8s1GjKmIjlQuKRtF/5W4+E/jb4RbzuOILYkNYJoWzKKLF/3OHF5bM+oVYQMxKw0Huh0 7jSa4qERpI5/dEv1ei41Gmi7qsKqgfYkVRG3ofevagDT4l0tr5W302VA6xUxFxvWj+xR4ZBEWiD WUQtex5gsqsBnKokTNfZrqxrZVOR5miFp+MW7WMEZXHwGcQFfwVqPfRadWztrKZuYZW+Qdpdz0L PaVji/fPuI X-Google-Smtp-Source: AGHT+IFkhGJRP2dLAASLtzToAAHgpD36H89TPJABTWvg0NGgrSHeo1CXKroyw7GJKTzS0N8BFk4Bbg== X-Received: by 2002:a05:6a20:42a3:b0:334:a832:91a5 with SMTP id adf61e73a8af0-334a862939dmr20305416637.44.1761090437936; Tue, 21 Oct 2025 16:47:17 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6a76b33bf3sm11369376a12.19.2025.10.21.16.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:17 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:03 -0700 Subject: [PATCH net-next v7 20/26] selftests/vsock: avoid false-positives when checking dmesg Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-20-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 Sometimes VMs will have some intermittent dmesg warnings that are unrelated to vsock. Change the dmesg parsing to filter on strings containing 'vsock' to avoid false positive failures that are unrelated to vsock. The downside is that it is possible for some vsock related warnings to not contain the substring 'vsock', so those will be missed. Fixes: a4a65c6fe08b ("selftests/vsock: add initial vmtest.sh for vsock") Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 9afe8177167e..b129976e27fc 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -591,9 +591,9 @@ run_shared_vm_test() { local rc =20 host_oops_cnt_before=3D$(dmesg | grep -c -i 'Oops') - host_warn_cnt_before=3D$(dmesg --level=3Dwarn | wc -l) + host_warn_cnt_before=3D$(dmesg --level=3Dwarn | grep -c -i 'vsock') vm_oops_cnt_before=3D$(vm_ssh "init_ns" -- dmesg | grep -c -i 'Oops') - vm_warn_cnt_before=3D$(vm_ssh "init_ns" -- dmesg --level=3Dwarn | wc -l) + vm_warn_cnt_before=3D$(vm_ssh "init_ns" -- dmesg --level=3Dwarn | grep -c= -i 'vsock') =20 name=3D$(echo "${1}" | awk '{ print $1 }') eval test_"${name}" @@ -605,7 +605,7 @@ run_shared_vm_test() { rc=3D$KSFT_FAIL fi =20 - host_warn_cnt_after=3D$(dmesg --level=3Dwarn | wc -l) + host_warn_cnt_after=3D$(dmesg --level=3Dwarn | grep -c -i vsock) if [[ ${host_warn_cnt_after} -gt ${host_warn_cnt_before} ]]; then echo "FAIL: kernel warning detected on host" | log_host rc=3D$KSFT_FAIL @@ -617,7 +617,7 @@ run_shared_vm_test() { rc=3D$KSFT_FAIL fi =20 - vm_warn_cnt_after=3D$(vm_ssh "init_ns" -- dmesg --level=3Dwarn | wc -l) + vm_warn_cnt_after=3D$(vm_ssh "init_ns" -- dmesg --level=3Dwarn | grep -c = -i vsock) if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then echo "FAIL: kernel warning detected on vm" | log_host rc=3D$KSFT_FAIL --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 9C37B2F39C2 for ; Tue, 21 Oct 2025 23:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090447; cv=none; b=spwINHFiyCXUoY6qMST7QOfcEIQmyTEP5BqG/ybc970IJuX71D5Yool43MhJa4a3LW/dcOzX0gvUdQsIX+NORVD9Db1ENyK7athM97vinSoOHsEvr+QtFKaW57kDPrGlXkkr+/WRy1k200X54wmcvPaQch6pDv+NfBfXW3XVK5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090447; c=relaxed/simple; bh=tkMGIMswqfAEZyDr4Cl0t0E9LZdA/zAbPpZnx5/so6s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dSyDUVEtAGduhm0aPmKgZNYwsOjbiXRr+5H73REtu2v6XYA7RUBi9pR8DIMyfwNAziANtpW0fL8QtqrOcvigugt6iKSypzBPkIbAGR4nLz/gbQTflJrPsU4qtMOEyBppvLFvfJjXh1LSxLGYbcxwA5DWbmMUvbMlzmTarzDBKXE= 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=d1Bkbsg0; arc=none smtp.client-ip=209.85.216.48 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="d1Bkbsg0" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-33c4252c3c5so4406179a91.0 for ; Tue, 21 Oct 2025 16:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090439; x=1761695239; 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=MUSawlw3KS8OKu+neqC1xDDribwG4GyG+WJRI7AbHRY=; b=d1Bkbsg0KhrDQf0d4BSBKXEcgdAB5m1jsXNlG8+h7rM+KytqQx01sJEyhK5m9h62yM 7kjrR7TpGTC16SyrHdXYc41vjLbSx621FxFVTfF3EmcuBIagtatVVRfpcyArwpru/NLq PVf5scU26XLWGQ/h7ZIs4jvYzOSj49OqmIOFkJFzNgT6HE4XG9PR0alQmW1niDUxO5Qf fLdv0CjLdgA+gse/uNPCW3gF5daIRttSD2sNkHXEbPj6wSJjbnsHbEfLH0XvxOYEEgD4 uRPkSx+vb9P9r+aGIlGEq1ZiC2bqkNELwTwMPz6oPQCLbRALUtRVoMm8oO7407IrNufs 7iVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090439; x=1761695239; 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=MUSawlw3KS8OKu+neqC1xDDribwG4GyG+WJRI7AbHRY=; b=hLhqnsUeoaqJeLjQI1rL+yfYaBI2iqqsX94kNyKz1bXE3aWCReC60baSP7ZmMxGWyX Tl0ez53pIPKNHhmR4iCAehFMk+xy4Ai1DCOR654lccioU55K029JWckPAmk3nDiLPji6 /51LhZGmeMmQntFCx2mRZlvCA10OJbhAAIuffd9hF2powlcje5TaNrlni1oZAhFkuPns KJ5Dl4fjYhKrVLc+Z9lDDfZ+sTR9I8QliWyimkJIa4cx5glQVHr1YcsQxfNXxxpDEcEu YOlkqNF5iaggcX2BQfwAkW3JjekZcWL/36wKikLWhXeFqj7c22W083kr6pTyF8LF9m0E 2Qjw== X-Forwarded-Encrypted: i=1; AJvYcCW0b5BDeaTNM7QgmPjoPeKhHoh/B3FZodl5SNit6NKAAPorMc8Rg/ru1AreWM1J42DcmPB0TcDRDQeVeFM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1u3ajN1SmSElVjSJKEz5EGRgRA9EAfsW4Vv2VVpb6pjWXYjR/ XeTnodXRJ7EFIyEQravilrWhZx1lKAzpOmH6aB6h5oHkV3CXgSAbv410 X-Gm-Gg: ASbGncu9sgG+GrgI9JtIVVgJgtGK5ISfKlWJpIJn+aID9lpWW4h5DNBqOvXRyIxzivu YGsrvZja9WkHe/ZYUMisJfGSX6Rwb1m1gqrL8XnFFHqwKp4Bd1TlRbeExOihIxTKmADrTHr+zjV eTX/v/WH6FIURLZ1a3CGHOoruuBdvg++eCrthaka7gyDd2+3qmf/UcwbZYQ0sBApkgaT8UVaccs f45O2ml0dpuSBOoJJVPs/2UvhfCAN5Oh40Iqa+62jJqFbruBhopS9LOXWoE4Id6ooTAXguF2mas 2+XKjSSUOPmkOukYwhnLX7lwfAFPJ/+iQ70ecdD4YJ9wtyKB8QRSn5SJYne2SWPjM4Xt0L2BLHR j8SKGjQPVlcVGC1crYCHKC12ALVaAW7cynA9u87y5+VWeq5Wa4GTUSJV6bADzmoWi+PD0w9A5Rx ZyRJSrbW21 X-Google-Smtp-Source: AGHT+IFovlERrPh42B70YTWXTmz2rKyfI2eDHBwzjrpjJJS/U4lT6i41uck3W1mtdr1D6DfW2bDl7g== X-Received: by 2002:a17:90b:2d83:b0:32e:5b07:15dd with SMTP id 98e67ed59e1d1-33bcf8628demr21493620a91.1.1761090438795; Tue, 21 Oct 2025 16:47:18 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:72::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a22ff34b8bsm12570317b3a.22.2025.10.21.16.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:18 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:04 -0700 Subject: [PATCH net-next v7 21/26] selftests/vsock: add tests for proc sys vsock ns_mode Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-21-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 tests for the /proc/sys/net/vsock/ns_mode interface. Namely, that it accepts "global" and "local" strings and enforces a write-once policy. Start a convention of commenting the test name over the test description. Add test name comments over test descriptions that existed before this convention. Add a check_netns() function that checks if the test requires namespaces and if the current kernel supports namespaces. Skip tests that require namespaces if the system does not have namespace support. This patch is the first to add tests that do *not* re-use the same shared VM. For that reason, it adds a run_tests() function to run these tests and filter out the shared VM tests. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 99 +++++++++++++++++++++++++++++= +++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index b129976e27fc..4defadad5701 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -38,11 +38,28 @@ readonly KERNEL_CMDLINE=3D"\ virtme.ssh virtme_ssh_channel=3Dtcp virtme_ssh_user=3D$USER \ " readonly LOG=3D$(mktemp /tmp/vsock_vmtest_XXXX.log) -readonly TEST_NAMES=3D(vm_server_host_client vm_client_host_server vm_loop= back) +readonly TEST_NAMES=3D( + vm_server_host_client + vm_client_host_server + vm_loopback + ns_host_vsock_ns_mode_ok + ns_host_vsock_ns_mode_write_once_ok +) readonly TEST_DESCS=3D( + # vm_server_host_client "Run vsock_test in server mode on the VM and in client mode on the host." + + # vm_client_host_server "Run vsock_test in client mode on the VM and in server mode on the host." + + # vm_loopback "Run vsock_test using the loopback transport in the VM." + + # ns_host_vsock_ns_mode_ok + "Check /proc/sys/net/vsock/ns_mode strings on the host." + + # ns_host_vsock_ns_mode_write_once_ok + "Check /proc/sys/net/vsock/ns_mode is write-once on the host." ) =20 readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) @@ -201,6 +218,20 @@ check_deps() { fi } =20 +check_netns() { + local tname=3D$1 + + # If the test requires NS support, check if NS support exists + # using /proc/self/ns + if [[ "${tname}" =3D~ ^ns_ ]] && + [[ ! -e /proc/self/ns ]]; then + log_host "No NS support detected for test ${tname}" + return 1 + fi + + return 0 +} + check_vng() { local tested_versions local version @@ -500,6 +531,43 @@ log_guest() { LOG_PREFIX=3Dguest log $@ } =20 +test_ns_host_vsock_ns_mode_ok() { + add_namespaces + + for mode in "${NS_MODES[@]}"; do + if ! ns_set_mode "${mode}0" "${mode}"; then + del_namespaces + return "${KSFT_FAIL}" + fi + done + + del_namespaces + + return "${KSFT_PASS}" +} + +test_ns_host_vsock_ns_mode_write_once_ok() { + add_namespaces + + for mode in "${NS_MODES[@]}"; do + local ns=3D"${mode}0" + if ! ns_set_mode "${ns}" "${mode}"; then + del_namespaces + return "${KSFT_FAIL}" + fi + + # try writing again and expect failure + if ns_set_mode "${ns}" "${mode}"; then + del_namespaces + return "${KSFT_FAIL}" + fi + done + + del_namespaces + + return "${KSFT_PASS}" +} + test_vm_server_host_client() { if ! vm_vsock_test "init_ns" "server" 2 "${TEST_GUEST_PORT}"; then return "${KSFT_FAIL}" @@ -573,6 +641,11 @@ run_shared_vm_tests() { continue fi =20 + if ! check_netns "${arg}"; then + check_result "${KSFT_SKIP}" + continue + fi + run_shared_vm_test "${arg}" check_result $? done @@ -626,6 +699,28 @@ run_shared_vm_test() { return "${rc}" } =20 +run_tests() { + for arg in "${ARGS[@]}"; do + if shared_vm_test "${arg}"; then + continue + fi + + if ! check_netns "${arg}"; then + check_result "${KSFT_SKIP}" + continue + fi + + add_namespaces + + name=3D$(echo "${arg}" | awk '{ print $1 }') + log_host "Executing test_${name}" + eval test_"${name}" + check_result $? + + del_namespaces + done +} + BUILD=3D0 QEMU=3D"qemu-system-$(uname -m)" =20 @@ -671,6 +766,8 @@ if shared_vm_tests_requested "${ARGS[@]}"; then terminate_pidfiles "${pidfile}" fi =20 +run_tests "${ARGS[@]}" + echo "SUMMARY: PASS=3D${cnt_pass} SKIP=3D${cnt_skip} FAIL=3D${cnt_fail}" echo "Log: ${LOG}" =20 --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 9A3452ED866 for ; Tue, 21 Oct 2025 23:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090451; cv=none; b=XFBMsQywoFz2UCvm4M81eV8hsAQBZwTw+IaFKwu0qdCetAxKu/9DqXiqz0yE9732ew4kd0KMHkBS4sKcyZDnYwlxBSm7Oy1Q4aZbFIL7fXH9V9kbpzpwjeBYDiU765VAApvP4IKcITR10BawWLqDj+C7JW3z5LOY4bCXUeXSuhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090451; c=relaxed/simple; bh=5WTKWKiUk8Dj2RvkxdNnCT58i8QpYZiL92GnKNlZW6Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m162ADttuUB2zV64jljaDJqFzcgLx6fniCyLDKNarXo4eQM6X3P7V9UNIm+e3r42qSUalxm9Vl5/ueUh903iSWuTUkzjQ/gWotJCVAWvDTBLpx94eu5mutpyIqk8dKk1mxfQv3KxcNc2GoKN/SRNT/I1/TllbcFTvYDryH6IVeg= 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=OBqioFts; arc=none smtp.client-ip=209.85.214.175 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="OBqioFts" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-290dc63fabbso47550625ad.0 for ; Tue, 21 Oct 2025 16:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090440; x=1761695240; 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=TV8626iy6qZJteqWMHB3Fb4Ctz0bR6NM9tHbIBJXOjs=; b=OBqioFtsCFj4zYM7FWkkTYwuPC1RqG8UQ1/NTlDPRV9FY3WVb7xphwfFlH1BdR+AnV GeqoMirbsYDWTmFdtKOXW2nH/pELsHLmD06vKQDdBvvCt/ShuGKcg5IECGJtKQleOv33 UTRYGFt9iiDQXdazj17uuEN239KbjKe2iyWXOcruZuANVD/p6t8w1wdQimCUuSRv6yUx U59AtdQMEyTsb2XxFD8EuNL9oopimrrgmB3wHUi0mZrgZAOF1rjsm6Ojd12tsCH+Tpqh QlyWWpNO2ZK6vhA1/mOGO+GxpRLSycvl0Th0Pq3nXUYG9psmpkrLi3VfhU3jbFVJSMyd 1qWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090440; x=1761695240; 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=TV8626iy6qZJteqWMHB3Fb4Ctz0bR6NM9tHbIBJXOjs=; b=WbiQuKmUJk6HMq89v/tlGnwGhAASu41i3ScsDnnJY1GfafCcizONAJe5Mde4SwqlZ6 yyIYvfH+rIt3/uOqNCIvZyOETsc7vgnQwE1Dab9CuC6thjd76VhvXDvliUKC8rLQd9JF zKMUCGHM8gTJtTt65rQBNZBNXrtppkc0a5XKLuj391BNGHKgIKi3XzuX/2dV9+cHvN99 qEEnymXSYIBwqqlIewNUTtP/t4SDr1xHf3WKN2VLIFLCa5ATlzkpbbwbGvrjylqETLxa PUVS2WEQHS3B8d8Bu12APo3SoUN+i8ERfmE7abIB1OEisr3SH8C0jFg0roqBquQTg3HP DktA== X-Forwarded-Encrypted: i=1; AJvYcCVItz/eAWlEssBuW44qQ/YJb5+XFQoAqrwM9ReuZTQlm1akW8kLvxV1r2i52+TefT5KSmf8EYic6a6NNqA=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9/cmiTmZDgacJCVp4yKb/197onnXRA5EFnXIJ7lriqI+zXfNe VdfZaHzsc1TavLtucVDMQY8FNVlCS8NqZQy/hoN2KSkOdIU697vCX3eb X-Gm-Gg: ASbGncskLkFpW8trRRsW9N5W97wz7BhiPzEGIieiGBv/EOtYSCUjSjDnaOlvJzjbU7d 3sZM+o9i2XVxb/URA7zaQMNEqfLK3wETUO27qpf0XQbF0lH6feByLl1wW2qtLsC0JNbJy8O9USr TmDBzsjEOnobmBWLVF0/tu3zWfZn3qr5g6Av/edCWjq+HgvzwIkUw2j0t83uT2H95fCE2NERVcQ b7bF6Z+qWDk7fRYNBsNgzK5rXcQd/K9V6pqH8GmtoIx9TBYeUja8UT0gnGqUOnfUrTHBphBbmkR qgur2WwsIVYvqqdffaRlt/0SSvgROfBA2fUxxB54ibLFFGmyxyaUEBVEFDGfb6S80/O98kIoXI8 HkUdt/8ZrzCi14cJz84mEmaK599OaHUry2QDPZRN8APLcr+rZAX5KtUycZlnyN9npunqzx38awi /WIa8m X-Google-Smtp-Source: AGHT+IF3YtiPWvZebVNqksLPddW34hdGMs6SWVpzynIffF/Cg3VXxCHnVj5pafWbxKnLw/A6JvakJA== X-Received: by 2002:a17:903:11cd:b0:290:9a31:26d6 with SMTP id d9443c01a7336-290cba4ec04mr234640025ad.57.1761090439594; Tue, 21 Oct 2025 16:47:19 -0700 (PDT) Received: from localhost ([2a03:2880:2ff::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29247223a3csm120532795ad.112.2025.10.21.16.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:19 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:05 -0700 Subject: [PATCH net-next v7 22/26] selftests/vsock: add namespace tests for CID collisions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-22-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 new namespace tests that validate the CID collision namespace rules. There are tests to ensure that global namespaces collide on the same CID, while local+local and local+global namespace combinations do not collide. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 74 +++++++++++++++++++++++++++++= ++++ 1 file changed, 74 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 4defadad5701..69ec6ec82b0c 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -44,6 +44,10 @@ readonly TEST_NAMES=3D( vm_loopback ns_host_vsock_ns_mode_ok ns_host_vsock_ns_mode_write_once_ok + ns_global_same_cid_fails + ns_local_same_cid_ok + ns_global_local_same_cid_ok + ns_local_global_same_cid_ok ) readonly TEST_DESCS=3D( # vm_server_host_client @@ -60,6 +64,18 @@ readonly TEST_DESCS=3D( =20 # ns_host_vsock_ns_mode_write_once_ok "Check /proc/sys/net/vsock/ns_mode is write-once on the host." + + # ns_global_same_cid_fails + "Check QEMU fails to start two VMs with same CID in two different global = namespaces." + + # ns_local_same_cid_ok + "Check QEMU successfully starts two VMs with same CID in two different lo= cal namespaces." + + # ns_global_local_same_cid_ok + "Check QEMU successfully starts one VM in a global ns and then another VM= in a local ns with the same CID." + + # ns_local_global_same_cid_ok + "Check QEMU successfully starts one VM in a local ns and then another VM = in a global ns with the same CID." ) =20 readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) @@ -546,6 +562,64 @@ test_ns_host_vsock_ns_mode_ok() { return "${KSFT_PASS}" } =20 +namespaces_can_boot_same_cid() { + local ns0=3D$1 + local ns1=3D$2 + local pidfile1 pidfile2 + local rc + + pidfile1=3D$(mktemp $PIDFILE_TEMPLATE) + vm_start "${pidfile1}" "${ns0}" + + pidfile2=3D$(mktemp $PIDFILE_TEMPLATE) + vm_start "${pidfile2}" "${ns1}" + + rc=3D$? + terminate_pidfiles "${pidfile1}" "${pidfile2}" + + return $rc +} + +test_ns_global_same_cid_fails() { + init_namespaces + + if namespaces_can_boot_same_cid "global0" "global1"; then + return "${KSFT_FAIL}" + fi + + return "${KSFT_PASS}" +} + +test_ns_local_global_same_cid_ok() { + init_namespaces + + if namespaces_can_boot_same_cid "local0" "global0"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_global_local_same_cid_ok() { + init_namespaces + + if namespaces_can_boot_same_cid "global0" "local0"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_local_same_cid_ok() { + init_namespaces + + if namespaces_can_boot_same_cid "local0" "local0"; then + return "${KSFT_FAIL}" + fi + + return "${KSFT_PASS}" +} + test_ns_host_vsock_ns_mode_write_once_ok() { add_namespaces =20 --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 0D4782F3C12 for ; Tue, 21 Oct 2025 23:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090449; cv=none; b=FGEcn3Q5dRAs69zyEBJRaJBJQFuKCP4yR7hNSAZaIQ6ASKZqZVsIDknhRPsR8+p0F+3QJKoiv6otKE23kMDco1RPhtCscXMxml6s7zcAHCelsld9l03Ne9uzZSgexTvkPuHvYhgyslNr80ZCeXo3btl8lPflpxJtrCgGxFCpx/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090449; c=relaxed/simple; bh=3y8PIRX5hkWQeTfoKXTU1ofOrszBguxn5J0xvkQVls4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aMB5Ts0OLNj91j8kpccmzLn2VguZUZ6r21sLDM7DEnsskUWY/d9+4mloPLId/vzf3FRdv5oyXWrdayhILlqES5BYJsODjftIotS/5kn6BIr7OHcFtISwXm0RoEeGTQpBLna7pWPsuWVBCMENxDRzlg2Oiwnq4BupBi0dHcCD8xk= 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=NqJJlJwk; arc=none smtp.client-ip=209.85.210.178 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="NqJJlJwk" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-78f3bfe3f69so5461686b3a.2 for ; Tue, 21 Oct 2025 16:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090441; x=1761695241; 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=CK9u+Kt1JkmPpt+Zpi9iArk9lXtsDJKTwzBLD9LkTbQ=; b=NqJJlJwkyLQpe0RCVgOzL3F7QTYr5Ad370qUiPMKjo2JSTcuxPFnJOs3htPOcTMUax /hucTKt8HC7Pe31fJ8dNAb8ye9C/iq4Y8TF4IEIfoP2viD5b0J3IEXpfDbkjDynJFudO O07hdhUulsyc+1YHijgX/qmZY5ABIj2c1iV9eOUJV3f2d3LQ5knInZ5nTPXNzaOBgKnV 81dTpTMoBePW5pfxOoUxNW4UEbUWIzshPpIsE9fi4tC3CZiNI1fuiV/SiDxn6xMsb3uY fIAq53l4W4JbuJsdQOmZCtwr666zb36Gr45HE8CcTKMVy2JJ968nhSRwnON9WCE44s5q uNjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090441; x=1761695241; 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=CK9u+Kt1JkmPpt+Zpi9iArk9lXtsDJKTwzBLD9LkTbQ=; b=IggXp8ud+Fzr6a8YXH93c8/CD6lfdAtuioIATlW8FrMY7MTH6c2+ebjGvkgb+FdHKY oIowdXWyOXI+VAKqE40ZNAPdRNZP0mf8Wyakl4spNdKdL1Y3e1VeELv98rwqZVNJZvUD 8MiW0OCgaaNiBZWIdUuGtixQ0eDl8ycedGLAfM7rekd94USv9rl6052bLqkwPsuB27hM 82jEmoaF1bFC0H4WPehBrwvEV3rOZHNFYMlvWbd+kxh48jdaICUiWl+q1vyABqwhxSJ7 5+yua+3hiZ/DQB111RqqBLHPT0qBB7Eb3oQcyn2mUB8CQQlTwn9UgAsxojHuBACnsc0A wY8w== X-Forwarded-Encrypted: i=1; AJvYcCW8WCf2QyRCiQfRv9yUxuO9kt9dATd1u+Ed8QEUXLjiRr+D7Wvqc11WfSgzUs3A8Yu/ToeKok2mFSm1deo=@vger.kernel.org X-Gm-Message-State: AOJu0YyXYk6uEampn3O7JMIp8Wl0+RKCYAAEuK/FbGjBk9964hmy/7El ide1CCHdlGClDHymk1sMy88bWtYFKGO/t0/nyuRj8Ut+5zyJiEF2BBeI X-Gm-Gg: ASbGncs0It6Zdemu22O8/Qen04RSimwCOfwYWY1QJef9YZt8PTwk7qHYCpwjHebf4Hq v+Vd5shdhxDCkhShrlbWX0cKXQQnt9p3BqX+kZvCw3C/C12LyQpU+ONEPQ6kZUAfwALR7xsm8lr nBw53Q/s7qy0b7DV+exn0IaIp+nB3HhbGx3wjraGcksHwvaSZDI6hi779pID74YTO5IrGBpwexf /a18GPQRv+n47hgk55ud8A5KIqDIu+0qTo2gLVuNbd0qhNgBCMoUTfWshDjsoNJP6t5x4mS8u0I 2JoFIL5GbYz3WBjOpiXEhi+1lJa693iEiP2KsPs1qwyttHkXoEpQYNtrBfSjtoWb8+xaBG6oN4x MdXZfhM/kcSbQ0w7BOVrhsXVguMj60ghpL2YOCkrPs3uq8NbEyCKtLtzraLcbbPueA7d6m3i5Fa 8oTfNM08cx X-Google-Smtp-Source: AGHT+IFJdMZKgJWaplAshFUldw2jLwZXkhw3pWDBy0khuKWid6KnvqbfJG8+4bhgh4tiivM884/1og== X-Received: by 2002:a17:902:db0b:b0:24c:cc32:788b with SMTP id d9443c01a7336-290c9c8a77dmr227913505ad.3.1761090440554; Tue, 21 Oct 2025 16:47:20 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:43::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246fdbe35sm120169985ad.46.2025.10.21.16.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:20 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:06 -0700 Subject: [PATCH net-next v7 23/26] selftests/vsock: add tests for host <-> vm connectivity with namespaces Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-23-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 tests to validate namespace correctness using vsock_test and socat. The vsock_test tool is used to validate expected success tests, but socat is used for expected failure tests. socat is used to ensure that connections are rejected outright instead of failing due to some other socket behavior (as tested in vsock_test). Additionally, socat is already required for tunneling TCP traffic from vsock_test. Using only one of the vsock_test tests like 'test_stream_client_close_client' would have yielded a similar result, but doing so wouldn't remove the socat dependency. Additionally, check for the dependency socat. socat needs special handling beyond just checking if it is on the path because it must be compiled with support for both vsock and unix. The function check_socat() checks that this support exists. Add more padding to test name printf strings because the tests added in this patch would otherwise overflow. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 463 ++++++++++++++++++++++++++++= +++- 1 file changed, 461 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 69ec6ec82b0c..0a5751c52fa8 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -7,6 +7,7 @@ # * virtme-ng # * busybox-static (used by virtme-ng) # * qemu (used by virtme-ng) +# * socat =20 readonly SCRIPT_DIR=3D"$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && p= wd -P)" readonly KERNEL_CHECKOUT=3D$(realpath "${SCRIPT_DIR}"/../../../../) @@ -48,6 +49,19 @@ readonly TEST_NAMES=3D( ns_local_same_cid_ok ns_global_local_same_cid_ok ns_local_global_same_cid_ok + ns_diff_global_host_connect_to_global_vm_ok + ns_diff_global_host_connect_to_local_vm_fails + ns_diff_global_vm_connect_to_global_host_ok + ns_diff_global_vm_connect_to_local_host_fails + ns_diff_local_host_connect_to_local_vm_fails + ns_diff_local_vm_connect_to_local_host_fails + ns_diff_global_to_local_loopback_local_fails + ns_diff_local_to_global_loopback_fails + ns_diff_local_to_local_loopback_fails + ns_diff_global_to_global_loopback_ok + ns_same_local_loopback_ok + ns_same_local_host_connect_to_local_vm_ok + ns_same_local_vm_connect_to_local_host_ok ) readonly TEST_DESCS=3D( # vm_server_host_client @@ -76,6 +90,45 @@ readonly TEST_DESCS=3D( =20 # ns_local_global_same_cid_ok "Check QEMU successfully starts one VM in a local ns and then another VM = in a global ns with the same CID." + + # ns_diff_global_host_connect_to_global_vm_ok + "Run vsock_test client in global ns with server in VM in another global n= s." + + # ns_diff_global_host_connect_to_local_vm_fails + "Run socat to test a process in a global ns fails to connect to a VM in a= local ns." + + # ns_diff_global_vm_connect_to_global_host_ok + "Run vsock_test client in VM in a global ns with server in another global= ns." + + # ns_diff_global_vm_connect_to_local_host_fails + "Run socat to test a VM in a global ns fails to connect to a host process= in a local ns." + + # ns_diff_local_host_connect_to_local_vm_fails + "Run socat to test a host process in a local ns fails to connect to a VM = in another local ns." + + # ns_diff_local_vm_connect_to_local_host_fails + "Run socat to test a VM in a local ns fails to connect to a host process = in another local ns." + + # ns_diff_global_to_local_loopback_local_fails + "Run socat to test a loopback vsock in a global ns fails to connect to a = vsock in a local ns." + + # ns_diff_local_to_global_loopback_fails + "Run socat to test a loopback vsock in a local ns fails to connect to a v= sock in a global ns." + + # ns_diff_local_to_local_loopback_fails + "Run socat to test a loopback vsock in a local ns fails to connect to a v= sock in another local ns." + + # ns_diff_global_to_global_loopback_ok + "Run socat to test a loopback vsock in a global ns successfully connects = to a vsock in another global ns." + + # ns_same_local_loopback_ok + "Run socat to test a loopback vsock in a local ns successfully connects t= o a vsock in the same ns." + + # ns_same_local_host_connect_to_local_vm_ok + "Run vsock_test client in a local ns with server in VM in same ns." + + # ns_same_local_vm_connect_to_local_host_ok + "Run vsock_test client in VM in a local ns with server in same ns." ) =20 readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) @@ -102,7 +155,7 @@ usage() { for ((i =3D 0; i < ${#TEST_NAMES[@]}; i++)); do name=3D${TEST_NAMES[${i}]} desc=3D${TEST_DESCS[${i}]} - printf "\t%-35s%-35s\n" "${name}" "${desc}" + printf "\t%-55s%-35s\n" "${name}" "${desc}" done echo =20 @@ -220,7 +273,7 @@ check_args() { } =20 check_deps() { - for dep in vng ${QEMU} busybox pkill ssh; do + for dep in vng ${QEMU} busybox pkill ssh socat; do if [[ ! -x $(command -v "${dep}") ]]; then echo -e "skip: dependency ${dep} not found!\n" exit "${KSFT_SKIP}" @@ -271,6 +324,20 @@ check_vng() { fi } =20 +check_socat() { + local support_string + + support_string=3D"$(socat -V)" + + if [[ "${support_string}" !=3D *"WITH_VSOCK 1"* ]]; then + die "err: socat is missing vsock support" + fi + + if [[ "${support_string}" !=3D *"WITH_UNIX 1"* ]]; then + die "err: socat is missing unix support" + fi +} + handle_build() { if [[ ! "${BUILD}" -eq 1 ]]; then return @@ -308,6 +375,14 @@ terminate_pidfiles() { done } =20 +terminate_pids() { + local pid + + for pid in "$@"; do + kill -SIGTERM "${pid}" &>/dev/null || : + done +} + vm_start() { local pidfile=3D$1 local ns=3D$2 @@ -562,6 +637,389 @@ test_ns_host_vsock_ns_mode_ok() { return "${KSFT_PASS}" } =20 +test_ns_diff_global_host_connect_to_global_vm_ok() { + local pids pid pidfile + local ns0 ns1 port + declare -a pids + local unixfile + ns0=3D"global0" + ns1=3D"global1" + port=3D1234 + local rc + + init_namespaces + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + + if ! vm_start "${pidfile}" "${ns0}"; then + return "${KSFT_FAIL}" + fi + + unixfile=3D$(mktemp -u /tmp/XXXX.sock) + ip netns exec "${ns1}" \ + socat TCP-LISTEN:"${TEST_HOST_PORT}",fork \ + UNIX-CONNECT:"${unixfile}" & + pids+=3D($!) + host_wait_for_listener "${ns1}" "${TEST_HOST_PORT}" + + ip netns exec "${ns0}" socat UNIX-LISTEN:"${unixfile}",fork \ + TCP-CONNECT:localhost:"${TEST_HOST_PORT}" & + pids+=3D($!) + + vm_vsock_test "${ns0}" "server" 2 "${TEST_GUEST_PORT}" + vm_wait_for_listener "${ns0}" "${TEST_GUEST_PORT}" + host_vsock_test "${ns1}" "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}" + rc=3D$? + + for pid in "${pids[@]}"; do + if [[ "$(jobs -p)" =3D *"${pid}"* ]]; then + kill -SIGTERM "${pid}" &>/dev/null + fi + done + + terminate_pidfiles "${pidfile}" + + if [[ $rc -ne 0 ]]; then + return "${KSFT_FAIL}" + fi + + return "${KSFT_PASS}" +} + +test_ns_diff_global_host_connect_to_local_vm_fails() { + local ns0=3D"global0" + local ns1=3D"local0" + local port=3D12345 + local pidfile + local result + local pid + + init_namespaces + + outfile=3D$(mktemp) + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + if ! vm_start "${pidfile}" "${ns1}"; then + log_host "failed to start vm (cid=3D${VSOCK_CID}, ns=3D${ns0})" + return $KSFT_FAIL + fi + + vm_wait_for_ssh "${ns1}" + vm_ssh "${ns1}" -- socat VSOCK-LISTEN:"${port}" STDOUT > "${outfile}" & + echo TEST | ip netns exec "${ns0}" \ + socat STDIN VSOCK-CONNECT:"${VSOCK_CID}":"${port}" 2>/dev/null + + terminate_pidfiles "${pidfile}" + + result=3D$(cat "${outfile}") + rm -f "${outfile}" + + if [[ "${result}" !=3D TEST ]]; then + return $KSFT_PASS + fi + + return $KSFT_FAIL +} + +test_ns_diff_global_vm_connect_to_global_host_ok() { + local ns0=3D"global0" + local ns1=3D"global1" + local port=3D12345 + local unixfile + local pidfile + local pids + + init_namespaces + + declare -a pids + + log_host "Setup socat bridge from ns ${ns0} to ns ${ns1} over port ${port= }" + + unixfile=3D$(mktemp -u /tmp/XXXX.sock) + + ip netns exec "${ns0}" \ + socat TCP-LISTEN:"${port}" UNIX-CONNECT:"${unixfile}" & + pids+=3D($!) + + ip netns exec "${ns1}" \ + socat UNIX-LISTEN:"${unixfile}" TCP-CONNECT:127.0.0.1:"${port}" & + pids+=3D($!) + + log_host "Launching ${VSOCK_TEST} in ns ${ns1}" + host_vsock_test "${ns1}" "server" "${VSOCK_CID}" "${port}" + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + if ! vm_start "${pidfile}" "${ns0}"; then + log_host "failed to start vm (cid=3D${cid}, ns=3D${ns0})" + terminate_pids "${pids[@]}" + rm -f "${unixfile}" + return $KSFT_FAIL + fi + + vm_wait_for_ssh "${ns0}" + vm_vsock_test "${ns0}" "10.0.2.2" 2 "${port}" + rc=3D$? + + terminate_pidfiles "${pidfile}" + terminate_pids "${pids[@]}" + rm -f "${unixfile}" + + if [[ ! $rc -eq 0 ]]; then + return "${KSFT_FAIL}" + fi + + return "${KSFT_PASS}" + +} + +test_ns_diff_global_vm_connect_to_local_host_fails() { + local ns0=3D"global0" + local ns1=3D"local0" + local port=3D12345 + local pidfile + local result + local pid + + init_namespaces + + log_host "Launching socat in ns ${ns1}" + outfile=3D$(mktemp) + ip netns exec "${ns1}" socat VSOCK-LISTEN:${port} STDOUT &> "${outfile}" & + pid=3D$! + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + if ! vm_start "${pidfile}" "${ns0}"; then + log_host "failed to start vm (cid=3D${cid}, ns=3D${ns0})" + terminate_pids "${pid}" + rm -f "${outfile}" + return $KSFT_FAIL + fi + + vm_wait_for_ssh "${ns0}" + + vm_ssh "${ns0}" -- \ + bash -c "echo TEST | socat STDIN VSOCK-CONNECT:2:${port}" 2>&1 | log_gue= st + + terminate_pidfiles "${pidfile}" + terminate_pids "${pid}" + + result=3D$(cat "${outfile}") + rm -f "${outfile}" + + if [[ "${result}" !=3D TEST ]]; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_diff_local_host_connect_to_local_vm_fails() { + local ns0=3D"local0" + local ns1=3D"local1" + local port=3D12345 + local pidfile + local result + local pid + + init_namespaces + + outfile=3D$(mktemp) + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + if ! vm_start "${pidfile}" "${ns1}"; then + log_host "failed to start vm (cid=3D${cid}, ns=3D${ns0})" + return $KSFT_FAIL + fi + + vm_wait_for_ssh "${ns1}" + vm_ssh "${ns1}" -- socat VSOCK-LISTEN:"${port}" STDOUT > "${outfile}" & + echo TEST | ip netns exec "${ns0}" \ + socat STDIN VSOCK-CONNECT:"${VSOCK_CID}":"${port}" 2>/dev/null + + terminate_pidfiles "${pidfile}" + + result=3D$(cat "${outfile}") + rm -f "${outfile}" + + if [[ "${result}" !=3D TEST ]]; then + return $KSFT_PASS + fi + + return $KSFT_FAIL +} + +test_ns_diff_local_vm_connect_to_local_host_fails() { + local ns0=3D"local0" + local ns1=3D"local1" + local port=3D12345 + local pidfile + local result + local pid + + init_namespaces + + log_host "Launching socat in ns ${ns1}" + outfile=3D$(mktemp) + ip netns exec "${ns1}" socat VSOCK-LISTEN:"${port}" STDOUT &> "${outfile}= " & + pid=3D$! + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + if ! vm_start "${pidfile}" "${ns0}"; then + log_host "failed to start vm (cid=3D${cid}, ns=3D${ns0})" + rm -f "${outfile}" + return "${KSFT_FAIL}" + fi + + vm_wait_for_ssh "${ns0}" + + vm_ssh "${ns0}" -- \ + bash -c "echo TEST | socat STDIN VSOCK-CONNECT:2:${port}" 2>&1 | log_gue= st + + terminate_pidfiles "${pidfile}" + terminate_pids "${pid}" + + result=3D$(cat "${outfile}") + rm -f "${outfile}" + + if [[ "${result}" !=3D TEST ]]; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +__test_loopback_two_netns() { + local ns0=3D$1 + local ns1=3D$2 + local port=3D12345 + local result + local pid + + modprobe vsock_loopback &> /dev/null || : + + log_host "Launching socat in ns ${ns1}" + outfile=3D$(mktemp) + ip netns exec "${ns1}" socat VSOCK-LISTEN:"${port}" STDOUT > "${outfile}"= 2>/dev/null & + pid=3D$! + + log_host "Launching socat in ns ${ns0}" + echo TEST | ip netns exec "${ns0}" socat STDIN VSOCK-CONNECT:1:"${port}" = 2>/dev/null + terminate_pids "${pid}" + + result=3D$(cat "${outfile}") + rm -f "${outfile}" + + if [[ "${result}" =3D=3D TEST ]]; then + return 0 + fi + + return 1 +} + +test_ns_diff_global_to_local_loopback_local_fails() { + init_namespaces + + if ! __test_loopback_two_netns "global0" "local0"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_diff_local_to_global_loopback_fails() { + init_namespaces + + if ! __test_loopback_two_netns "local0" "global0"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_diff_local_to_local_loopback_fails() { + init_namespaces + + if ! __test_loopback_two_netns "local0" "local1"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_diff_global_to_global_loopback_ok() { + init_namespaces + + if __test_loopback_two_netns "global0" "global1"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_same_local_loopback_ok() { + init_namespaces + + if __test_loopback_two_netns "local0" "local0"; then + return "${KSFT_PASS}" + fi + + return "${KSFT_FAIL}" +} + +test_ns_same_local_host_connect_to_local_vm_ok() { + local ns=3D"local0" + local port=3D1234 + local pidfile + local rc + + init_namespaces + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + + if ! vm_start "${pidfile}" "${ns}"; then + return "${KSFT_FAIL}" + fi + + vm_vsock_test "${ns}" "server" 2 "${TEST_GUEST_PORT}" + host_vsock_test "${ns}" "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}" + rc=3D$? + + terminate_pidfiles "${pidfile}" + + if [[ $rc -ne 0 ]]; then + return "${KSFT_FAIL}" + fi + + return "${KSFT_PASS}" +} + +test_ns_same_local_vm_connect_to_local_host_ok() { + local ns=3D"local0" + local port=3D1234 + local pidfile + local rc + + init_namespaces + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + + if ! vm_start "${pidfile}" "${ns}"; then + return "${KSFT_FAIL}" + fi + + vm_vsock_test "${ns}" "server" 2 "${TEST_GUEST_PORT}" + host_vsock_test "${ns}" "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}" + rc=3D$? + + terminate_pidfiles "${pidfile}" + + if [[ $rc -ne 0 ]]; then + return "${KSFT_FAIL}" + fi + + return "${KSFT_PASS}" +} + namespaces_can_boot_same_cid() { local ns0=3D$1 local ns1=3D$2 @@ -820,6 +1278,7 @@ fi check_args "${ARGS[@]}" check_deps check_vng +check_socat handle_build =20 echo "1..${#ARGS[@]}" --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 3CF172F5A14 for ; Tue, 21 Oct 2025 23:47:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090448; cv=none; b=dpNKKsjMo2Ogkt75UbcmwTal4xisz1/1/h9wDsLazRd6QNBfkZWdmGWUD1DzyF135BAaTRCwYArhda4VC7hk69TlaUqQbKeOh2sez19uPngJdNqUp9DnpPs3P6QxqtJ0dstKiAdX5FHzPr8C+coL2c6dDc+jZ1grIkRqy0JaQUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090448; c=relaxed/simple; bh=aux3K1IYIyz9wrqrgYN0zmRynTiqRa/rFWmvtJNo/MM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A+WNv4BZNEAS5UtNuzddIAX2UxNYUPoG+ou8C7dbokoaKiPajA2lmCBDqIjvc4l657xt5e7ZvuKXS2dWFDRbT7qJvpQbaFTuHgRQvREgkH53fIBjxvS9xgwiL50MyH/D5CZhfdI5d8vaX3krNypu8aXxhS9E8bwoyIvMmfSj37s= 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=C6J/Aftu; arc=none smtp.client-ip=209.85.215.179 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="C6J/Aftu" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b6271ea39f4so4296272a12.3 for ; Tue, 21 Oct 2025 16:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090442; x=1761695242; 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=gkE1wm12EpboPq+xR0aDSe3dF2N2c2mo+B2K7wyT4X8=; b=C6J/AftuMusU8Mrlz5RZP9zd3cowo+Dg8ucaMJ5+lmjqC6A7BJ0CG7rav3J/C5SiXD tuytImbpcR0mTyq1QkzhVrjtZc/gB3iuGeqOYoi8AcgIxViVgm4zYih7wSD79MmnsHGo 8ECrUsXacQ0rjTNMTT3oSS5KHtJqDBt85RMUzhshDzWiS0zZT0WffYfiYVp8g9kxISg5 +yyU/SjNYUjfKPc2GID8TAK7e9P73uKKWRLH/vIKjLSfqI2ykYedX+ymITRkmhOMojBU 1ET+y4bgjY3oBvMAWEbcfVwl9YdS8adLFnI7+hVOK5y3iAaBFhYWZPmqTMwNxGB54lMX VuCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090442; x=1761695242; 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=gkE1wm12EpboPq+xR0aDSe3dF2N2c2mo+B2K7wyT4X8=; b=Zn45H0YDR/7K9e91Twra+K0e2ZgZ33HwuMxwPq9uiFwRkNAT30Xk7dicUGLIy1htBr 3ybups4peW+RFeqDR4brQL01W3iUgsiDTOFq4qh0pNa5mN2Yc7srVkcG9qbMvdu5PZM9 8GXT0QXQ9VFGo0/CM1RomyTOp65ZgBg2YLSYcgYpbxyy+RDzGV1os5RMxVfdEC7gbd/C hF6kQej17C8tSZGQhfoQwm/Wr8fxqIGItVAuxov4HupcKHjUTNxTkYkYfcn/Nn4c3ygk fzVboavGbJBBeDpbWsXXVvBP4jpKIK2gFyRQSekvBMt/mpmvvshZNVC/yG57+u3sxkRE 4Gtg== X-Forwarded-Encrypted: i=1; AJvYcCXnmVyDxLOdJge1qx3NSJN6BVRuzk1Mm1EY975dTLuX0yFBKInLYuhzGttqXZeHrYeNObemKV4Qh6zzfbI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3y7k7ey7FIahA9axl9VRLpgj+wn0uF3IEqOn5bfX/eeGQw7o3 aK2uZE96knTfORvLViJc6VhvlbGt++n8sOZJnLXsRZ5ncpAtdA7Un6J9 X-Gm-Gg: ASbGnctkPqxqvak/u7Uey4vGcnM4jqKLKdFEw7RbyxSOEwa1OzQlU0HBbBuo6qCS0y0 mhY89Gw/W/ceoRf6lRCIiRDsW5JhbbS1m1DdguC0IyZevOnv95ADU6saNYIT/1dSh6pEIReBmRj ar3Qa8GdC3+a//LfO3j+ADL8EbWdx/ZdQ5lj5Nk36avK8znZMqL31WgsQngl0Fwh6pTQPd40dmI PC6nHon54iKccdUauipim9JGDelZcdQTpNornPMvihFUbkjR/ds4HDVO/BGnCSNq70ebj1en9oN esJ+1z6Ezm57DSXuZE5zDiWxxnknncgZoEkxJc2lOjtUYOhBT/pP5hWScZiPhVwWHiBZa0Wf+MU o+qFUgIk1euIIqXwzC7tcHziB76Aa/VqzMa5aW7a84Yntmh3nwoNadgUVhgiM3ccREz4+X9Ld X-Google-Smtp-Source: AGHT+IGJHLCu0MjtQBg0SHgooNwgM1vSlSfWRfiRu2HNlz5nsiqtV1uW/yPe7aUNptDiEFDTA5YlTQ== X-Received: by 2002:a17:902:ea05:b0:267:f7bc:673c with SMTP id d9443c01a7336-290cb27af4cmr269152055ad.44.1761090441540; Tue, 21 Oct 2025 16:47:21 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6a76b35dadsm11933323a12.26.2025.10.21.16.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:21 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:07 -0700 Subject: [PATCH net-next v7 24/26] selftests/vsock: add tests for namespace deletion and mode changes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-24-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 tests that validate vsock sockets are resilient to deleting namespaces or changing namespace modes from global to local. The vsock sockets should still function normally. The function check_ns_changes_dont_break_connection() is added to re-use the step-by-step logic of 1) setup connections, 2) do something that would maybe break the connections, 3) check that the connections are still ok. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 123 ++++++++++++++++++++++++++++= ++++ 1 file changed, 123 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 0a5751c52fa8..f8fa8b16d6e3 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -62,6 +62,12 @@ readonly TEST_NAMES=3D( ns_same_local_loopback_ok ns_same_local_host_connect_to_local_vm_ok ns_same_local_vm_connect_to_local_host_ok + ns_mode_change_connection_continue_vm_ok + ns_mode_change_connection_continue_host_ok + ns_mode_change_connection_continue_both_ok + ns_delete_vm_ok + ns_delete_host_ok + ns_delete_both_ok ) readonly TEST_DESCS=3D( # vm_server_host_client @@ -129,6 +135,24 @@ readonly TEST_DESCS=3D( =20 # ns_same_local_vm_connect_to_local_host_ok "Run vsock_test client in VM in a local ns with server in same ns." + + # ns_mode_change_connection_continue_vm_ok + "Check that changing NS mode of VM namespace from global to local after a= connection is established doesn't break the connection" + + # ns_mode_change_connection_continue_host_ok + "Check that changing NS mode of host namespace from global to local after= a connection is established doesn't break the connection" + + # ns_mode_change_connection_continue_both_ok + "Check that changing NS mode of host and VM namespaces from global to loc= al after a connection is established doesn't break the connection" + + # ns_delete_vm_ok + "Check that deleting the VM's namespace does not break the socket connect= ion" + + # ns_delete_host_ok + "Check that deleting the host's namespace does not break the socket conne= ction" + + # ns_delete_both_ok + "Check that deleting the VM and host's namespaces does not break the sock= et connection" ) =20 readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) @@ -1141,6 +1165,105 @@ test_vm_loopback() { return "${KSFT_PASS}" } =20 +check_ns_changes_dont_break_connection() { + local ns0=3D"global0" + local ns1=3D"global1" + local port=3D12345 + local pidfile + local outfile + local pids=3D() + local rc=3D0 + + init_namespaces + + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + if ! vm_start "${pidfile}" "${ns0}"; then + return "${KSFT_FAIL}" + fi + vm_wait_for_ssh "${ns0}" + + outfile=3D$(mktemp) + vm_ssh "${ns0}" -- \ + socat VSOCK-LISTEN:"${port}",fork STDOUT > "${outfile}" 2>/dev/null & + pids+=3D($!) + + # wait_for_listener() does not work for vsock because vsock does not + # export socket state to /proc/net/. Instead, we have no choice but to + # sleep for some hardcoded time. + sleep ${WAIT_PERIOD} + + # We use a pipe here so that we can echo into the pipe instead of + # using socat and a unix socket file. + local pipefile=3D$(mktemp -u /tmp/vmtest_pipe_XXXX) + ip netns exec "${ns1}" \ + socat PIPE:"${pipefile}" VSOCK-CONNECT:"${VSOCK_CID}":"${port}" & + pids+=3D($!) + + timeout ${WAIT_PERIOD} \ + bash -c 'while [[ ! -e '"${pipefile}"' ]]; do sleep 1; done; exit 0' + + if [[ $2 =3D=3D "delete" ]]; then + if [[ "$1" =3D=3D "vm" ]]; then + ip netns del "${ns0}" + elif [[ "$1" =3D=3D "host" ]]; then + ip netns del "${ns1}" + elif [[ "$1" =3D=3D "both" ]]; then + ip netns del "${ns0}" + ip netns del "${ns1}" + fi + elif [[ $2 =3D=3D "change_mode" ]]; then + if [[ "$1" =3D=3D "vm" ]]; then + ns_set_mode "${ns0}" "local" + elif [[ "$1" =3D=3D "host" ]]; then + ns_set_mode "${ns1}" "local" + elif [[ "$1" =3D=3D "both" ]]; then + ns_set_mode "${ns0}" "local" + ns_set_mode "${ns1}" "local" + fi + fi + + echo "TEST" > "${pipefile}" + + timeout ${WAIT_PERIOD} \ + bash -c 'while [[ ! -s '"${outfile}"' ]]; do sleep 1; done; exit 0' + + if grep -q "TEST" "${outfile}"; then + rc=3D"${KSFT_PASS}" + else + rc=3D"${KSFT_FAIL}" + fi + + terminate_pidfiles "${pidfile}" + terminate_pids "${pids[@]}" + rm -f "${outfile}" + + return "${rc}" +} + +test_ns_mode_change_connection_continue_vm_ok() { + check_ns_changes_dont_break_connection "vm" "change_mode" +} + +test_ns_mode_change_connection_continue_host_ok() { + check_ns_changes_dont_break_connection "host" "change_mode" +} + +test_ns_mode_change_connection_continue_both_ok() { + check_ns_changes_dont_break_connection "both" "change_mode" +} + +test_ns_delete_vm_ok() { + check_ns_changes_dont_break_connection "vm" "delete" +} + +test_ns_delete_host_ok() { + check_ns_changes_dont_break_connection "host" "delete" +} + +test_ns_delete_both_ok() { + check_ns_changes_dont_break_connection "both" "delete" +} + shared_vm_test() { local tname =20 --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 5F69F2F616A for ; Tue, 21 Oct 2025 23:47:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090449; cv=none; b=al9Cwif5hsGQM6Xru2n7oLNYaU1FCwL4ewW1aKH+mD5D9gSlD9TGWQE6TBAEozZhyOBfkDsc76D8VvccyD9900vFYWjmgOjXugjf7pGhs5cH+bBY63MDGHCFBruIQeuzT2A7shg2C7/v5iUpDa5vJMJP44od0t3TAEHpBA6nuns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090449; c=relaxed/simple; bh=iuoFGVXiyma5BjD4qVBCYGN/H+01qwexZAVvYObUk/o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pJ8RrkU0Sr/KvG4kk/8HvpRmDDUEvh2GenTZ7/IINK/QC2vlUm8kgJZISnVNHjRSnIZtirMCwDIAMRahilDNR8JUIvA/PtZ1czNocV4QRe21lOwfCoB3edKSJZxZ8iPgy1/PXIFJuT8+FfiaT8DIlM8NVVTtD2/9qpqpedKf0PM= 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=Sc58K/oT; arc=none smtp.client-ip=209.85.215.172 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="Sc58K/oT" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b608df6d2a0so5514184a12.1 for ; Tue, 21 Oct 2025 16:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090442; x=1761695242; 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=R1mW3ek33KlnkdGQnSq6JCzqGkY1/dpZqhI7Q32Dbqk=; b=Sc58K/oT1ajqI8x8bqgh3ED3viK1T4F36SaocNpGzZ06GQmwWhEy3kpqzbU0kgY2k7 JGobMSXi37TLtpt2iQP/LgSUcFb1RwwbjoDugvqIsCf1NKebLYyVGuO+a8q5zwv7cQNT 9PUL6QGMeljoMSB6vDJYR/thxHSwE9bS7fEJnK2VEI4q7KtTAXzuJ21b8f1nL+lIYeq6 FShbWzc8RcSR21YIRG99Nzof0bCOM4tYUPY3UtwQ4ANxzdbqJ29yizAYDLFOIhWTKUbL GiR1J/RfD9uFpKvXAi7ucI0/i4szU3Ksea2zSo7bW26v2ExxtpAKSSMPxlRXDM+TwawD AAIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090442; x=1761695242; 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=R1mW3ek33KlnkdGQnSq6JCzqGkY1/dpZqhI7Q32Dbqk=; b=atPwXAXBDk3VhwTIeJnZIOPwJflsFFwBjwS7osAw2GtZAE6+NuZyHt4xGUbI4PQqM6 YBzi/uJPpDhIctJxMxuZutafFynVWJp+xyIBUsXAVXrBzRjiUUCNmScIuwNps6ypC8DF 6A5u6VzlJ6HlXTzjguIqXjkA4a1y2wFHRlDNWWgwKJwYHlpdSyDBLXNwjNSOkla5bW9N Wuhu5qVPj0YYLKaddBH7t7BLJ4q4qpnypwkY/5KfOLuzKwgL205Oo+E7nuozfVS1rKki +lBG1Ij0emujvXhkr7OmOzJKmNsKEE6q2Q15h0FLZOO8iuUm2DJljooLxiuS2X3yyHnm 6xww== X-Forwarded-Encrypted: i=1; AJvYcCXOaDZP1z6yWGkGm3CG290T+uNdj93xU/E8ke+ueG8QvHfZPtr+0nSfGMR9r13mqNS7TtDTH5j1iIUKAMA=@vger.kernel.org X-Gm-Message-State: AOJu0YyqjTsGtD8NynO9xrfINlGbLzjtiC2/eXfpLyBwLRIuAKfoRVis 2Le8vcKsLFiuRXdR65nxEgBCeoRyQ/r57xa+lXpamz6a4BPJfLJnmePB6i+iP8Nn X-Gm-Gg: ASbGnctCHfl4GcaPldE8MV5r4xYPxiZHrh9SJkAqEWNXDhVfV90i95ELvsdjfvehBUC GS9Pz5KJzE3GufDBKprkcIirP4e8g/8AYT5SX342bLMki7LCCdZ0XEuV648516dqxPf/GEK7EvT iyE0nCsTZPD2JQ1InEQhC7acZUYIei1Q6x3ATUlPkEYhLnrPN7fZWiNc9OJL7bAN4im8mof1gCv IvZxUTpOGWVewTI761Y3TwL93rnFZpXNBFxOESJOPkNw+J97Lm29YotZhWCZhSclvFU6M9FxHOM mewD6U3jQdQJthygK1E7jVOevPf/aTmkdj1cp/Z6c0Tsrq+hdu9QHN10IOvC8Kvh0hjr/xz0ezm 3nJt8p7daFKQ1EVxsszHndkP7XSrouCARbvHvmO3WhM9OeYC9BFtXLudHLprk24SzJoiEmtTObQ == X-Google-Smtp-Source: AGHT+IEnoXliC4DZTHE40VZWQCvx9ip3e2WPqCXD2akJhvJXh22fPmIW6LK7Ka+Qk8/lrzwfhc3o6g== X-Received: by 2002:a17:902:d58d:b0:269:9719:fffd with SMTP id d9443c01a7336-290c9cf9775mr231885445ad.1.1761090442484; Tue, 21 Oct 2025 16:47:22 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:74::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29246fd8dfasm120381925ad.43.2025.10.21.16.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:22 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:08 -0700 Subject: [PATCH net-next v7 25/26] selftests/vsock: add tests for module loading order Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-25-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 tests to check that module loading order does not break vsock_loopback. Because vsock_loopback has some per-namespace data structure initialization that affects vsock namespace modes, lets make sure that namespace modes are respected and loopback sockets are functional even when the namespaces and modes are set prior to loading the vsock_loopback module. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 131 ++++++++++++++++++++++++++++= ++++ 1 file changed, 131 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index f8fa8b16d6e3..648ae71bf45a 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -68,6 +68,8 @@ readonly TEST_NAMES=3D( ns_delete_vm_ok ns_delete_host_ok ns_delete_both_ok + ns_loopback_global_global_late_module_load_ok + ns_loopback_local_local_late_module_load_fails ) readonly TEST_DESCS=3D( # vm_server_host_client @@ -153,6 +155,12 @@ readonly TEST_DESCS=3D( =20 # ns_delete_both_ok "Check that deleting the VM and host's namespaces does not break the sock= et connection" + + # ns_loopback_global_global_late_module_load_ok + "Test that loopback still works in global namespaces initialized prior to= loading the vsock_loopback kmod" + + # ns_loopback_local_local_late_module_load_fails + "Test that loopback connections still fail between local namespaces initi= alized prior to loading the vsock_loopback kmod" ) =20 readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) @@ -912,6 +920,23 @@ test_ns_diff_local_vm_connect_to_local_host_fails() { return "${KSFT_FAIL}" } =20 +unload_module() { + local module=3D$1 + local i + + for ((i =3D 0; i < 5; i++)); do + modprobe -r "${module}" 2>/dev/null || : + + if [[ "$(lsmod | grep -c ${module})" -eq 0 ]]; then + return 0 + fi + + sleep 1 + done + + return 1 +} + __test_loopback_two_netns() { local ns0=3D$1 local ns1=3D$2 @@ -1264,6 +1289,112 @@ test_ns_delete_both_ok() { check_ns_changes_dont_break_connection "both" "delete" } =20 +test_ns_loopback_global_global_late_module_load_ok() { + declare -a pids + local unixfile + local ns0 ns1 + local pids + local port + + if ! unload_module vsock_loopback; then + log_host "Unable to unload vsock_loopback, skipping..." + return "${KSFT_SKIP}" + fi + + ns0=3Dloopback_ns0 + ns1=3Dloopback_ns1 + + ip netns del "${ns0}" &>/dev/null || : + ip netns del "${ns1}" &>/dev/null || : + ip netns add "${ns0}" + ip netns add "${ns1}" + ns_set_mode "${ns0}" global + ns_set_mode "${ns1}" global + ip netns exec "${ns0}" ip link set dev lo up + ip netns exec "${ns1}" ip link set dev lo up + + modprobe vsock_loopback &> /dev/null || : + + unixfile=3D$(mktemp -u /tmp/XXXX.sock) + port=3D321 + ip netns exec "${ns1}" \ + socat TCP-LISTEN:"${port}",fork \ + UNIX-CONNECT:"${unixfile}" & + pids+=3D($!) + + host_wait_for_listener "${ns1}" "${port}" + ip netns exec "${ns0}" socat UNIX-LISTEN:"${unixfile}",fork \ + TCP-CONNECT:localhost:"${port}" & + pids+=3D($!) + + if ! host_vsock_test "${ns0}" "server" 1 "${port}"; then + ip netns del "${ns0}" &>/dev/null || : + ip netns del "${ns1}" &>/dev/null || : + terminate_pids "${pids[@]}" + return "${KSFT_FAIL}" + fi + + if ! host_vsock_test "${ns1}" "127.0.0.1" 1 "${port}"; then + ip netns del "${ns0}" &>/dev/null || : + ip netns del "${ns1}" &>/dev/null || : + terminate_pids "${pids[@]}" + return "${KSFT_FAIL}" + fi + + ip netns del "${ns0}" &>/dev/null || : + ip netns del "${ns1}" &>/dev/null || : + terminate_pids "${pids[@]}" + + return "${KSFT_PASS}" +} + +test_ns_loopback_local_local_late_module_load_fails() { + declare -a pids + local ns0 ns1 + local outfile + local pids + local rc + + if ! unload_module vsock_loopback; then + log_host "Unable to unload vsock_loopback, skipping..." + return "${KSFT_SKIP}" + fi + + ns0=3Dloopback_ns0 + ns1=3Dloopback_ns1 + + ip netns del "${ns0}" &>/dev/null || : + ip netns del "${ns1}" &>/dev/null || : + ip netns add "${ns0}" + ip netns add "${ns1}" + ns_set_mode "${ns0}" local + ns_set_mode "${ns1}" local + + modprobe vsock_loopback &> /dev/null || : + + outfile=3D$(mktemp /tmp/XXXX.vmtest.out) + ip netns exec "${ns0}" socat VSOCK-LISTEN:${port} STDOUT \ + > "${outfile}" 2>/dev/null & + pids+=3D($!) + + echo TEST | \ + ip netns exec "${ns1}" socat STDIN VSOCK-CONNECT:1:${port} \ + 2>/dev/null + + if grep -q "TEST" "${outfile}" 2>/dev/null; then + rc=3D"${KSFT_FAIL}" + else + rc=3D"${KSFT_PASS}" + fi + + ip netns del "${ns0}" &>/dev/null || : + ip netns del "${ns1}" &>/dev/null || : + terminate_pids "${pids[@]}" + rm -f "${outfile}" + + return "${rc}" +} + shared_vm_test() { local tname =20 --=20 2.47.3 From nobody Sun Feb 8 07:58:32 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 15F452F6597 for ; Tue, 21 Oct 2025 23:47:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090451; cv=none; b=SVJw3pjw1Eirudeln9EOjO0n9sa5U5uhVr/eTyN+AeR1TISFe+F+3eDmpF3XrBHJq5TByYPz+tXkahF76iwnbyuMQu9WsxSjrqAS8XV1ITaQr1fvyk+ON1ODvCXr4y/61vgFC0eLFHjU732zbvCQRgiiOzmPa/FuzzemOgW/RPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761090451; c=relaxed/simple; bh=BMoDKOrhS66bBpIGFuMcrxO7gUW03URrQ8nNkpSPZhs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ci2cDebkn6kAbmZJniOWNpXEFctemov1NPvLxQDqpT3LCpmPIs8RsEmJ6kvFEQ/625NTKdNMe56bz4m5TNmSk8h+zx9f9RGCloHUvsmAdw5d5tR1lBr7gWD968Y6a+OcWX+3saw+7pTrDffuB2gLnIB2e6DHEQ7WNa+A4nPqX/U= 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=NBdMP7dN; arc=none smtp.client-ip=209.85.215.172 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="NBdMP7dN" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b6a0a7f3a47so5739813a12.1 for ; Tue, 21 Oct 2025 16:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761090443; x=1761695243; 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=KCa9hiumthv+bRPHMdag7ntkQWTFgKpIIbTw+AdtIpU=; b=NBdMP7dNyeOytmB2rvy/Yxg5bJ+F7cyedwstBr5tbIxXbfnQAnrRwwyYzF+xECSSyN 9RfXd4KOI/CJWLn2lW3wYqAvCS1Mz5u6AX2JgigUZRTQOzdWxZWjkYc/eRd0PZNtdtSN dwsz4jMxNfDGPN+XQZSLjWxwXqsflbyVG+DmDKMNfTWFZ5AIhLVwMuIJeF7gTJ3ClkWK q/vi7/iRl6+sfSx/nSpcF3YbQCkT1N5LShAjn+aKIL5bjUl2H2zgCOQ/n8d80JoKlFEk nwzYeyo95tosg82ihqt7uyhz3cqdmntdVD4xHvcENRoF/FRYVeWC8K2G0hKe4fErfWAN DT5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761090443; x=1761695243; 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=KCa9hiumthv+bRPHMdag7ntkQWTFgKpIIbTw+AdtIpU=; b=pJC/qeORakb5YClt5hOET4OYx85VXqejb0AKAgpOkigjsegu5e+H+6YZu4p6vQs/pN Ma0a27j2sucRjEt8C0JRLvDx4uzzODmH+xa5WzoIXsJ98EIXSdr9Y7YYmOkxIcuZjgw8 bz+1kc8zhx4cOCtB2EuZ8E3eIslSnpJapAuOizWgm4mTPoZWLpbsYJQ/IwZIcZACspXN lHOxDwCvNc1SjDj3Odu4D9uBT8rJS9cNrwP3zapancTHF9MQU9oBsAjf4eKbnnur51qW KT3R0F25JX6/ydySLoHOYNBQ89FKAuI0ielvwXT+P2Llqm5AGTlK9QIbS5c3our22Pg4 a9Ag== X-Forwarded-Encrypted: i=1; AJvYcCUuP+FKKOGzlbLqY+3XScjPbu4ZiL/6WupC5ztXjCUTX+mx/1yMO1VO7kvPLfMJeqw1u/klWSV8senphO4=@vger.kernel.org X-Gm-Message-State: AOJu0YwhzlCPX98gC7vz62ZAQRY+nPiqW6t8+0W2rjqwMjtjqp8WfC3m 4AvqnyuhBe/E7lsWqn/UA02+3EuAUAIqSSl57YlpCkIVUUe4p58y36Hg X-Gm-Gg: ASbGncv1m2Ft+Smbpf2GkVEUpxRY11BtuiVA6UdxvHR9MY78CDjUeZ9MhX1jWjoPCJ+ LHdDxnEhDq6M8VCcKi8IBBn0ZHFxRyasj6yJ8eHzzXJ4BKF06R57gtgRw9VvlVIu24cWHn5d328 z7/uhcH8yFjbi20856KwEZub2VIrCfEY7ljVX27y+z5PXE/DnrRm+5e73BQp2dVHyzTgsbwdtWF Z5bk8lYImJlkNDws00ykKub69NyKpO3h0DUv58RGyjslF5DR8IYnkatgLrWUUHK3D4U8efkunht PoMj2U/w3bmydnJmDRxY9SWP+2Ff+05CgstkDWOB4143uQHs4C4aFPjqB37KMWHp3GYXoDP6FaG VVaYo7BRHJDENuyoXUJlXwFfHAYThr8l3wniq+WBb5J4nfcFOjIBep3hCJy7IYMIWdzf6AGLfeh lBHtpyZOn/ X-Google-Smtp-Source: AGHT+IGaqRNpMxUjoe2TEEOGYZ81AJdjcRS3PZQjYosVwq9rn7Rp/cmS0OGVE01pd5g/Wml0FTdNXQ== X-Received: by 2002:a17:903:22c3:b0:293:57e:c8a7 with SMTP id d9443c01a7336-293057eca74mr3060095ad.23.1761090443407; Tue, 21 Oct 2025 16:47:23 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-292471d598asm120489125ad.63.2025.10.21.16.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 16:47:23 -0700 (PDT) From: Bobby Eshleman Date: Tue, 21 Oct 2025 16:47:09 -0700 Subject: [PATCH net-next v7 26/26] selftests/vsock: add 1.37 to tested virtme-ng versions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251021-vsock-vmtest-v7-26-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 Testing with 1.37 shows all tests passing: warning: vng version 'virtme-ng 1.37' has not been tested and may not funct= ion properly. The following versions have been tested: 1.33 1.36 1..30 ok 1 vm_server_host_client ok 2 vm_client_host_server ok 3 vm_loopback ok 4 ns_host_vsock_ns_mode_ok ok 5 ns_host_vsock_ns_mode_write_once_ok ok 6 ns_global_same_cid_fails ok 7 ns_local_same_cid_ok ok 8 ns_global_local_same_cid_ok ok 9 ns_local_global_same_cid_ok ok 10 ns_diff_global_host_connect_to_global_vm_ok ok 11 ns_diff_global_host_connect_to_local_vm_fails ok 12 ns_diff_global_vm_connect_to_global_host_ok ok 13 ns_diff_global_vm_connect_to_local_host_fails ok 14 ns_diff_local_host_connect_to_local_vm_fails ok 15 ns_diff_local_vm_connect_to_local_host_fails ok 16 ns_diff_global_to_local_loopback_local_fails ok 17 ns_diff_local_to_global_loopback_fails ok 18 ns_diff_local_to_local_loopback_fails ok 19 ns_diff_global_to_global_loopback_ok ok 20 ns_same_local_loopback_ok ok 21 ns_same_local_host_connect_to_local_vm_ok ok 22 ns_same_local_vm_connect_to_local_host_ok ok 23 ns_mode_change_connection_continue_vm_ok ok 24 ns_mode_change_connection_continue_host_ok ok 25 ns_mode_change_connection_continue_both_ok ok 26 ns_delete_vm_ok ok 27 ns_delete_host_ok ok 28 ns_delete_both_ok ok 29 ns_loopback_global_global_late_module_load_ok ok 30 ns_loopback_local_local_late_module_load_fails This patch adds 1.37 to the virtme-ng versions to get rid of the above warning. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 648ae71bf45a..d73fdea886fb 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -338,7 +338,7 @@ check_vng() { local version local ok =20 - tested_versions=3D("1.33" "1.36") + tested_versions=3D("1.33" "1.36" "1.37") version=3D"$(vng --version)" =20 ok=3D0 --=20 2.47.3