From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) (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 ECFE6456DEB for ; Wed, 2 Sep 2026 23:01:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788390092; cv=none; b=I9ONZ5YxjHjL8I7ksgd9lB+rOFCUwKdS93vtOQ6n4X4cJvwBPs/eCvovP2U3pq+vWdoaFeL2ARb5GOs+pyn9rg1hYrndFA3iF0N1hw3VT7/MjO+VD0LIWGlPVAQ3NnaYso1X+Zx8woRQ//KGBIK6MGY07s+pBmrcC6JHjVJtcVk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788390092; c=relaxed/simple; bh=jkKXEIPOwBCki7hEhUKs4g/CFbe6ChFGK0eVQgaU6nU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sVOPTtRELERUQwMnCn3JYdehAoCC+wHYtkrg1Do2rb+tXWeVFpOh7m5oSvWWz0Dlmv5uBIM7G7osRjeApzrVpTxqSYO1og/V3DV3TaEt3wGE+P19t2O7CTv68jBYJYGhQPGVxcPm1rWYj8q1A32oISRUgkhpJtbMXzecIR4bgkI= 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=hokODlGZ; arc=none smtp.client-ip=209.85.160.52 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="hokODlGZ" Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-43bf9548df4so1400716fac.0 for ; Wed, 02 Sep 2026 16:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788390082; x=1788994882; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=0SPSwC6FIuR2igZB1JOk61BDdzgs1mNnqoV9+SaxkZ8=; b=hokODlGZV9B+JuieLJ932AouOKFaQ2dpL1Lsn2rq5uRPMKbvjRfvde7JU/JkC8in4L FsqxSbBcjNrPdOBVtEZFbZZqL6HzxyWFgMnuVYpDO9ER0TXs6KBrv0ga02eMvZpUvs3O KkDPRQUSlr7SwCS+ddFo1PzFE1jlNNq7zrncaV9Msp3a/vC31kWygiNUMt5FBhsiqJBV olYX9MDYVrjSPFF/6a4Je4LPqi4IJCGAkMZ6Y04XKtuIK1GvSMiAqLWHAZODx8Ru8c9K 3r8B62HofTd1NN1RU7U0Tb5TYiwUVBEGVtxCTqAJcENjd9c70vtmv/utkYStl9SObxxV LMhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788390082; x=1788994882; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=0SPSwC6FIuR2igZB1JOk61BDdzgs1mNnqoV9+SaxkZ8=; b=rITCobA4qmAvRx9cJwfLDpzZBMys+1c1GmeMwi+u6/iJomq+aBMAB7je6b9d8Gy10Z 2zaJjV3jta1QPNsK9mZOFCihi9teFNlcK31Bd84dGYNu8wGVrgvcEt2EWp+L/2dfKgt8 son038u5L6JG2Cp/W1ppfGjdxClcOWC80wrIG35Hhv+B18rMVJ5949crFU+WqtVTtLX1 BMzt+kwlHv/sNlMll++n6X5FVJDJjNMMgnQO0Z5j15m3AI6L6wSY9xmXOcjo0XA2x4kv g2uKtE/FtWeGPBw+Y1rYsKmyQhTGMPewjjIqIIEIqYv6F3ZqWKvGP7XERrOiF1OQkx7Q j5Bw== X-Forwarded-Encrypted: i=1; AKwUvBwyvE4NXiAaFfmSQ61/xY9COljZPNmUy6XyhwZGFelfr7FRGJe1o9ELz0D/KZDXj8wI5B7ilJE=@vger.kernel.org X-Gm-Message-State: AFuF++n02PxVo67dXKKCsT6Prxk4NauvGlYLpksYRw4od7XboOtV+xlV tE7tcaagLf6Hp+o/O3QkPTnN83ckzEf1IW963rCQBaYggK48tOoNMCzi X-Gm-Gg: AYBFou2Z9eCGHeXkwmGg4HJE6NDlQ89SZiUhuLj6H6n/GQ+lNdw1HMGjF0bcBFLWyaq tPIfTgKqWy639C6BjK+33pnNT9mgPJ961yomcTo2iQy1DvlPFTSY6b0EEP3FO3rZIo+1wC2tkAW wq5RJY2R5N/9iKiec3s7MWrRSh+aTETTamAWF0n3mW7FkobyZl3S3KxaIyL9+HrfNzCLlUvk7iw eo9/iz42F4wVS9pkut3E/M64EZRYxM2jfqX/lnBYWbXJGE0e16h4Sx9SkIE2WYEuuCREEoL5NYe yYQQSsj+Mui4S+n6VvO4qf3DJymJZV+qoYhNw4/H9GVOOlqzcK6WTmLaVot+GwfKze9mubeOsku 4o2Yn3CwfRAIBP7Sfd5kIAvIuSFVFgNmK/KEHKm4o9EwrHjHsLBMeaon8DvnABa7jDa9ONLcY8Y j0JDNIRtuk72ZcIpeCpSLK4kqmW7ULAuUrwbOPCkYLSXqzTrSrVnIrVGAN X-Received: by 2002:a05:6870:1426:b0:46a:dfdc:c77a with SMTP id 586e51a60fabf-46f86ce6964mr7916129fac.10.1788390081873; Wed, 02 Sep 2026 16:01:21 -0700 (PDT) Received: from localhost ([2a03:2880:ff:10::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-46f336c72fdsm4762834fac.17.2026.09.02.16.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2026 16:01:19 -0700 (PDT) From: Bobby Eshleman Date: Wed, 02 Sep 2026 16:00:50 -0700 Subject: [PATCH net-next 4/6] selftests/vsock: add a helper to assign the g2h device to a netns Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260902-vsock-guest-ns-v1-4-9995383e9a8b@meta.com> References: <20260902-vsock-guest-ns-v1-0-9995383e9a8b@meta.com> In-Reply-To: <20260902-vsock-guest-ns-v1-0-9995383e9a8b@meta.com> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Shuah Khan , Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Shuah Khan , Randy Dunlap Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, sargun@sargun.me, jlinbox@meta.com, Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman No shell tool can issue IOCTL_VM_SOCKETS_ASSIGN_G2H_NETNS, so anything that wants to move the guest's vsock device from a script needs a small program to do it. It exits with the ioctl's errno so a caller can differentiate the reasons for failure. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/.gitignore | 1 + tools/testing/selftests/vsock/Makefile | 3 +- .../selftests/vsock/vsock_assign_g2h_netns.c | 45 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vsock/.gitignore b/tools/testing/selftests/vsock/.gitignore index 9c5bf379480f..ffca0d9c34b1 100644 --- a/tools/testing/selftests/vsock/.gitignore +++ b/tools/testing/selftests/vsock/.gitignore @@ -1,2 +1,3 @@ vmtest.log +vsock_assign_g2h_netns vsock_test diff --git a/tools/testing/selftests/vsock/Makefile b/tools/testing/selftests/vsock/Makefile index c407c0afd938..d7170a15150f 100644 --- a/tools/testing/selftests/vsock/Makefile +++ b/tools/testing/selftests/vsock/Makefile @@ -11,7 +11,6 @@ $(OUTPUT)/vsock_test: $(VSOCK_TEST_DIR)/vsock_test $(VSOCK_TEST_DIR)/vsock_test: $(VSOCK_TEST_SRCS) $(MAKE) -C $(VSOCK_TEST_DIR) vsock_test TEST_PROGS += vmtest.sh -TEST_GEN_FILES := vsock_test +TEST_GEN_FILES := vsock_test vsock_assign_g2h_netns include ../lib.mk - diff --git a/tools/testing/selftests/vsock/vsock_assign_g2h_netns.c b/tools/testing/selftests/vsock/vsock_assign_g2h_netns.c new file mode 100644 index 000000000000..6f15629af607 --- /dev/null +++ b/tools/testing/selftests/vsock/vsock_assign_g2h_netns.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Assign the guest->host vsock transport, i.e. the guest's virtio-vsock + * device, to the network namespace of the invoking process. + * + * Exits with the ioctl's errno, so that callers can tell why it was refused. + * + * Copyright (c) 2026 Meta Platforms, Inc. and affiliates + */ + +#include +#include +#include +#include +#include +#include + +#include + +#ifndef IOCTL_VM_SOCKETS_ASSIGN_G2H_NETNS +#define IOCTL_VM_SOCKETS_ASSIGN_G2H_NETNS _IO(7, 0xba) +#endif + +int main(void) +{ + int fd, ret; + + fd = open("/dev/vsock", O_RDONLY); + if (fd < 0) { + fprintf(stderr, "open /dev/vsock: %s\n", strerror(errno)); + return -1; + } + + ret = ioctl(fd, IOCTL_VM_SOCKETS_ASSIGN_G2H_NETNS); + if (ret < 0) { + ret = errno; + fprintf(stderr, + "IOCTL_VM_SOCKETS_ASSIGN_G2H_NETNS: %s (errno %d)\n", + strerror(errno), errno); + } + + close(fd); + + return ret; +} -- 2.53.0-Meta