2023-06-29 09:12:18

by Ricardo Cañuelo

Subject: [RESEND PATCH] selftests/mincore: fix skip condition for check_huge_pages test

The check_huge_pages test was failing instead of skipping on qemu-armv7
because the skip condition wasn't handled properly. Add an additional
check to fix it.

Signed-off-by: Ricardo Cañuelo <[email protected]>
Reported-by: Naresh Kamboju <[email protected]>
Reported-by: Linux Kernel Functional Testing <[email protected]>
Reviewed-by: Muhammad Usama Anjum <[email protected]>
Tested-by: Anders Roxell <[email protected]>
Closes: https://lore.kernel.org/all/CA+G9fYuoB8Ug8PcTU-YGmemL7_eeEksXFihvxWF6OikD7sK7pA@mail.gmail.com
---
tools/testing/selftests/mincore/mincore_selftest.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/mincore/mincore_selftest.c b/tools/testing/selftests/mincore/mincore_selftest.c
index 4c88238fc8f0..6fb3eea5b6ee 100644
--- a/tools/testing/selftests/mincore/mincore_selftest.c
+++ b/tools/testing/selftests/mincore/mincore_selftest.c
@@ -150,8 +149,8 @@ TEST(check_huge_pages)
MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,
-1, 0);
if (addr == MAP_FAILED) {
- if (errno == ENOMEM)
- SKIP(return, "No huge pages available.");
+ if (errno == ENOMEM || errno == EINVAL)
+ SKIP(return, "No huge pages available or CONFIG_HUGETLB_PAGE disabled.");
else
TH_LOG("mmap error: %s", strerror(errno));
}
--
2.25.1

2023-07-13 16:03:19

by Shuah Khan

Subject: Re: [RESEND PATCH] selftests/mincore: fix skip condition for check_huge_pages test

On 6/29/23 02:35, Ricardo Cañuelo wrote:
> The check_huge_pages test was failing instead of skipping on qemu-armv7
> because the skip condition wasn't handled properly. Add an additional
> check to fix it.
>
> Signed-off-by: Ricardo Cañuelo <[email protected]>
> Reported-by: Naresh Kamboju <[email protected]>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Reviewed-by: Muhammad Usama Anjum <[email protected]>
> Tested-by: Anders Roxell <[email protected]>
> Closes: https://lore.kernel.org/all/CA+G9fYuoB8Ug8PcTU-YGmemL7_eeEksXFihvxWF6OikD7sK7pA@mail.gmail.com
> ---
> tools/testing/selftests/mincore/mincore_selftest.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>

Thank you for the patch and sorry for the delay due to conference
travel and vacation.

Will be queued for the next rc.

thanks,
-- Shuah