From: Sandipan Das <sandipan@linux.ibm.com>
To: shuah@kernel.org, skhan@linuxfoundation.org,
linux-kselftest@vger.kernel.org
Cc: linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
x86@kernel.org, linux-mm@kvack.org, fweimer@redhat.com,
dave.hansen@intel.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
Subject: [PATCH v18 07/24] selftests: vm: pkeys: Add helpers for pkey bits
Date: Thu, 30 Jan 2020 12:06:49 +0530 [thread overview]
Message-ID: <38d1f83a8282c76b453e38b11c66d44de851f44a.1580365432.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1580365432.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1580365432.git.sandipan@linux.ibm.com>
This introduces some functions that help with setting
or clearing bits of a particular pkey. This also adds
an abstraction for getting a pkey's bit position in
the pkey register as this may vary across architectures.
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
---
tools/testing/selftests/vm/pkey-helpers.h | 22 ++++++++++++++
tools/testing/selftests/vm/pkey-x86.h | 5 +++
tools/testing/selftests/vm/protection_keys.c | 32 ++++++--------------
3 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/tools/testing/selftests/vm/pkey-helpers.h b/tools/testing/selftests/vm/pkey-helpers.h
index dfbce49269ce..0e3da7c8d628 100644
--- a/tools/testing/selftests/vm/pkey-helpers.h
+++ b/tools/testing/selftests/vm/pkey-helpers.h
@@ -80,6 +80,28 @@ extern void abort_hooks(void);
#error Architecture not supported
#endif /* arch */
+#define PKEY_MASK (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE)
+
+static inline u64 set_pkey_bits(u64 reg, int pkey, u64 flags)
+{
+ u32 shift = pkey_bit_position(pkey);
+ /* mask out bits from pkey in old value */
+ reg &= ~((u64)PKEY_MASK << shift);
+ /* OR in new bits for pkey */
+ reg |= (flags & PKEY_MASK) << shift;
+ return reg;
+}
+
+static inline u64 get_pkey_bits(u64 reg, int pkey)
+{
+ u32 shift = pkey_bit_position(pkey);
+ /*
+ * shift down the relevant bits to the lowest two, then
+ * mask off all the other higher bits
+ */
+ return ((reg >> shift) & PKEY_MASK);
+}
+
extern u64 shadow_pkey_reg;
static inline u64 _read_pkey_reg(int line)
diff --git a/tools/testing/selftests/vm/pkey-x86.h b/tools/testing/selftests/vm/pkey-x86.h
index 6ffea27e2d2d..def2a1bcf6a5 100644
--- a/tools/testing/selftests/vm/pkey-x86.h
+++ b/tools/testing/selftests/vm/pkey-x86.h
@@ -118,6 +118,11 @@ static inline int cpu_has_pku(void)
return 1;
}
+static inline u32 pkey_bit_position(int pkey)
+{
+ return pkey * PKEY_BITS_PER_PKEY;
+}
+
#define XSTATE_PKEY_BIT (9)
#define XSTATE_PKEY 0x200
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index efa35cc6f6b9..bed9d4de12b4 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -334,25 +334,13 @@ pid_t fork_lazy_child(void)
static u32 hw_pkey_get(int pkey, unsigned long flags)
{
- u32 mask = (PKEY_DISABLE_ACCESS|PKEY_DISABLE_WRITE);
u64 pkey_reg = __read_pkey_reg();
- u64 shifted_pkey_reg;
- u32 masked_pkey_reg;
dprintf1("%s(pkey=%d, flags=%lx) = %x / %d\n",
__func__, pkey, flags, 0, 0);
dprintf2("%s() raw pkey_reg: %016llx\n", __func__, pkey_reg);
- shifted_pkey_reg = (pkey_reg >> (pkey * PKEY_BITS_PER_PKEY));
- dprintf2("%s() shifted_pkey_reg: %016llx\n", __func__,
- shifted_pkey_reg);
- masked_pkey_reg = shifted_pkey_reg & mask;
- dprintf2("%s() masked pkey_reg: %x\n", __func__, masked_pkey_reg);
- /*
- * shift down the relevant bits to the lowest two, then
- * mask off all the other high bits.
- */
- return masked_pkey_reg;
+ return (u32) get_pkey_bits(pkey_reg, pkey);
}
static int hw_pkey_set(int pkey, unsigned long rights, unsigned long flags)
@@ -364,12 +352,8 @@ static int hw_pkey_set(int pkey, unsigned long rights, unsigned long flags)
/* make sure that 'rights' only contains the bits we expect: */
assert(!(rights & ~mask));
- /* copy old pkey_reg */
- new_pkey_reg = old_pkey_reg;
- /* mask out bits from pkey in old value: */
- new_pkey_reg &= ~(mask << (pkey * PKEY_BITS_PER_PKEY));
- /* OR in new bits for pkey: */
- new_pkey_reg |= (rights << (pkey * PKEY_BITS_PER_PKEY));
+ /* modify bits accordingly in old pkey_reg and assign it */
+ new_pkey_reg = set_pkey_bits(old_pkey_reg, pkey, rights);
__write_pkey_reg(new_pkey_reg);
@@ -403,7 +387,7 @@ void pkey_disable_set(int pkey, int flags)
ret = hw_pkey_set(pkey, pkey_rights, syscall_flags);
assert(!ret);
/* pkey_reg and flags have the same format */
- shadow_pkey_reg |= flags << (pkey * 2);
+ shadow_pkey_reg = set_pkey_bits(shadow_pkey_reg, pkey, pkey_rights);
dprintf1("%s(%d) shadow: 0x%016llx\n",
__func__, pkey, shadow_pkey_reg);
@@ -437,7 +421,7 @@ void pkey_disable_clear(int pkey, int flags)
pkey_rights |= flags;
ret = hw_pkey_set(pkey, pkey_rights, 0);
- shadow_pkey_reg &= ~(flags << (pkey * 2));
+ shadow_pkey_reg = set_pkey_bits(shadow_pkey_reg, pkey, pkey_rights);
pkey_assert(ret >= 0);
pkey_rights = hw_pkey_get(pkey, syscall_flags);
@@ -513,7 +497,8 @@ int alloc_pkey(void)
shadow_pkey_reg);
if (ret) {
/* clear both the bits: */
- shadow_pkey_reg &= ~(0x3 << (ret * 2));
+ shadow_pkey_reg = set_pkey_bits(shadow_pkey_reg, ret,
+ ~PKEY_MASK);
dprintf4("%s()::%d, ret: %d pkey_reg: 0x%016llx"
" shadow: 0x%016llx\n",
__func__,
@@ -523,7 +508,8 @@ int alloc_pkey(void)
* move the new state in from init_val
* (remember, we cheated and init_val == pkey_reg format)
*/
- shadow_pkey_reg |= (init_val << (ret * 2));
+ shadow_pkey_reg = set_pkey_bits(shadow_pkey_reg, ret,
+ init_val);
}
dprintf4("%s()::%d, ret: %d pkey_reg: 0x%016llx"
" shadow: 0x%016llx\n",
--
2.17.1
next prev parent reply other threads:[~2020-01-30 6:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 6:36 [PATCH v18 00/24] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-01-30 6:36 ` [PATCH v18 01/24] selftests/x86/pkeys: Move selftests to arch-neutral directory Sandipan Das
2020-01-30 6:36 ` [PATCH v18 02/24] selftests/vm/pkeys: Rename all references to pkru to a generic name Sandipan Das
2020-01-30 6:36 ` [PATCH v18 03/24] selftests/vm/pkeys: Move generic definitions to header file Sandipan Das
2020-01-30 6:36 ` [PATCH v18 04/24] selftests/vm/pkeys: Move some definitions to arch-specific header Sandipan Das
2020-01-30 6:36 ` [PATCH v18 05/24] selftests/vm/pkeys: Make gcc check arguments of sigsafe_printf() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 06/24] selftests: vm: pkeys: Use sane types for pkey register Sandipan Das
2020-01-30 6:36 ` Sandipan Das [this message]
2020-01-30 6:36 ` [PATCH v18 08/24] selftests/vm/pkeys: Fix pkey_disable_clear() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 09/24] selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 10/24] selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random Sandipan Das
2020-01-30 6:36 ` [PATCH v18 11/24] selftests: vm: pkeys: Use the correct huge page size Sandipan Das
2020-01-30 6:36 ` [PATCH v18 12/24] selftests/vm/pkeys: Introduce generic pkey abstractions Sandipan Das
2020-01-30 6:36 ` [PATCH v18 13/24] selftests/vm/pkeys: Introduce powerpc support Sandipan Das
2020-01-30 6:36 ` [PATCH v18 14/24] selftests/vm/pkeys: Fix number of reserved powerpc pkeys Sandipan Das
2020-01-30 6:36 ` [PATCH v18 15/24] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 16/24] selftests/vm/pkeys: Improve checks to determine pkey support Sandipan Das
2020-01-30 6:36 ` [PATCH v18 17/24] selftests/vm/pkeys: Associate key on a mapped page and detect access violation Sandipan Das
2020-01-30 6:37 ` [PATCH v18 18/24] selftests/vm/pkeys: Associate key on a mapped page and detect write violation Sandipan Das
2020-01-30 6:37 ` [PATCH v18 19/24] selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page Sandipan Das
2020-01-30 6:37 ` [PATCH v18 20/24] selftests/vm/pkeys: Introduce a sub-page allocator Sandipan Das
2020-01-30 6:37 ` [PATCH v18 21/24] selftests/vm/pkeys: Test correct behaviour of pkey-0 Sandipan Das
2020-01-30 6:37 ` [PATCH v18 22/24] selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das
2020-01-30 6:37 ` [PATCH v18 23/24] selftests: vm: pkeys: Use the correct page size " Sandipan Das
2020-01-30 6:37 ` [PATCH v18 24/24] selftests: vm: pkeys: Fix multilib builds for x86 Sandipan Das
2020-01-30 21:51 ` [PATCH v18 00/24] selftests, powerpc, x86: Memory Protection Keys Dave Hansen
2020-03-02 10:25 ` 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=38d1f83a8282c76b453e38b11c66d44de851f44a.1580365432.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=skhan@linuxfoundation.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).