linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>, linuxram@us.ibm.com
Subject: [PATCH v2 12/12] powerpc/book3s64/pkeys: Mark all the pkeys above max pkey as reserved
Date: Sat,  2 May 2020 16:43:47 +0530	[thread overview]
Message-ID: <20200502111347.541836-13-aneesh.kumar@linux.ibm.com> (raw)
In-Reply-To: <20200502111347.541836-1-aneesh.kumar@linux.ibm.com>

The hypervisor can return less than max allowed pkey (for ex: 31) instead
of 32. We should mark all the pkeys above max allowed as reserved so
that we avoid the allocation of the wrong pkey(for ex: key 31 in the above
case) by userspace.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
---
 arch/powerpc/mm/book3s64/pkeys.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c
index 73b5ef1490c8..0ff59acdbb84 100644
--- a/arch/powerpc/mm/book3s64/pkeys.c
+++ b/arch/powerpc/mm/book3s64/pkeys.c
@@ -175,9 +175,10 @@ static int pkey_initialize(void)
 
 	/*
 	 * Prevent the usage of OS reserved keys. Update UAMOR
-	 * for those keys.
+	 * for those keys. Also mark the rest of the bits in the
+	 * 32 bit mask as reserved.
 	 */
-	for (i = max_pkey; i < pkeys_total; i++) {
+	for (i = max_pkey; i < 32 ; i++) {
 		reserved_allocation_mask |= (0x1 << i);
 		default_uamor &= ~(0x3ul << pkeyshift(i));
 	}
-- 
2.26.2


      parent reply	other threads:[~2020-05-02 11:37 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-02 11:13 [PATCH v2 00/12] powerpc/book3s/64/pkeys: Simplify the code Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 01/12] powerpc/book3s64/pkeys: Fixup bit numbering Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 02/12] powerpc/book3s64/pkeys: pkeys are supported only on hash on book3s Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 03/12] powerpc/book3s64/pkeys: Move pkey related bits in the linux page table Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 04/12] powerpc/book3s64/pkeys: Explain key 1 reservation details Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 05/12] powerpc/book3s64/pkeys: Simplify the key initialization Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 06/12] powerpc/book3s64/pkeys: Prevent key 1 modification from userspace Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 07/12] powerpc/book3s64/pkeys: kill cpu feature key CPU_FTR_PKEY Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 08/12] powerpc/book3s64/pkeys: Convert execute key support to static key Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 09/12] powerpc/book3s64/pkeys: Simplify pkey disable branch Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 10/12] powerpc/book3s64/pkeys: Convert pkey_total to max_pkey Aneesh Kumar K.V
2020-05-02 11:13 ` [PATCH v2 11/12] powerpc/book3s64/pkeys: Make initial_allocation_mask static Aneesh Kumar K.V
2020-05-02 11:13 ` Aneesh Kumar K.V [this message]

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=20200502111347.541836-13-aneesh.kumar@linux.ibm.com \
    --to=aneesh.kumar@linux.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=linuxram@us.ibm.com \
    --cc=mpe@ellerman.id.au \
    /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).