Skip to content

Commit ea2affa

Browse files
committed
Merge: selftests/mm: va_high_addr_switch: reduce test noise
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6683 JIRA: https://issues.redhat.com/browse/RHEL-85318 This backports two commits: 7f77300 ("selftest/mm: va_high_addr_switch: add ppc64 support check") f4b0663 ("selftests/mm: va_high_addr_switch: reduce test noise") Signed-off-by: Li Wang <[email protected]> Approved-by: Waiman Long <[email protected]> Approved-by: Rafael Aquini <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 1fa6aa6 + 7f77300 commit ea2affa

File tree

1 file changed

+28
-4
lines changed

1 file changed

+28
-4
lines changed

tools/testing/selftests/mm/va_high_addr_switch.sh

+28-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,31 @@ check_supported_x86_64()
4141
fi
4242
}
4343

44+
check_supported_ppc64()
45+
{
46+
local config="/proc/config.gz"
47+
[[ -f "${config}" ]] || config="/boot/config-$(uname -r)"
48+
[[ -f "${config}" ]] || fail "Cannot find kernel config in /proc or /boot"
49+
50+
local pg_table_levels=$(gzip -dcfq "${config}" | grep PGTABLE_LEVELS | cut -d'=' -f 2)
51+
if [[ "${pg_table_levels}" -lt 5 ]]; then
52+
echo "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
53+
exit $ksft_skip
54+
fi
55+
56+
local mmu_support=$(grep -m1 "mmu" /proc/cpuinfo | awk '{print $3}')
57+
if [[ "$mmu_support" != "radix" ]]; then
58+
echo "$0: System does not use Radix MMU, required for 5-level paging"
59+
exit $ksft_skip
60+
fi
61+
62+
local hugepages_total=$(awk '/HugePages_Total/ {print $2}' /proc/meminfo)
63+
if [[ "${hugepages_total}" -eq 0 ]]; then
64+
echo "$0: HugePages are not enabled, required for some tests"
65+
exit $ksft_skip
66+
fi
67+
}
68+
4469
check_test_requirements()
4570
{
4671
# The test supports x86_64 and powerpc64. We currently have no useful
@@ -50,15 +75,14 @@ check_test_requirements()
5075
"x86_64")
5176
check_supported_x86_64
5277
;;
78+
"ppc64le"|"ppc64")
79+
check_supported_ppc64
80+
;;
5381
*)
5482
return 0
5583
;;
5684
esac
5785
}
5886

5987
check_test_requirements
60-
./va_high_addr_switch
61-
62-
# In order to run hugetlb testcases, "--run-hugetlb" must be appended
63-
# to the binary.
6488
./va_high_addr_switch --run-hugetlb

0 commit comments

Comments
 (0)