From: Sandipan Das <sandipan@linux.ibm.com>
To: akpm@linux-foundation.org
Cc: linux-kselftest@vger.kernel.org, linux-arch@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, x86@kernel.org,
linux-mm@kvack.org, fweimer@redhat.com, linuxram@us.ibm.com,
mhocko@kernel.org, mingo@redhat.com, aneesh.kumar@linux.ibm.com,
bauerman@linux.ibm.com, msuchanek@suse.de, mpe@ellerman.id.au,
shuah@kernel.org, Dave Hansen <dave.hansen@intel.com>
Subject: [PATCH v19 15/24] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust()
Date: Tue, 31 Mar 2020 15:28:16 +0530 [thread overview]
Message-ID: <38b08d0318820ae46af3aa6048384fd8056c3df7.1585646528.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1585646528.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1585646528.git.sandipan@linux.ibm.com>
From: Ram Pai <linuxram@us.ibm.com>
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.
cc: Dave Hansen <dave.hansen@intel.com>
cc: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
Acked-by: Dave Hansen <dave.hansen@intel.com>
---
tools/testing/selftests/vm/protection_keys.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index e6de078a9196f..5fcbbc525364e 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -1153,6 +1153,7 @@ void test_pkey_alloc_exhaust(int *ptr, u16 pkey)
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, u16 pkey)
* 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]);
--
2.17.1
next prev parent reply other threads:[~2020-03-31 9:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 9:58 [PATCH v19 00/24] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-03-31 9:58 ` [PATCH v19 01/24] selftests/x86/pkeys: Move selftests to arch-neutral directory Sandipan Das
2020-03-31 9:58 ` [PATCH v19 02/24] selftests/vm/pkeys: Rename all references to pkru to a generic name Sandipan Das
2020-03-31 9:58 ` [PATCH v19 03/24] selftests/vm/pkeys: Move generic definitions to header file Sandipan Das
2020-03-31 9:58 ` [PATCH v19 04/24] selftests/vm/pkeys: Move some definitions to arch-specific header Sandipan Das
2020-03-31 9:58 ` [PATCH v19 05/24] selftests/vm/pkeys: Make gcc check arguments of sigsafe_printf() Sandipan Das
2020-03-31 9:58 ` [PATCH v19 06/24] selftests: vm: pkeys: Use sane types for pkey register Sandipan Das
2020-03-31 9:58 ` [PATCH v19 07/24] selftests: vm: pkeys: Add helpers for pkey bits Sandipan Das
2020-03-31 9:58 ` [PATCH v19 08/24] selftests/vm/pkeys: Fix pkey_disable_clear() Sandipan Das
2020-03-31 9:58 ` [PATCH v19 09/24] selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear() Sandipan Das
2020-03-31 9:58 ` [PATCH v19 10/24] selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random Sandipan Das
2020-03-31 9:58 ` [PATCH v19 11/24] selftests: vm: pkeys: Use the correct huge page size Sandipan Das
2020-03-31 9:58 ` [PATCH v19 12/24] selftests/vm/pkeys: Introduce generic pkey abstractions Sandipan Das
2020-03-31 9:58 ` [PATCH v19 13/24] selftests/vm/pkeys: Introduce powerpc support Sandipan Das
2020-03-31 9:58 ` [PATCH v19 14/24] selftests/vm/pkeys: Fix number of reserved powerpc pkeys Sandipan Das
2020-03-31 9:58 ` Sandipan Das [this message]
2020-03-31 9:58 ` [PATCH v19 16/24] selftests/vm/pkeys: Improve checks to determine pkey support Sandipan Das
2020-03-31 9:58 ` [PATCH v19 17/24] selftests/vm/pkeys: Associate key on a mapped page and detect access violation Sandipan Das
2020-03-31 9:58 ` [PATCH v19 18/24] selftests/vm/pkeys: Associate key on a mapped page and detect write violation Sandipan Das
2020-03-31 9:58 ` [PATCH v19 19/24] selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page Sandipan Das
2020-03-31 9:58 ` [PATCH v19 20/24] selftests/vm/pkeys: Introduce a sub-page allocator Sandipan Das
2020-03-31 9:58 ` [PATCH v19 21/24] selftests/vm/pkeys: Test correct behaviour of pkey-0 Sandipan Das
2020-03-31 9:58 ` [PATCH v19 22/24] selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das
2020-03-31 9:58 ` [PATCH v19 23/24] selftests: vm: pkeys: Use the correct page size " Sandipan Das
2020-03-31 9:58 ` [PATCH v19 24/24] selftests: vm: pkeys: Fix multilib builds for x86 Sandipan Das
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38b08d0318820ae46af3aa6048384fd8056c3df7.1585646528.git.sandipan@linux.ibm.com \
--to=sandipan@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=bauerman@linux.ibm.com \
--cc=dave.hansen@intel.com \
--cc=fweimer@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=linuxram@us.ibm.com \
--cc=mhocko@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=msuchanek@suse.de \
--cc=shuah@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox