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
Subject: [PATCH v19 23/24] selftests: vm: pkeys: Use the correct page size on powerpc
Date: Tue, 31 Mar 2020 15:28:24 +0530 [thread overview]
Message-ID: <5dcdfbf3353acdc90f315172e800b49f5ca21299.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>
Both 4K and 64K pages are supported on powerpc. Parts of
the selftest code perform alignment computations based on
the PAGE_SIZE macro which is currently hardcoded to 64K
for powerpc. This causes some test failures on kernels
configured with 4K page size.
In some cases, we need to enforce function alignment on
page size. Since this can only be done at build time,
64K is used as the alignment factor as that also ensures
4K alignment.
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
Acked-by: Dave Hansen <dave.hansen@intel.com>
---
tools/testing/selftests/vm/pkey-powerpc.h | 2 +-
tools/testing/selftests/vm/protection_keys.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/vm/pkey-powerpc.h b/tools/testing/selftests/vm/pkey-powerpc.h
index 02bd4dd7d467a..3a761e51a5878 100644
--- a/tools/testing/selftests/vm/pkey-powerpc.h
+++ b/tools/testing/selftests/vm/pkey-powerpc.h
@@ -36,7 +36,7 @@
pkey-31 and exec-only key */
#define PKEY_BITS_PER_PKEY 2
#define HPAGE_SIZE (1UL << 24)
-#define PAGE_SIZE (1UL << 16)
+#define PAGE_SIZE sysconf(_SC_PAGESIZE)
static inline u32 pkey_bit_position(int pkey)
{
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index a1cb9a71e77ce..fc19addcb5c82 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -146,7 +146,12 @@ void abort_hooks(void)
* will then fault, which makes sure that the fault code handles
* execute-only memory properly.
*/
+#ifdef __powerpc64__
+/* This way, both 4K and 64K alignment are maintained */
+__attribute__((__aligned__(65536)))
+#else
__attribute__((__aligned__(PAGE_SIZE)))
+#endif
void lots_o_noops_around_write(int *write_to_me)
{
dprintf3("running %s()\n", __func__);
--
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 ` [PATCH v19 15/24] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() Sandipan Das
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 ` Sandipan Das [this message]
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=5dcdfbf3353acdc90f315172e800b49f5ca21299.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=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