2024-02-22 07:49:28

by Muhammad Usama Anjum

Subject: [PATCH] selftests/iommu: fix the config fragment

The config fragment doesn't follow the correct format to enable those
config options which make the config options getting missed while
merging with other configs.

➜ merge_config.sh -m .config tools/testing/selftests/iommu/config
Using .config as base
Merging tools/testing/selftests/iommu/config
➜ make olddefconfig
config:5295:warning: unexpected data: CONFIG_IOMMUFD
config:5296:warning: unexpected data: CONFIG_IOMMUFD_TEST

While at it, add CONFIG_FAULT_INJECTION as well which is needed for
CONFIG_IOMMUFD_TEST. If CONFIG_FAULT_INJECTION isn't present in base
config (such as x86 defconfig), CONFIG_IOMMUFD_TEST doesn't get enabled.

Fixes: 57f0988706fe ("iommufd: Add a selftest")
Signed-off-by: Muhammad Usama Anjum <[email protected]>
---
tools/testing/selftests/iommu/config | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/iommu/config b/tools/testing/selftests/iommu/config
index 6c4f901d6fed3..110d73917615d 100644
--- a/tools/testing/selftests/iommu/config
+++ b/tools/testing/selftests/iommu/config
@@ -1,2 +1,3 @@
-CONFIG_IOMMUFD
-CONFIG_IOMMUFD_TEST
+CONFIG_IOMMUFD=y
+CONFIG_FAULT_INJECTION=y
+CONFIG_IOMMUFD_TEST=y
--
2.42.0

2024-02-22 13:02:55

by Jason Gunthorpe

Subject: Re: [PATCH] selftests/iommu: fix the config fragment

On Thu, Feb 22, 2024 at 12:49:33PM +0500, Muhammad Usama Anjum wrote:
> The config fragment doesn't follow the correct format to enable those
> config options which make the config options getting missed while
> merging with other configs.
>
> ➜ merge_config.sh -m .config tools/testing/selftests/iommu/config
> Using .config as base
> Merging tools/testing/selftests/iommu/config
> ➜ make olddefconfig
> .config:5295:warning: unexpected data: CONFIG_IOMMUFD
> .config:5296:warning: unexpected data: CONFIG_IOMMUFD_TEST
>
> While at it, add CONFIG_FAULT_INJECTION as well which is needed for
> CONFIG_IOMMUFD_TEST. If CONFIG_FAULT_INJECTION isn't present in base
> config (such as x86 defconfig), CONFIG_IOMMUFD_TEST doesn't get enabled.
>
> Fixes: 57f0988706fe ("iommufd: Add a selftest")
> Signed-off-by: Muhammad Usama Anjum <[email protected]>
> ---
> tools/testing/selftests/iommu/config | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)

Appled, thanks

Jason