From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 4EA1D31B11C for ; Wed, 15 Oct 2025 09:53:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760522027; cv=none; b=Z0t04HgCgcsGpwja6UZVecvGZZjF8L2UGaeIlzitmplaY2PnMSJRNEhILiCM2ptUjQ2s14U/qIZAv89hUDpUSnxMAnOyeWK9olzqFT+K5mTaR+cU79M12LsR4/6yzVMeV6q4JZ10Z9b0Nsf/vH9PbKnFVPuyxtUZY+YOMixpnMQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760522027; c=relaxed/simple; bh=hIpIf/kcDm0kf0s0kJz+D/awRvsLxaY8T7qYUgQsLLM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=UlNq72/Sbo/SdVkAn3ytyqRxwNV5sDJtfSBJjrcZzzgbO8deCk2JTUuw4I11CR6z4C0wjQOsk3kjWnzaOG1I3gWMA5s4Z2qg5CwlJ4hRnlDcB/ChdX8YGhlp0r/kIzwzfTyNQIX6G8uN+DmcEFgm3yE1/naAd2xxbc/xFD0YgOU= 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=BCv8TeJ2; arc=none smtp.client-ip=209.85.128.49 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="BCv8TeJ2" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-47105bbb8d9so23135e9.1 for ; Wed, 15 Oct 2025 02:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760522023; x=1761126823; darn=vger.kernel.org; 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=UC129mfOqt4svCEhsCGr7Ui4bow4e4J9G+P0XmQlpKM=; b=BCv8TeJ2atdhYi+2SRK3GeZ6lX6nygLDnbY+RyQ65h4eEyephrk5aji00QauFtDQHi xG8VZ50XN6dQGyU/iAYva5bXkw9uGsiAlnRr6BeoX+yDI/hSgIazB9HWSSdr9M77/tSo SuNLkh5tuYSoO3iKdMpNbSR0kJIqy+9684AhMc7tk0i/yJfvz1oC3fH6AP3ur4HuoIoh EqnFNAmwbeHObRIVkwhqPouRmsVqXsl4530gF/mpgsp926D/2mZYvJi1uGl0Wr9ofQmi GM4BeW9AD1pbPRCil5jSqs5+T+FQ5XZXlMb/Ek6oIlH9lVlEHvz9YNRJC39cHK0b2z7u wpWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760522023; x=1761126823; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=UC129mfOqt4svCEhsCGr7Ui4bow4e4J9G+P0XmQlpKM=; b=QdOY9y37oQmxrJdV0NA5cr69CQr2Hxvm6q30lqVaFWT2Aec9Ti0bWFkst5qtpHgZ1o NfGZLR/2HoidBHYLFSMFGSehuhN+PrJJV0Un86SQzsuvgjUIeBVn03Z5xXHwOWvX1eUN 8p8U4To2eRVv/LDP0CINRMHhy+apX+aQo/4yU6xE+lE1DWjViL546pKXER+0inrcH5pj Vt01SFfFb6MH/uZn7MqX/uM8CuqritTDoPN9/jtkpBeEnJUP9XNR0yQViUo/ZzzFeokx pdp9llQehRc87ataYSPJ6ZAcfODLsKE1AlrDDfRaMjkFUPzPUUEbzSvcXom1JKXhhp5z kSFQ== X-Forwarded-Encrypted: i=1; AJvYcCXv7vrufK9HXEjOrGs6seo8gowvRp6a4WHD9xsfFggna1PH50aW7bifK2Wh/RKg5yl48TGPR0RIRDpOlu8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6ku8A8ZK5a0SXHXis63YqItnd380CsXpZZZcK8vOOhbiguoYt cvNKcRPDxHk6BqFO2ZDXPmRb3lQptKJtPOhcS5kMAsEfYWv1dpYw8Sx3REjB1hCQhg== X-Gm-Gg: ASbGncvLhIyg7laMjoVj7oamCB+fYjh0DcEh0g56AIM6xbDI4q/liouUfAKnWNrTlvm 2tI7wgjONuRVuLwjOMewYx3LIX4t7kh0ervAl6UAYnvGuZthIu3ZhCSqa2LQ603csit/Va1OvE9 VJ9QAiSC6JzdSIalUsYpRGcwgZdZzl8p4BypA2TVNr8EGRHybEvB1FtKppFGpAczh+jHEWsqGr3 gNUm0cElc552YIEtKMW6dVOTYxL+DX4U5XZK9lSGbTaPQxO492OxmBJPXAM9ZoaWULZgsXTZ38u H+0bRj4AhWvKbWkYBEvjy83GaMvIKm5X7P46Q2+2l0k5K5497ge+twNOq4/bljG8BNHlXwXGZDv EFO0VBfHK3ddrVaktBLcGRMUVhQEhsajOUY+EfWJsVKWyryAoRZyCr5PJI9lBbraiR8NY2XRh7b kwP7UKKtfBOLNSvcGGWYOW X-Google-Smtp-Source: AGHT+IHe1E1s7HUbEkXph4hxdxNH+oQJI3gWsBL77vTsMzihUgBJOr2SIJMGce02dMVTe2csEDSXCQ== X-Received: by 2002:a05:600c:4706:b0:45f:2940:d194 with SMTP id 5b1f17b1804b1-470fd61e6dbmr1731065e9.2.1760522023158; Wed, 15 Oct 2025 02:53:43 -0700 (PDT) Received: from google.com (140.240.76.34.bc.googleusercontent.com. [34.76.240.140]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb482b9absm332974755e9.2.2025.10.15.02.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Oct 2025 02:53:42 -0700 (PDT) Date: Wed, 15 Oct 2025 09:53:39 +0000 From: Mostafa Saleh To: Robin Murphy Cc: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will@kernel.org, joro@8bytes.org, jgg@ziepe.ca, praan@google.com, Jason Gunthorpe Subject: Re: [PATCH v5 4/4] iommu/io-pgtable-arm-selftests: Use KUnit Message-ID: References: <20250929155001.3287719-1-smostafa@google.com> <20250929155001.3287719-5-smostafa@google.com> <86ca3918-4992-41a2-894f-f1fd8ce4121f@arm.com> 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=us-ascii Content-Disposition: inline In-Reply-To: <86ca3918-4992-41a2-894f-f1fd8ce4121f@arm.com> On Tue, Oct 14, 2025 at 02:43:53PM +0100, Robin Murphy wrote: > On 2025-09-29 4:49 pm, Mostafa Saleh wrote: > > Integrate the selftests as part of kunit. > > > > Now instead of the test only being run at boot, it can run: > > > > - With CONFIG_IOMMU_IO_PGTABLE_LPAE_KUNIT_TEST=y > > It will automatically run at boot as before. > > > > - Otherwise with CONFIG_IOMMU_IO_PGTABLE_KUNIT_TEST=m: > > 1) on module load: > > Once the module load the self test will run > > # modprobe io-pgtable-arm-selftests > > > > 2) debugfs > > With CONFIG_KUNIT_DEBUGFS=y You can run the test with > > # echo 1 > /sys/kernel/debug/kunit/io-pgtable-arm-test/run > > > > 3) Using kunit.py > > You can also use the helper script which uses Qemu in the background > > > > # ./tools/testing/kunit/kunit.py run --build_dir build_kunit_arm64 --arch arm64 \ > > --make_options LLVM=1 --kunitconfig ./kunit/kunitconfig > > [18:01:09] ============= io-pgtable-arm-test (1 subtest) ============== > > [18:01:09] [PASSED] arm_lpae_do_selftests > > [18:01:09] =============== [PASSED] io-pgtable-arm-test =============== > > [18:01:09] ============================================================ > > > > Suggested-by: Jason Gunthorpe > > Reviewed-by: Jason Gunthorpe > > Reviewed-by: Pranjal Shrivastava > > Signed-off-by: Mostafa Saleh > > --- > > drivers/iommu/Kconfig | 11 ++-- > > drivers/iommu/Makefile | 2 +- > > drivers/iommu/io-pgtable-arm-selftests.c | 82 +++++++++++++----------- > > 3 files changed, 51 insertions(+), 44 deletions(-) > > > > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig > > index 553522ef3ca9..d50685433347 100644 > > --- a/drivers/iommu/Kconfig > > +++ b/drivers/iommu/Kconfig > > @@ -40,12 +40,13 @@ config IOMMU_IO_PGTABLE_LPAE > > sizes at both stage-1 and stage-2, as well as address spaces > > up to 48-bits in size. > > -config IOMMU_IO_PGTABLE_LPAE_SELFTEST > > - tristate "LPAE selftests" > > - depends on IOMMU_IO_PGTABLE_LPAE > > +config IOMMU_IO_PGTABLE_LPAE_KUNIT_TEST > > + tristate "KUnit tests for LPAE" > > + depends on IOMMU_IO_PGTABLE_LPAE && KUNIT > > + default KUNIT_ALL_TESTS > > help > > - Enable self-tests for LPAE page table allocator. This performs > > - a series of page-table consistency checks during boot. > > + Enable kunit tests for LPAE page table allocator. This performs > > + a series of page-table consistency checks. > > If unsure, say N here. > > diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile > > index 5250a2eea13f..ac3851570303 100644 > > --- a/drivers/iommu/Makefile > > +++ b/drivers/iommu/Makefile > > @@ -12,7 +12,7 @@ obj-$(CONFIG_IOMMU_DMA) += dma-iommu.o > > obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o > > obj-$(CONFIG_IOMMU_IO_PGTABLE_ARMV7S) += io-pgtable-arm-v7s.o > > obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o > > -obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST) += io-pgtable-arm-selftests.o > > +obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE_KUNIT_TEST) += io-pgtable-arm-selftests.o > > obj-$(CONFIG_IOMMU_IO_PGTABLE_DART) += io-pgtable-dart.o > > obj-$(CONFIG_IOMMU_IOVA) += iova.o > > obj-$(CONFIG_OF_IOMMU) += of_iommu.o > > diff --git a/drivers/iommu/io-pgtable-arm-selftests.c b/drivers/iommu/io-pgtable-arm-selftests.c > > index 32c6a5c7af53..b61849a8a685 100644 > > --- a/drivers/iommu/io-pgtable-arm-selftests.c > > +++ b/drivers/iommu/io-pgtable-arm-selftests.c > > @@ -6,7 +6,8 @@ > > * > > * Author: Will Deacon > > */ > > -#include > > +#include > > +#include > > #include > > #include > > @@ -47,13 +48,14 @@ static void arm_lpae_dump_ops(struct io_pgtable_ops *ops) > > cfg->pgsize_bitmap, cfg->ias, cfg->oas); > > } > > -#define __FAIL(ops, i) ({ \ > > - WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \ > > - arm_lpae_dump_ops(ops); \ > > - -EFAULT; \ > > +#define __FAIL(test, ops, i) ({ \ > > + KUNIT_FAIL(test, ""); \ > > + kunit_err(test, "selftest: test failed for fmt idx %d\n", (i)); \ > > This looks suspect - AFAICS open-coded kunit_err() is intended for test > infrastucture errors (like the allocation in the next hunk below), while for > an actual test report message it seems it should just be: > > KUNIT_FAIL(test, "selftest: test failed for fmt idx %d\n", (i)); I see, I used kunit_err, as KUNIT_FAIL adds extra information which was noisy to be printed more than once as: # arm_lpae_do_selftests: EXPECTATION FAILED at drivers/iommu/io-pgtable-arm-selftests.c:91 I will check if there is a better way to do this. > > > + arm_lpae_dump_ops(ops); \ > > + -EFAULT; \ > > }) > > -static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > +static int arm_lpae_run_tests(struct kunit *test, struct io_pgtable_cfg *cfg) > > { > > static const enum io_pgtable_fmt fmts[] = { > > ARM_64_LPAE_S1, > > @@ -69,7 +71,7 @@ static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > cfg_cookie = cfg; > > ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg); > > if (!ops) { > > - pr_err("selftest: failed to allocate io pgtable ops\n"); > > + kunit_err(test, "selftest: failed to allocate io pgtable ops\n"); > > return -ENOMEM; > > } > > @@ -78,13 +80,13 @@ static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > * Empty page tables shouldn't provide any translations. > > */ > > if (ops->iova_to_phys(ops, 42)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (ops->iova_to_phys(ops, SZ_1G + 42)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (ops->iova_to_phys(ops, SZ_2G + 42)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > /* > > * Distinct mappings of different granule sizes. > > @@ -97,16 +99,16 @@ static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > IOMMU_READ | IOMMU_WRITE | > > IOMMU_NOEXEC | IOMMU_CACHE, > > GFP_KERNEL, &mapped)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > /* Overlapping mappings */ > > if (!ops->map_pages(ops, iova, iova + size, size, 1, > > IOMMU_READ | IOMMU_NOEXEC, > > GFP_KERNEL, &mapped)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (ops->iova_to_phys(ops, iova + 42) != (iova + 42)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > iova += SZ_1G; > > } > > @@ -117,18 +119,18 @@ static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > size = 1UL << j; > > if (ops->unmap_pages(ops, iova, size, 1, NULL) != size) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (ops->iova_to_phys(ops, iova + 42)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > /* Remap full block */ > > if (ops->map_pages(ops, iova, iova, size, 1, > > IOMMU_WRITE, GFP_KERNEL, &mapped)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (ops->iova_to_phys(ops, iova + 42) != (iova + 42)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > iova += SZ_1G; > > } > > @@ -144,11 +146,11 @@ static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > IOMMU_READ | IOMMU_WRITE | > > IOMMU_NOEXEC | IOMMU_CACHE, > > GFP_KERNEL, &mapped)) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (mapped != size) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > if (ops->unmap_pages(ops, iova, size, 1, NULL) != size) > > - return __FAIL(ops, i); > > + return __FAIL(test, ops, i); > > free_io_pgtable_ops(ops); > > } > > @@ -156,7 +158,7 @@ static int arm_lpae_run_tests(struct io_pgtable_cfg *cfg) > > return 0; > > } > > -static int arm_lpae_do_selftests(void) > > +static void arm_lpae_do_selftests(struct kunit *test) > > { > > static const unsigned long pgsize[] = { > > SZ_4K | SZ_2M | SZ_1G, > > @@ -169,18 +171,19 @@ static int arm_lpae_do_selftests(void) > > }; > > int i, j, k, pass = 0, fail = 0; > > - struct faux_device *dev; > > + struct device *dev; > > struct io_pgtable_cfg cfg = { > > .tlb = &dummy_tlb_ops, > > .coherent_walk = true, > > .quirks = IO_PGTABLE_QUIRK_NO_WARN, > > }; > > - dev = faux_device_create("io-pgtable-test", NULL, 0); > > - if (!dev) > > - return -ENOMEM; > > + dev = kunit_device_register(test, "io-pgtable-test"); > > + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, dev); > > Conversely, this is infrastructure, not an actual test of expected > io-pgtable behaviour, so I think just: > > cfg.iommu_dev = kunit_device_register(test, "io-pgtable-test"); > if (IS_ERR(cfg.iommu_dev)) > return; > > (it doesn't return NULLs either) > Yes, I was not sure about this one, when checking the code base, every test handles kunit_device_register() failure differently, this seemed the most strict one so I used it, I will update that in the next version. > Otherwise, there's clearly scope for plenty more follow-up work streamlining > and breaking the whole thing up into KUnit idioms, pulling the v7s test in, > etc... However as a first step to at least set things firmly on the right > KUnit-shaped path, I agree this seems enough for now. > I agree, ultimately every configuration should be a test, which can be even broken down to smaller cases. I will look in to that next. Thanks, Mostafa > Thanks, > Robin. > > > + if (IS_ERR_OR_NULL(dev)) > > + return; > > - cfg.iommu_dev = &dev->dev; > > + cfg.iommu_dev = dev; > > for (i = 0; i < ARRAY_SIZE(pgsize); ++i) { > > for (j = 0; j < ARRAY_SIZE(address_size); ++j) { > > @@ -189,9 +192,9 @@ static int arm_lpae_do_selftests(void) > > cfg.pgsize_bitmap = pgsize[i]; > > cfg.ias = address_size[k]; > > cfg.oas = address_size[j]; > > - pr_info("selftest: pgsize_bitmap 0x%08lx, IAS %u OAS %u\n", > > - pgsize[i], cfg.ias, cfg.oas); > > - if (arm_lpae_run_tests(&cfg)) > > + kunit_info(test, "selftest: pgsize_bitmap 0x%08lx, IAS %u OAS %u\n", > > + pgsize[i], cfg.ias, cfg.oas); > > + if (arm_lpae_run_tests(test, &cfg)) > > fail++; > > else > > pass++; > > @@ -199,17 +202,20 @@ static int arm_lpae_do_selftests(void) > > } > > } > > - pr_info("selftest: completed with %d PASS %d FAIL\n", pass, fail); > > - faux_device_destroy(dev); > > - > > - return fail ? -EFAULT : 0; > > + kunit_info(test, "selftest: completed with %d PASS %d FAIL\n", pass, fail); > > } > > -static void arm_lpae_exit_selftests(void) > > -{ > > -} > > +static struct kunit_case io_pgtable_arm_test_cases[] = { > > + KUNIT_CASE(arm_lpae_do_selftests), > > + {}, > > +}; > > + > > +static struct kunit_suite io_pgtable_arm_test = { > > + .name = "io-pgtable-arm-test", > > + .test_cases = io_pgtable_arm_test_cases, > > +}; > > + > > +kunit_test_suite(io_pgtable_arm_test); > > -subsys_initcall(arm_lpae_do_selftests); > > -module_exit(arm_lpae_exit_selftests); > > MODULE_DESCRIPTION("io-pgtable-arm library selftest"); > > MODULE_LICENSE("GPL");