From: Sandipan Das <sandipan@linux.ibm.com>
To: shuah@kernel.org, linux-kselftest@vger.kernel.org
Cc: linux-arch@vger.kernel.org, fweimer@redhat.com,
dave.hansen@intel.com, x86@kernel.org, linuxram@us.ibm.com,
mhocko@kernel.org, linux-mm@kvack.org, mingo@redhat.com,
aneesh.kumar@linux.ibm.com, bauerman@linux.ibm.com,
msuchanek@suse.de, mpe@ellerman.id.au,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v17 21/24] selftests/vm/pkeys: Introduce a sub-page allocator
Date: Mon, 20 Jan 2020 14:06:18 +0530 [thread overview]
Message-ID: <c2dfcb36f441711dc664ebe79d00c140b1a93914.1579507768.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1579507768.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1579507768.git.sandipan@linux.ibm.com>
From: Ram Pai <linuxram@us.ibm.com>
This introduces a new allocator that allocates 4K hardware
pages to back 64K linux pages. This allocator is available
only on powerpc.
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: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
---
tools/testing/selftests/vm/pkey-helpers.h | 6 +++++
tools/testing/selftests/vm/pkey-powerpc.h | 25 ++++++++++++++++++++
tools/testing/selftests/vm/pkey-x86.h | 5 ++++
tools/testing/selftests/vm/protection_keys.c | 1 +
4 files changed, 37 insertions(+)
diff --git a/tools/testing/selftests/vm/pkey-helpers.h b/tools/testing/selftests/vm/pkey-helpers.h
index 59ccdff18214..622a85848f61 100644
--- a/tools/testing/selftests/vm/pkey-helpers.h
+++ b/tools/testing/selftests/vm/pkey-helpers.h
@@ -28,6 +28,9 @@
extern int dprint_in_signal;
extern char dprint_in_signal_buffer[DPRINT_IN_SIGNAL_BUF_SIZE];
+extern int test_nr;
+extern int iteration_nr;
+
#ifdef __GNUC__
__attribute__((format(printf, 1, 2)))
#endif
@@ -78,6 +81,9 @@ __attribute__((noinline)) int read_ptr(int *ptr);
void expected_pkey_fault(int pkey);
int sys_pkey_alloc(unsigned long flags, unsigned long init_val);
int sys_pkey_free(unsigned long pkey);
+int mprotect_pkey(void *ptr, size_t size, unsigned long orig_prot,
+ unsigned long pkey);
+void record_pkey_malloc(void *ptr, long size, int prot);
#if defined(__i386__) || defined(__x86_64__) /* arch */
#include "pkey-x86.h"
diff --git a/tools/testing/selftests/vm/pkey-powerpc.h b/tools/testing/selftests/vm/pkey-powerpc.h
index 7d7c3ffafdd9..d31665c48f5e 100644
--- a/tools/testing/selftests/vm/pkey-powerpc.h
+++ b/tools/testing/selftests/vm/pkey-powerpc.h
@@ -106,4 +106,29 @@ void expect_fault_on_read_execonly_key(void *p1, int pkey)
/* 4-byte instructions * 16384 = 64K page */
#define __page_o_noops() asm(".rept 16384 ; nop; .endr")
+void *malloc_pkey_with_mprotect_subpage(long size, int prot, u16 pkey)
+{
+ void *ptr;
+ int ret;
+
+ dprintf1("doing %s(size=%ld, prot=0x%x, pkey=%d)\n", __func__,
+ size, prot, pkey);
+ pkey_assert(pkey < NR_PKEYS);
+ ptr = mmap(NULL, size, prot, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+ pkey_assert(ptr != (void *)-1);
+
+ ret = syscall(__NR_subpage_prot, ptr, size, NULL);
+ if (ret) {
+ perror("subpage_perm");
+ return PTR_ERR_ENOTSUP;
+ }
+
+ ret = mprotect_pkey((void *)ptr, PAGE_SIZE, prot, pkey);
+ pkey_assert(!ret);
+ record_pkey_malloc(ptr, size, prot);
+
+ dprintf1("%s() for pkey %d @ %p\n", __func__, pkey, ptr);
+ return ptr;
+}
+
#endif /* _PKEYS_POWERPC_H */
diff --git a/tools/testing/selftests/vm/pkey-x86.h b/tools/testing/selftests/vm/pkey-x86.h
index 6421b846aa16..3be20f5d5275 100644
--- a/tools/testing/selftests/vm/pkey-x86.h
+++ b/tools/testing/selftests/vm/pkey-x86.h
@@ -173,4 +173,9 @@ void expect_fault_on_read_execonly_key(void *p1, int pkey)
expected_pkey_fault(pkey);
}
+void *malloc_pkey_with_mprotect_subpage(long size, int prot, u16 pkey)
+{
+ return PTR_ERR_ENOTSUP;
+}
+
#endif /* _PKEYS_X86_H */
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index 8bb4de103874..d4952b57cc90 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -845,6 +845,7 @@ void *malloc_pkey_mmap_dax(long size, int prot, u16 pkey)
void *(*pkey_malloc[])(long size, int prot, u16 pkey) = {
malloc_pkey_with_mprotect,
+ malloc_pkey_with_mprotect_subpage,
malloc_pkey_anon_huge,
malloc_pkey_hugetlb
/* can not do direct with the pkey_mprotect() API:
--
2.17.1
next prev parent reply other threads:[~2020-01-20 8:38 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 8:35 [PATCH v16 00/23] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-01-20 8:35 ` [PATCH v17 01/24] selftests/x86/pkeys: Move selftests to arch-neutral directory Sandipan Das
2020-01-20 8:35 ` Sandipan Das
2020-01-20 8:35 ` [PATCH v17 02/24] selftests: vm: pkeys: Fix multilib builds for x86 Sandipan Das
2020-01-20 8:35 ` Sandipan Das
2020-01-20 8:35 ` [PATCH v17 00/23] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-01-20 8:36 ` [PATCH v17 03/24] selftests/vm/pkeys: Rename all references to pkru to a generic name Sandipan Das
2020-01-20 8:36 ` [PATCH v17 04/24] selftests/vm/pkeys: Move generic definitions to header file Sandipan Das
2020-01-20 8:36 ` [PATCH v17 05/24] selftests/vm/pkeys: Move some definitions to arch-specific header Sandipan Das
2020-01-20 8:36 ` [PATCH v17 06/24] selftests/vm/pkeys: Make gcc check arguments of sigsafe_printf() Sandipan Das
2020-01-20 8:36 ` [PATCH v17 07/24] selftests: vm: pkeys: Use sane types for pkey register Sandipan Das
2020-01-20 8:36 ` [PATCH v17 08/24] selftests: vm: pkeys: Add helpers for pkey bits Sandipan Das
2020-01-20 8:36 ` [PATCH v17 09/24] selftests/vm/pkeys: Fix pkey_disable_clear() Sandipan Das
2020-01-20 8:36 ` [PATCH v17 10/24] selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear() Sandipan Das
2020-01-20 8:36 ` [PATCH v17 11/24] selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random Sandipan Das
2020-01-20 8:36 ` [PATCH v17 12/24] selftests: vm: pkeys: Use the correct huge page size Sandipan Das
2020-01-20 8:36 ` [PATCH v17 13/24] selftests/vm/pkeys: Introduce generic pkey abstractions Sandipan Das
2020-01-20 8:36 ` [PATCH v17 14/24] selftests/vm/pkeys: Introduce powerpc support Sandipan Das
2020-01-20 8:36 ` [PATCH v17 15/24] selftests/vm/pkeys: Fix number of reserved powerpc pkeys Sandipan Das
2020-01-20 8:36 ` [PATCH v17 16/24] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() Sandipan Das
2020-01-20 8:36 ` [PATCH v17 17/24] selftests/vm/pkeys: Improve checks to determine pkey support Sandipan Das
2020-01-20 8:36 ` [PATCH v17 18/24] selftests/vm/pkeys: Associate key on a mapped page and detect access violation Sandipan Das
2020-01-20 8:36 ` [PATCH v17 19/24] selftests/vm/pkeys: Associate key on a mapped page and detect write violation Sandipan Das
2020-01-20 8:36 ` [PATCH v17 20/24] selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page Sandipan Das
2020-01-20 8:36 ` Sandipan Das [this message]
2020-01-20 8:36 ` [PATCH v17 22/24] selftests/vm/pkeys: Test correct behaviour of pkey-0 Sandipan Das
2020-01-20 8:36 ` [PATCH v17 23/24] selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das
2020-01-20 8:36 ` [PATCH v17 24/24] selftests: vm: pkeys: Use the correct page size " Sandipan Das
2020-01-22 18:45 ` [PATCH v16 00/23] selftests, powerpc, x86: Memory Protection Keys Dave Hansen
2020-01-27 10:11 ` Sandipan Das
2020-01-27 15:42 ` Dave Hansen
2020-01-28 9:38 ` Sandipan Das
2020-01-29 9:56 ` Sandipan Das
2020-01-29 18:59 ` Dave Hansen
2020-01-30 6:19 ` Sandipan Das
2020-01-30 9:20 ` Sandipan Das
2020-01-29 19:04 ` Florian Weimer
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=c2dfcb36f441711dc664ebe79d00c140b1a93914.1579507768.git.sandipan@linux.ibm.com \
--to=sandipan@linux.ibm.com \
--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;
as well as URLs for NNTP newsgroup(s).