From: ira.weiny@intel.com
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Cc: Ira Weiny <ira.weiny@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
Fenghua Yu <fenghua.yu@intel.com>,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: [PATCH V5 03/10] x86/pks: Add additional PKEY helper macros
Date: Wed, 31 Mar 2021 12:13:58 -0700 [thread overview]
Message-ID: <20210331191405.341999-4-ira.weiny@intel.com> (raw)
In-Reply-To: <20210331191405.341999-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Avoid open coding shift and mask operations by defining and using helper
macros for PKey operations.
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from V3:
new patch suggested by Dan Williams to use macros better.
---
arch/x86/include/asm/pgtable.h | 7 ++-----
arch/x86/include/asm/pkeys_common.h | 11 ++++++++---
arch/x86/mm/pkeys.c | 8 +++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index bfbfb951fe65..b1529b44a996 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1370,19 +1370,16 @@ extern u32 init_pkru_value;
static inline bool __pkru_allows_read(u32 pkru, u16 pkey)
{
- int pkru_pkey_bits = pkey * PKR_BITS_PER_PKEY;
-
- return !(pkru & (PKR_AD_BIT << pkru_pkey_bits));
+ return !(pkru & PKR_AD_KEY(pkey));
}
static inline bool __pkru_allows_write(u32 pkru, u16 pkey)
{
- int pkru_pkey_bits = pkey * PKR_BITS_PER_PKEY;
/*
* Access-disable disables writes too so we need to check
* both bits here.
*/
- return !(pkru & ((PKR_AD_BIT|PKR_WD_BIT) << pkru_pkey_bits));
+ return !(pkru & (PKR_AD_KEY(pkey) | PKR_WD_KEY(pkey)));
}
static inline u16 pte_flags_pkey(unsigned long pte_flags)
diff --git a/arch/x86/include/asm/pkeys_common.h b/arch/x86/include/asm/pkeys_common.h
index e40b0ced733f..0681522974ba 100644
--- a/arch/x86/include/asm/pkeys_common.h
+++ b/arch/x86/include/asm/pkeys_common.h
@@ -6,10 +6,15 @@
#define PKR_WD_BIT 0x2
#define PKR_BITS_PER_PKEY 2
+#define PKR_PKEY_SHIFT(pkey) (pkey * PKR_BITS_PER_PKEY)
+#define PKR_PKEY_MASK(pkey) (((1 << PKR_BITS_PER_PKEY) - 1) << PKR_PKEY_SHIFT(pkey))
+
/*
- * Generate an Access-Disable mask for the given pkey. Several of these can be
- * OR'd together to generate pkey register values.
+ * Generate an Access-Disable and Write-Disable mask for the given pkey.
+ * Several of the AD's are OR'd together to generate a default pkey register
+ * value.
*/
-#define PKR_AD_KEY(pkey) (PKR_AD_BIT << ((pkey) * PKR_BITS_PER_PKEY))
+#define PKR_AD_KEY(pkey) (PKR_AD_BIT << PKR_PKEY_SHIFT(pkey))
+#define PKR_WD_KEY(pkey) (PKR_WD_BIT << PKR_PKEY_SHIFT(pkey))
#endif /*_ASM_X86_PKEYS_COMMON_H */
diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c
index d1dfe743e79f..fc8c7e2bb21b 100644
--- a/arch/x86/mm/pkeys.c
+++ b/arch/x86/mm/pkeys.c
@@ -218,16 +218,14 @@ __setup("init_pkru=", setup_init_pkru);
*/
u32 update_pkey_val(u32 pk_reg, int pkey, unsigned int flags)
{
- int pkey_shift = pkey * PKR_BITS_PER_PKEY;
-
/* Mask out old bit values */
- pk_reg &= ~(((1 << PKR_BITS_PER_PKEY) - 1) << pkey_shift);
+ pk_reg &= ~PKR_PKEY_MASK(pkey);
/* Or in new values */
if (flags & PKEY_DISABLE_ACCESS)
- pk_reg |= PKR_AD_BIT << pkey_shift;
+ pk_reg |= PKR_AD_KEY(pkey);
if (flags & PKEY_DISABLE_WRITE)
- pk_reg |= PKR_WD_BIT << pkey_shift;
+ pk_reg |= PKR_WD_KEY(pkey);
return pk_reg;
}
--
2.28.0.rc0.12.gb6a658bd00c9
next prev parent reply other threads:[~2021-03-31 19:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 19:13 [PATCH V5 00/10] PKS: Add Protection Key Supervisor support ira.weiny
2021-03-31 19:13 ` [PATCH V5 01/10] x86/pkeys: Create pkeys_common.h ira.weiny
2021-03-31 19:13 ` [PATCH V5 02/10] x86/fpu: Refactor arch_set_user_pkey_access() for PKS support ira.weiny
2021-03-31 19:13 ` ira.weiny [this message]
2021-03-31 19:13 ` [PATCH V5 04/10] x86/pks: Add PKS defines and Kconfig options ira.weiny
2021-03-31 19:14 ` [PATCH V5 05/10] x86/pks: Add PKS setup code ira.weiny
2021-03-31 19:14 ` [PATCH V5 06/10] x86/fault: Adjust WARN_ON for PKey fault ira.weiny
2021-03-31 19:14 ` [PATCH V5 07/10] x86/pks: Preserve the PKRS MSR on context switch ira.weiny
2021-03-31 19:14 ` [PATCH V5 08/10] x86/entry: Preserve PKRS MSR across exceptions ira.weiny
2021-03-31 19:31 ` Dave Hansen
2021-04-01 1:15 ` Ira Weiny
2021-03-31 19:14 ` [PATCH V5 09/10] x86/pks: Add PKS kernel API ira.weiny
2021-03-31 19:14 ` [PATCH V5 10/10] x86/pks: Add PKS test code ira.weiny
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=20210331191405.341999-4-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--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).