[116/127] selftests/vm/pkeys: fix assertion in test_pkey_alloc_exhaust()

Commit Message

Andrew Morton June 4, 2020, 11:52 p.m. UTC

From: Ram Pai <[e-mail]>
Subject: selftests/vm/pkeys: fix assertion in test_pkey_alloc_exhaust()

Some pkeys which are valid on the hardware are reserved and not available
for application use.  These keys cannot be allocated.

test_pkey_alloc_exhaust() tries to account for these and has an assertion
which validates if all available pkeys have been exahaustively allocated. 
However, the expression that is currently used is only valid for x86.  On
powerpc, a pkey is additionally reserved as compared to x86.  Hence, the
assertion is made to use an arch-specific helper to get the correct count
of reserved pkeys.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Ram Pai <[e-mail]>
Signed-off-by: Sandipan Das <[e-mail]>
Acked-by: Dave Hansen <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Florian Weimer <[e-mail]>
Cc: "Desnes A. Nunes do Rosario" <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Thiago Jung Bauermann <[e-mail]>
Cc: "Aneesh Kumar K.V" <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Michal Suchanek <[e-mail]>
Cc: Shuah Khan <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 tools/testing/selftests/vm/protection_keys.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Patch

--- a/tools/testing/selftests/vm/protection_keys.c~selftests-vm-pkeys-fix-assertion-in-test_pkey_alloc_exhaust
+++ a/tools/testing/selftests/vm/protection_keys.c
@@ -1153,6 +1153,7 @@  void test_pkey_alloc_exhaust(int *ptr, u
 	dprintf3("%s()::%d\n", __func__, __LINE__);
 
 	/*
+	 * On x86:
 	 * There are 16 pkeys supported in hardware.  Three are
 	 * allocated by the time we get here:
 	 *   1. The default key (0)
@@ -1160,8 +1161,16 @@  void test_pkey_alloc_exhaust(int *ptr, u
 	 *   3. One allocated by the test code and passed in via
 	 *      'pkey' to this function.
 	 * Ensure that we can allocate at least another 13 (16-3).
+	 *
+	 * On powerpc:
+	 * There are either 5, 28, 29 or 32 pkeys supported in
+	 * hardware depending on the page size (4K or 64K) and
+	 * platform (powernv or powervm). Four are allocated by
+	 * the time we get here. These include pkey-0, pkey-1,
+	 * exec-only pkey and the one allocated by the test code.
+	 * Ensure that we can allocate the remaining.
 	 */
-	pkey_assert(i >= NR_PKEYS-3);
+	pkey_assert(i >= (NR_PKEYS - get_arch_reserved_keys() - 1));
 
 	for (i = 0; i < nr_allocated_pkeys; i++) {
 		err = sys_pkey_free(allocated_pkeys[i]);