From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f202.google.com (mail-oi1-f202.google.com [209.85.167.202]) (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 D7A833A1A34 for ; Tue, 24 Feb 2026 18:25:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771957544; cv=none; b=jLMExZF/o/og9UC01xdZjqkjeN307Ku3Q7qcT2skauDjyE5vexG63s4SOHDPef3I+Q3/A0YKPmgmiRGrLV2fin5coV5oqx5AERXUYsjA23azZL1MTkuOpztqZPdRhCHgOdM4eqGeos/HFXGQ2/812hZYC7Jev4WTH7cQPQM/VU8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771957544; c=relaxed/simple; bh=ZGhcMmp96suPt1L+uYHC9+7SbnPLfccNrAp6sr5cOPQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QG78BnWlVCgnM0O4IHTLExspJRfW3sVMPzGIQHd9x5KnQbIuzYWKPcBM4ARGfM+pNXXnVA7PvP8VbmcbygFBxtKA4UZronw0Cr06Yv1mx0x2+IeOvFxSBLzewv7uj+Az5RDbPjQj/WiicMZPtwqzWNFWr8ia70DSJr2G+y3IGHk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--rananta.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RAxFKwjO; arc=none smtp.client-ip=209.85.167.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--rananta.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RAxFKwjO" Received: by mail-oi1-f202.google.com with SMTP id 5614622812f47-463ee33f9b2so23260630b6e.3 for ; Tue, 24 Feb 2026 10:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771957541; x=1772562341; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GhsCJ6Jzd72tpP6akMGZKaD93fr7NGPRDnXMiqTemDc=; b=RAxFKwjOQYcgdV23/w/TiHD3uPc1Xy6EI0tbapmXJiD41ThGKJX1lGAp5bctxAKCTB jVJnkq3QAk2xU/l5kWjGGNYeD6Rp/el5inYkuCkqNZ0tT1lUfzN8XKUe1850LsQ559Hf ITc3GA96JFe/53QzytUce7AQZ3skFYQu9OJzfD2PdQiFH1Shua5UcK2r70uqhjT3QwS+ u1JLFJB8u6As5T41PfXMwCTyh1Bo+XGA29m3BZvCNIdZoqsGlQxDKF710dQT53PRmcTb CiePmW+OkwUMWqROx51BCYuFi16vU3rB/urfcOg9u6XX72CyfD8+aPeaIclFcK3YUc2C qvBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771957541; x=1772562341; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GhsCJ6Jzd72tpP6akMGZKaD93fr7NGPRDnXMiqTemDc=; b=u/KJ82sEjmiDKJmH6FG2yZWWv60DLJTUXHmL9UTKRmdRylXZo9aiUNx9c/FwgV4+8d BcTSv0kViZGnOJAA+bHSAPQr6SqR15ec08tAaCTVlSh4v/o1VJHKFJ5JWCY5XASHSD9w PaczOKcC4zeof5eiAAZUHc9xTbKjiPyly3bLh25d4dL/K1Az6Tjrk8txNEHcCy9rWkvY Jh7AfogiSxcOggX4nMylgIh8hjND9HOsGvE9DO3eh5o0zOLd2q9gnmCEBWyxWv1fyEWp +52FE34UieyvIplqQcWIUMmyxs8aJZf6foTbYN8m2tFjU998s3r2B90hFTawY9MESECQ 6nQg== X-Forwarded-Encrypted: i=1; AJvYcCVCmpffFUboJ7tSZc2/yoSy6IceRbIoKzmNHtInvNqU4Zq9Xym9qOAS88jythSqR5V53QZTQY8kw2mMJI8=@vger.kernel.org X-Gm-Message-State: AOJu0YyDdJ1Qa2twraAtS5PkstZUNdeu+VeXmQP4OSgounBnhys5aMEY 2NVunwiBuknqJ764TuBqwTS8DHD/KLxRGAr0+3r3qgWiAiMvfMoydc6phrmTgC7R8eWZQbBEPB3 Aidz4k4RQdQ== X-Received: from oapo20.prod.google.com ([2002:a05:6871:794:b0:403:fa87:8459]) (user=rananta job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:37d5:b0:40e:9dbc:3b63 with SMTP id 586e51a60fabf-4157b0bbab2mr7216936fac.35.1771957540691; Tue, 24 Feb 2026 10:25:40 -0800 (PST) Date: Tue, 24 Feb 2026 18:25:28 +0000 In-Reply-To: <20260224182532.3914470-1-rananta@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260224182532.3914470-1-rananta@google.com> X-Mailer: git-send-email 2.53.0.414.gf7e9f6c205-goog Message-ID: <20260224182532.3914470-5-rananta@google.com> Subject: [PATCH v4 4/8] vfio: selftests: Extend container/iommufd setup for passing vf_token From: Raghavendra Rao Ananta To: David Matlack , Alex Williamson Cc: Vipin Sharma , Josh Hilke , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Raghavendra Rao Ananta Content-Type: text/plain; charset="UTF-8" A UUID is normally set as a vf_token to correspond the VFs with the PFs, if they are both bound by the vfio-pci driver. This is true for iommufd-based approach and container-based approach. The token can be set either during device creation (VFIO_GROUP_GET_DEVICE_FD) in container-based approach or during iommu bind (VFIO_DEVICE_BIND_IOMMUFD) in the iommu-fd case. Hence extend the functions, vfio_pci_iommufd_setup() and vfio_pci_container_setup(), to accept vf_token as an (optional) argument and handle the necessary setup. No functional changes are expected. Signed-off-by: Raghavendra Rao Ananta --- tools/testing/selftests/vfio/Makefile | 2 + .../selftests/vfio/lib/vfio_pci_device.c | 45 +++++++++++++++---- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/vfio/Makefile b/tools/testing/selftests/vfio/Makefile index e8f9023cf2479..120c9fdee5c09 100644 --- a/tools/testing/selftests/vfio/Makefile +++ b/tools/testing/selftests/vfio/Makefile @@ -20,6 +20,8 @@ CFLAGS += $(EXTRA_CFLAGS) LDFLAGS += -pthread +LDLIBS += -luuid + $(TEST_GEN_PROGS): %: %.o $(LIBVFIO_O) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(LIBVFIO_O) $(LDLIBS) -o $@ diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/testing/selftests/vfio/lib/vfio_pci_device.c index a7e00d017fc6e..4c79557cc4e09 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -199,7 +200,27 @@ static void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf ioctl_assert(device->group_fd, VFIO_GROUP_SET_CONTAINER, &device->iommu->container_fd); } -static void vfio_pci_container_setup(struct vfio_pci_device *device, const char *bdf) +static void vfio_pci_group_get_device_fd(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) +{ + char arg[64]; + + /* + * If a vf_token exists, argument to VFIO_GROUP_GET_DEVICE_FD + * will be in the form of the following example: + * "0000:04:10.0 vf_token=bd8d9d2b-5a5f-4f5a-a211-f591514ba1f3" + */ + if (vf_token) + snprintf_assert(arg, ARRAY_SIZE(arg), "%s vf_token=%s", bdf, vf_token); + else + snprintf_assert(arg, ARRAY_SIZE(arg), "%s", bdf); + + device->fd = ioctl(device->group_fd, VFIO_GROUP_GET_DEVICE_FD, arg); + VFIO_ASSERT_GE(device->fd, 0); +} + +static void vfio_pci_container_setup(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) { struct iommu *iommu = device->iommu; unsigned long iommu_type = iommu->mode->iommu_type; @@ -217,8 +238,7 @@ static void vfio_pci_container_setup(struct vfio_pci_device *device, const char */ (void)ioctl(iommu->container_fd, VFIO_SET_IOMMU, (void *)iommu_type); - device->fd = ioctl(device->group_fd, VFIO_GROUP_GET_DEVICE_FD, bdf); - VFIO_ASSERT_GE(device->fd, 0); + vfio_pci_group_get_device_fd(device, bdf, vf_token); } static void vfio_pci_device_setup(struct vfio_pci_device *device) @@ -279,12 +299,20 @@ const char *vfio_pci_get_cdev_path(const char *bdf) return cdev_path; } -static void vfio_device_bind_iommufd(int device_fd, int iommufd) +static void vfio_device_bind_iommufd(int device_fd, int iommufd, + const char *vf_token) { struct vfio_device_bind_iommufd args = { .argsz = sizeof(args), .iommufd = iommufd, }; + uuid_t token_uuid; + + if (vf_token) { + VFIO_ASSERT_EQ(uuid_parse(vf_token, token_uuid), 0); + args.flags |= VFIO_DEVICE_BIND_FLAG_TOKEN; + args.token_uuid_ptr = (u64)token_uuid; + } ioctl_assert(device_fd, VFIO_DEVICE_BIND_IOMMUFD, &args); } @@ -299,7 +327,8 @@ static void vfio_device_attach_iommufd_pt(int device_fd, u32 pt_id) ioctl_assert(device_fd, VFIO_DEVICE_ATTACH_IOMMUFD_PT, &args); } -static void vfio_pci_iommufd_setup(struct vfio_pci_device *device, const char *bdf) +static void vfio_pci_iommufd_setup(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) { const char *cdev_path = vfio_pci_get_cdev_path(bdf); @@ -307,7 +336,7 @@ static void vfio_pci_iommufd_setup(struct vfio_pci_device *device, const char *b VFIO_ASSERT_GE(device->fd, 0); free((void *)cdev_path); - vfio_device_bind_iommufd(device->fd, device->iommu->iommufd); + vfio_device_bind_iommufd(device->fd, device->iommu->iommufd, vf_token); vfio_device_attach_iommufd_pt(device->fd, device->iommu->ioas_id); } @@ -323,9 +352,9 @@ struct vfio_pci_device *vfio_pci_device_init(const char *bdf, struct iommu *iomm device->bdf = bdf; if (iommu->mode->container_path) - vfio_pci_container_setup(device, bdf); + vfio_pci_container_setup(device, bdf, NULL); else - vfio_pci_iommufd_setup(device, bdf); + vfio_pci_iommufd_setup(device, bdf, NULL); vfio_pci_device_setup(device); vfio_pci_driver_probe(device); -- 2.53.0.414.gf7e9f6c205-goog