From: Ram Pai <linuxram@us.ibm.com>
To: shuahkh@osg.samsung.com, linux-kselftest@vger.kernel.org
Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org,
mingo@redhat.com, dave.hansen@intel.com, mhocko@kernel.org,
bauerman@linux.vnet.ibm.com, linuxram@us.ibm.com,
fweimer@redhat.com, msuchanek@suse.de,
aneesh.kumar@linux.vnet.ibm.com
Subject: [PATCH v13 24/24] selftests/vm: test correct behavior of pkey-0
Date: Wed, 13 Jun 2018 17:45:15 -0700 [thread overview]
Message-ID: <1528937115-10132-25-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1528937115-10132-1-git-send-email-linuxram@us.ibm.com>
Ensure pkey-0 is allocated on start. Ensure pkey-0 can be attached
dynamically in various modes, without failures. Ensure pkey-0 can be
freed and allocated.
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
tools/testing/selftests/vm/protection_keys.c | 66 +++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index cbd87f8..f37b031 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -1003,6 +1003,67 @@ void close_test_fds(void)
return *ptr;
}
+void test_pkey_alloc_free_attach_pkey0(int *ptr, u16 pkey)
+{
+ int i, err;
+ int max_nr_pkey_allocs;
+ int alloced_pkeys[NR_PKEYS];
+ int nr_alloced = 0;
+ int newpkey;
+ long size;
+
+ assert(pkey_last_malloc_record);
+ size = pkey_last_malloc_record->size;
+ /*
+ * This is a bit of a hack. But mprotect() requires
+ * huge-page-aligned sizes when operating on hugetlbfs.
+ * So, make sure that we use something that's a multiple
+ * of a huge page when we can.
+ */
+ if (size >= HPAGE_SIZE)
+ size = HPAGE_SIZE;
+
+
+ /* allocate every possible key and make sure key-0 never got allocated */
+ max_nr_pkey_allocs = NR_PKEYS;
+ for (i = 0; i < max_nr_pkey_allocs; i++) {
+ int new_pkey = alloc_pkey();
+ assert(new_pkey != 0);
+
+ if (new_pkey < 0)
+ break;
+ alloced_pkeys[nr_alloced++] = new_pkey;
+ }
+ /* free all the allocated keys */
+ for (i = 0; i < nr_alloced; i++) {
+ int free_ret;
+
+ if (!alloced_pkeys[i])
+ continue;
+ free_ret = sys_pkey_free(alloced_pkeys[i]);
+ pkey_assert(!free_ret);
+ }
+
+ /* attach key-0 in various modes */
+ err = sys_mprotect_pkey(ptr, size, PROT_READ, 0);
+ pkey_assert(!err);
+ err = sys_mprotect_pkey(ptr, size, PROT_WRITE, 0);
+ pkey_assert(!err);
+ err = sys_mprotect_pkey(ptr, size, PROT_EXEC, 0);
+ pkey_assert(!err);
+ err = sys_mprotect_pkey(ptr, size, PROT_READ|PROT_WRITE, 0);
+ pkey_assert(!err);
+ err = sys_mprotect_pkey(ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, 0);
+ pkey_assert(!err);
+
+ /* free key-0 */
+ err = sys_pkey_free(0);
+ pkey_assert(!err);
+
+ newpkey = sys_pkey_alloc(0, 0x0);
+ assert(newpkey == 0);
+}
+
void test_read_of_write_disabled_region(int *ptr, u16 pkey)
{
int ptr_contents;
@@ -1153,10 +1214,10 @@ void test_kernel_gup_write_to_write_disabled_region(int *ptr, u16 pkey)
void test_pkey_syscalls_on_non_allocated_pkey(int *ptr, u16 pkey)
{
int err;
- int i = get_start_key();
+ int i;
/* Note: 0 is the default pkey, so don't mess with it */
- for (; i < NR_PKEYS; i++) {
+ for (i=1; i < NR_PKEYS; i++) {
if (pkey == i)
continue;
@@ -1465,6 +1526,7 @@ void test_mprotect_pkey_on_unsupported_cpu(int *ptr, u16 pkey)
test_pkey_syscalls_on_non_allocated_pkey,
test_pkey_syscalls_bad_args,
test_pkey_alloc_exhaust,
+ test_pkey_alloc_free_attach_pkey0,
};
void run_tests_once(void)
--
1.7.1
next prev parent reply other threads:[~2018-06-14 0:47 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-14 0:44 [PATCH v13 00/24] selftests, powerpc, x86 : Memory Protection Keys Ram Pai
2018-06-14 0:44 ` [PATCH v13 01/24] selftests/x86: Move protecton key selftest to arch neutral directory Ram Pai
2018-06-14 0:44 ` [PATCH v13 02/24] selftests/vm: rename all references to pkru to a generic name Ram Pai
2018-06-14 0:44 ` [PATCH v13 03/24] selftests/vm: move generic definitions to header file Ram Pai
2018-06-14 0:44 ` [PATCH v13 04/24] selftests/vm: move arch-specific definitions to arch-specific header Ram Pai
2018-06-14 0:44 ` [PATCH v13 05/24] selftests/vm: Make gcc check arguments of sigsafe_printf() Ram Pai
2018-06-14 0:44 ` [PATCH v13 06/24] selftests/vm: typecast the pkey register Ram Pai
2018-06-14 0:44 ` [PATCH v13 07/24] selftests/vm: generic function to handle shadow key register Ram Pai
2018-06-14 0:44 ` [PATCH v13 08/24] selftests/vm: fix the wrong assert in pkey_disable_set() Ram Pai
2018-06-20 14:47 ` Dave Hansen
2018-07-17 15:58 ` Ram Pai
2018-07-17 17:53 ` Dave Hansen
2018-06-14 0:45 ` [PATCH v13 09/24] selftests/vm: fixed bugs in pkey_disable_clear() Ram Pai
2018-06-14 0:45 ` [PATCH v13 10/24] selftests/vm: clear the bits in shadow reg when a pkey is freed Ram Pai
2018-06-20 14:49 ` Dave Hansen
2018-07-17 16:00 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 11/24] selftests/vm: fix alloc_random_pkey() to make it really random Ram Pai
2018-06-14 0:45 ` [PATCH v13 12/24] selftests/vm: introduce two arch independent abstraction Ram Pai
2018-06-14 0:45 ` [PATCH v13 13/24] selftests/vm: pkey register should match shadow pkey Ram Pai
2018-06-20 14:53 ` Dave Hansen
2018-07-17 16:02 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 14/24] selftests/vm: generic cleanup Ram Pai
2018-06-20 14:57 ` Dave Hansen
2018-06-14 0:45 ` [PATCH v13 15/24] selftests/vm: powerpc implementation for generic abstraction Ram Pai
2018-06-20 15:06 ` Dave Hansen
2018-06-14 0:45 ` [PATCH v13 16/24] selftests/vm: clear the bits in shadow reg when a pkey is freed Ram Pai
2018-06-20 15:07 ` Dave Hansen
2018-07-17 16:03 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 17/24] selftests/vm: powerpc implementation to check support for pkey Ram Pai
2018-06-20 15:09 ` Dave Hansen
2018-07-17 16:05 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 18/24] selftests/vm: fix an assertion in test_pkey_alloc_exhaust() Ram Pai
2018-06-20 15:11 ` Dave Hansen
2018-07-17 16:08 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 19/24] selftests/vm: associate key on a mapped page and detect access violation Ram Pai
2018-06-20 15:16 ` Dave Hansen
2018-07-17 16:13 ` Ram Pai
2018-07-17 17:56 ` Dave Hansen
2018-07-17 19:10 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 20/24] selftests/vm: associate key on a mapped page and detect write violation Ram Pai
2018-06-14 0:45 ` [PATCH v13 21/24] selftests/vm: detect write violation on a mapped access-denied-key page Ram Pai
2018-06-14 0:45 ` [PATCH v13 22/24] selftests/vm: testcases must restore pkey-permissions Ram Pai
2018-06-20 15:20 ` Dave Hansen
2018-07-17 16:09 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 23/24] selftests/vm: sub-page allocator Ram Pai
2018-06-14 0:45 ` Ram Pai [this message]
2018-06-20 15:22 ` [PATCH v13 24/24] selftests/vm: test correct behavior of pkey-0 Dave Hansen
2018-06-14 20:19 ` [PATCH v13 00/24] selftests, powerpc, x86 : Memory Protection Keys Florian Weimer
2018-06-15 0:58 ` Ram Pai
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=1528937115-10132-25-git-send-email-linuxram@us.ibm.com \
--to=linuxram@us.ibm.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=bauerman@linux.vnet.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=mhocko@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=msuchanek@suse.de \
--cc=shuahkh@osg.samsung.com \
--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;
as well as URLs for NNTP newsgroup(s).