From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.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 3F9933368AB for ; Wed, 25 Mar 2026 21:05:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774472744; cv=none; b=lx1I4Cg77FDo7Fjl/+PWqY0rUzvIxY/cBrWUglA+GHMsmsP+RZU69fph/c2n3XhBz1DTN8zdkIpSnSGyiCZsqbmkg1dNDLE35Fz2I/AkJb+Aso/TJh9tmx80eAQerSTmdn7BGAmIForxvZIFxKLgiRinyf9IyTp4Rv34EANYQfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774472744; c=relaxed/simple; bh=mc3wyFkLdTJ6vlC+vxFo8HArEjVsFIe6IYt/TgRs0ng=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=m/gd2BWTJROoufylu8UCRXLy/3gF61KMuh4E7Zi1DFYMLp1QsprXrZrCcAWffw6c1Wc8rHzoLoMRP3YqDyMHwK6jS8MhaJPIDO5SWvJ3Jwy7RbgnvxScLPWYuqIW757AnFhkTgtzqOmN7o/Wa5/RvNFi+pRTDF1h5rTBQ4cTNQY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uqS2EgDE; arc=none smtp.client-ip=209.85.214.172 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=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uqS2EgDE" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2b04c9e3eb7so28765ad.0 for ; Wed, 25 Mar 2026 14:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774472743; x=1775077543; darn=lists.linux.dev; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=2ONKcbBIVZipE0oxJX2YmrslP0dc4AILtZ8R0cwg82s=; b=uqS2EgDEHtzQwaJS2zq9bgHJeKhtA180+5YzQFygYHSl+uozar0SfR3o3ho9owVzAC t5crqcnSjkvDorfFJBfo6hnKIYM4CuOSJcHvRPWNR0rn3hQJKh7QL07Sxg/RcxEewkNP JlSnfa3/nBJAs7gwdcUmQa/KF4lvNRJ+OPy2uTyeLeomsZh5WNj1fJ06DxhNSTtUPK7F woK7nSr9mskq5WpH/NCbWoHKl6PBvAojMALiFTOxy2pRet8FAZpmAETeySZUmloD7mUs i94PjqsGKps50QldACj3uu2BGdEgu0zsqQO6vHSWWK5jhv9KpB0OsLeIG92n2dgMCQFL B2Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774472743; x=1775077543; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2ONKcbBIVZipE0oxJX2YmrslP0dc4AILtZ8R0cwg82s=; b=NRAZS1TP9IKlxj987Y7GMdqYS+nk+Wk/JuMSKZ3SWY9t6pXeE3Cam/Hq54+6blpOCs O3/QdrZzdDgzzEyO56rGO0wwTjgcJwZZYHo33R4v9EK19ELrilyVQOJCTIikO53jDN6m u+PQlSkyqk/jo2JWj/hYx35thUww0SvnrKHDXar+UzpMo5uYzNKNNKfeZu2J1uyfsk8k H648aD4ULG91z2U4Mtp0MgWB5OcupHhzV0u4jH3HU/KBsuKbyyxFbt9yVkpN+n+J+Xhl 2irZq5qh4EQI4VeTcPSNBJitH2CsNbimShA/ZUDQ7FPuxwpKe9yK4/qpaCPHX34j31QN dQ3w== X-Forwarded-Encrypted: i=1; AJvYcCXjIvKHiMJWZ9TbebGGRCvkOXTWR1dYGgXXGXycmeXXWqvg/6ZFsWlFCZJ58P9Dksd8g5ZSVw==@lists.linux.dev X-Gm-Message-State: AOJu0YwO7zdGhjTfolsYysDfFBYAW+hoVkRQ5T3eLh9A5ZPzFILaG+dp n7psDwOVPaXmjgprHpKDbrriC1TQ+tLwf6vG3PLrBItnHxr1AwaFmKLljq/BFnXAXA== X-Gm-Gg: ATEYQzyy2gCXtwNbjL7+xDhwcJnbKZlrhh0ydqzoTbfBLSUsZ1A6U3PKPb7w5MC3SvC ilbuG4kKHjEHfdn4qm8K4ffJS52Wt4iqeS/plM/f32etOZ2T0LTxfZ49QO8jDTBjb7CaZtNGw0R Vd7tJbFOLqgoTRtZL6n2aEB5nH/5sbSP2fL948HKenh5yEIfDtmeeMBPCSZdSIEKnpurGYSzcbt GemDC+lBXqwriefXK6ocgd/JLf4nrJBdWngSGx3js17zVGfem6N5U9O8/+H2M08vvS4IoHxlgvR hHS8iBRLiLtrQgILSCG7ze3KXFRiOVxJGT46W+Q7xsMgeefq9mMyvrAkjfyqEOS2Fa5oIGZwDBB F4x0rZ7B3XRZrXfyCTZy5Qxvxl1xxfUIP4u8h6JUWxHCPfNxUnlkdmXccXXNyJZEBwIC2uHXFYR MYmkxzT/LeBitf30MtrcLqaUAxzVyWKoIczWfsP0gIC1BHhZkulsgEpJN0HD3geEEkuDoa X-Received: by 2002:a17:902:d48d:b0:2b0:7a9b:82f3 with SMTP id d9443c01a7336-2b0bf525ef0mr164585ad.8.1774472741940; Wed, 25 Mar 2026 14:05:41 -0700 (PDT) Received: from google.com (10.129.124.34.bc.googleusercontent.com. [34.124.129.10]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0bc783099sm9870465ad.18.2026.03.25.14.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 14:05:41 -0700 (PDT) Date: Wed, 25 Mar 2026 21:05:32 +0000 From: Pranjal Shrivastava To: Samiullah Khawaja Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Jason Gunthorpe , Robin Murphy , Kevin Tian , Alex Williamson , Shuah Khan , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Saeed Mahameed , Adithya Jayachandran , Parav Pandit , Leon Romanovsky , William Tu , Pratyush Yadav , Pasha Tatashin , David Matlack , Andrew Morton , Chris Li , Vipin Sharma , YiFei Zhu Subject: Re: [PATCH 14/14] iommufd/selftest: Add test to verify iommufd preservation Message-ID: References: <20260203220948.2176157-1-skhawaja@google.com> <20260203220948.2176157-15-skhawaja@google.com> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260203220948.2176157-15-skhawaja@google.com> On Tue, Feb 03, 2026 at 10:09:48PM +0000, Samiullah Khawaja wrote: > Test iommufd preservation by setting up an iommufd and vfio cdev and > preserve it across live update. Test takes VFIO cdev path of a device > bound to vfio-pci driver and binds it to an iommufd being preserved. It > also preserves the vfio cdev so the iommufd state associated with it is > also preserved. > > The restore path is tested by restoring the preserved vfio cdev only. > Test tries to finish the session without restoring iommufd and confirms > that it fails. > > Signed-off-by: Samiullah Khawaja > Signed-off-by: YiFei Zhu > --- > tools/testing/selftests/iommu/Makefile | 12 + > .../selftests/iommu/iommufd_liveupdate.c | 209 ++++++++++++++++++ > 2 files changed, 221 insertions(+) > create mode 100644 tools/testing/selftests/iommu/iommufd_liveupdate.c > > diff --git a/tools/testing/selftests/iommu/Makefile b/tools/testing/selftests/iommu/Makefile > index 84abeb2f0949..263195af4d6a 100644 > --- a/tools/testing/selftests/iommu/Makefile > +++ b/tools/testing/selftests/iommu/Makefile > @@ -7,4 +7,16 @@ TEST_GEN_PROGS := > TEST_GEN_PROGS += iommufd > TEST_GEN_PROGS += iommufd_fail_nth > > +TEST_GEN_PROGS_EXTENDED += iommufd_liveupdate > + > include ../lib.mk > +include ../liveupdate/lib/libliveupdate.mk > + > +CFLAGS += -I$(top_srcdir)/tools/include > +CFLAGS += -MD > +CFLAGS += $(EXTRA_CFLAGS) > + > +$(TEST_GEN_PROGS_EXTENDED): %: %.o $(LIBLIVEUPDATE_O) > + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $< $(LIBLIVEUPDATE_O) $(LDLIBS) -static -o $@ > + > +EXTRA_CLEAN += $(LIBLIVEUPDATE_O) > diff --git a/tools/testing/selftests/iommu/iommufd_liveupdate.c b/tools/testing/selftests/iommu/iommufd_liveupdate.c > new file mode 100644 > index 000000000000..8b4ea9f2b7e9 > --- /dev/null > +++ b/tools/testing/selftests/iommu/iommufd_liveupdate.c > @@ -0,0 +1,209 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +/* > + * Copyright (c) 2025, Google LLC. > + * Samiullah Khawaja > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#define __EXPORTED_HEADERS__ > +#include > +#include > +#include > +#include > +#include > + > +#include "../kselftest.h" > + > +#define ksft_assert(condition) \ > + do { if (!(condition)) \ > + ksft_exit_fail_msg("Failed: %s at %s %d: %s\n", \ > + #condition, __FILE__, __LINE__, strerror(errno)); } while (0) > + > +int setup_cdev(const char *vfio_cdev_path) > +{ > + int cdev_fd; > + > + cdev_fd = open(vfio_cdev_path, O_RDWR); > + if (cdev_fd < 0) > + ksft_exit_skip("Failed to open VFIO cdev: %s\n", vfio_cdev_path); > + > + return cdev_fd; > +} > + > +int open_iommufd(void) > +{ > + int iommufd; > + > + iommufd = open("/dev/iommu", O_RDWR); > + if (iommufd < 0) > + ksft_exit_skip("Failed to open /dev/iommu. IOMMUFD support not enabled.\n"); > + > + return iommufd; > +} > + > +int setup_iommufd(int iommufd, int memfd, int cdev_fd, int hwpt_token) > +{ > + int ret; > + > + struct vfio_device_bind_iommufd bind = { > + .argsz = sizeof(bind), > + .flags = 0, > + }; > + struct iommu_ioas_alloc alloc_data = { > + .size = sizeof(alloc_data), > + .flags = 0, > + }; > + struct iommu_hwpt_alloc hwpt_alloc = { > + .size = sizeof(hwpt_alloc), > + .flags = 0, > + }; > + struct vfio_device_attach_iommufd_pt attach_data = { > + .argsz = sizeof(attach_data), > + .flags = 0, > + }; > + struct iommu_hwpt_lu_set_preserve set_preserve = { > + .size = sizeof(set_preserve), > + .hwpt_token = hwpt_token, > + }; > + struct iommu_ioas_map_file map_file = { > + .size = sizeof(map_file), > + .length = SZ_1M, > + .flags = IOMMU_IOAS_MAP_WRITEABLE | IOMMU_IOAS_MAP_READABLE, > + .iova = SZ_4G, > + .fd = memfd, > + .start = 0, > + }; > + > + bind.iommufd = iommufd; > + ret = ioctl(cdev_fd, VFIO_DEVICE_BIND_IOMMUFD, &bind); > + ksft_assert(!ret); > + > + ret = ioctl(iommufd, IOMMU_IOAS_ALLOC, &alloc_data); > + ksft_assert(!ret); > + > + hwpt_alloc.dev_id = bind.out_devid; > + hwpt_alloc.pt_id = alloc_data.out_ioas_id; > + ret = ioctl(iommufd, IOMMU_HWPT_ALLOC, &hwpt_alloc); > + ksft_assert(!ret); > + > + attach_data.pt_id = hwpt_alloc.out_hwpt_id; > + ret = ioctl(cdev_fd, VFIO_DEVICE_ATTACH_IOMMUFD_PT, &attach_data); > + ksft_assert(!ret); > + > + map_file.ioas_id = alloc_data.out_ioas_id; > + ret = ioctl(iommufd, IOMMU_IOAS_MAP_FILE, &map_file); > + ksft_assert(!ret); > + > + set_preserve.hwpt_id = attach_data.pt_id; > + ret = ioctl(iommufd, IOMMU_HWPT_LU_SET_PRESERVE, &set_preserve); > + ksft_assert(!ret); > + > + return ret; > +} > + > +static int create_sealed_memfd(size_t size) > +{ > + int fd, ret; > + > + fd = memfd_create("buffer", MFD_ALLOW_SEALING); > + ksft_assert(fd > 0); > + > + ret = ftruncate(fd, size); > + ksft_assert(!ret); > + > + ret = fcntl(fd, F_ADD_SEALS, > + F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEAL); > + ksft_assert(!ret); > + > + return fd; > +} > + > +int main(int argc, char *argv[]) The iommufd selftest directory heavily utilizes the standard kselftest harness (TEST_F, EXPECT_EQ, ASSERT_EQ), by writing a raw main(), this patch circumvents the standard test reporting structure (like returning 1 on argc < 2 instead of ksft_exit_skip(), and returning 0 at the end instead of ksft_exit_pass() etc.). We should rewrite this cleanly following the existing iommufd test infrastructure using TEST_F blocks. > +{ > + int iommufd, cdev_fd, memfd, luo, session, ret; > + const int token = 0x123456; > + const int cdev_token = 0x654321; > + const int hwpt_token = 0x789012; > + const int memfd_token = 0x890123; Shouldn't these be u64? Defining them as signed int-s undermines that contract? > + > + if (argc < 2) { > + printf("Usage: ./iommufd_liveupdate \n"); > + return 1; > + } > + > + luo = luo_open_device(); > + ksft_assert(luo > 0); > + > + session = luo_retrieve_session(luo, "iommufd-test"); [ ---- >8 ---- ] Thanks, Praan