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,
"Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
Subject: [PATCH v16 14/23] selftests/vm/pkeys: Fix number of reserved powerpc pkeys
Date: Fri, 17 Jan 2020 18:19:53 +0530 [thread overview]
Message-ID: <2ef4b0cdc95953235d3e5687d98da8a3a074aaf5.1579265066.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1579265066.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1579265066.git.sandipan@linux.ibm.com>
From: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
The number of reserved pkeys in a PowerNV environment is
different from that on PowerVM or KVM.
Tested on PowerVM and PowerNV environments.
Signed-off-by: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
---
tools/testing/selftests/vm/pkey-powerpc.h | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/vm/pkey-powerpc.h b/tools/testing/selftests/vm/pkey-powerpc.h
index f4599a35d2a9..eaced8c198a2 100644
--- a/tools/testing/selftests/vm/pkey-powerpc.h
+++ b/tools/testing/selftests/vm/pkey-powerpc.h
@@ -28,7 +28,10 @@
#define NR_RESERVED_PKEYS_4K 27 /* pkey-0, pkey-1, exec-only-pkey
and 24 other keys that cannot be
represented in the PTE */
-#define NR_RESERVED_PKEYS_64K 3 /* pkey-0, pkey-1 and exec-only-pkey */
+#define NR_RESERVED_PKEYS_64K_3KEYS 3 /* PowerNV and KVM: pkey-0,
+ pkey-1 and exec-only key */
+#define NR_RESERVED_PKEYS_64K_4KEYS 4 /* PowerVM: pkey-0, pkey-1,
+ pkey-31 and exec-only key */
#define PKEY_BITS_PER_PKEY 2
#define HPAGE_SIZE (1UL << 24)
#define PAGE_SIZE (1UL << 16)
@@ -65,12 +68,27 @@ static inline int cpu_has_pku(void)
return 1;
}
+static inline bool arch_is_powervm()
+{
+ struct stat buf;
+
+ if ((stat("/sys/firmware/devicetree/base/ibm,partition-name", &buf) == 0) &&
+ (stat("/sys/firmware/devicetree/base/hmc-managed?", &buf) == 0) &&
+ (stat("/sys/firmware/devicetree/base/chosen/qemu,graphic-width", &buf) == -1) )
+ return true;
+
+ return false;
+}
+
static inline int get_arch_reserved_keys(void)
{
if (sysconf(_SC_PAGESIZE) == 4096)
return NR_RESERVED_PKEYS_4K;
else
- return NR_RESERVED_PKEYS_64K;
+ if (arch_is_powervm())
+ return NR_RESERVED_PKEYS_64K_4KEYS;
+ else
+ return NR_RESERVED_PKEYS_64K_3KEYS;
}
void expect_fault_on_read_execonly_key(void *p1, int pkey)
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
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,
"Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
Subject: [PATCH v16 14/23] selftests/vm/pkeys: Fix number of reserved powerpc pkeys
Date: Fri, 17 Jan 2020 18:19:53 +0530 [thread overview]
Message-ID: <2ef4b0cdc95953235d3e5687d98da8a3a074aaf5.1579265066.git.sandipan@linux.ibm.com> (raw)
Message-ID: <20200117124953.WP93uXoPBb5aybKv9NB9OGybT5oZ_ubmiMVfed_8YAc@z> (raw)
In-Reply-To: <cover.1579265066.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1579265066.git.sandipan@linux.ibm.com>
From: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
The number of reserved pkeys in a PowerNV environment is
different from that on PowerVM or KVM.
Tested on PowerVM and PowerNV environments.
Signed-off-by: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
---
tools/testing/selftests/vm/pkey-powerpc.h | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/vm/pkey-powerpc.h b/tools/testing/selftests/vm/pkey-powerpc.h
index f4599a35d2a9..eaced8c198a2 100644
--- a/tools/testing/selftests/vm/pkey-powerpc.h
+++ b/tools/testing/selftests/vm/pkey-powerpc.h
@@ -28,7 +28,10 @@
#define NR_RESERVED_PKEYS_4K 27 /* pkey-0, pkey-1, exec-only-pkey
and 24 other keys that cannot be
represented in the PTE */
-#define NR_RESERVED_PKEYS_64K 3 /* pkey-0, pkey-1 and exec-only-pkey */
+#define NR_RESERVED_PKEYS_64K_3KEYS 3 /* PowerNV and KVM: pkey-0,
+ pkey-1 and exec-only key */
+#define NR_RESERVED_PKEYS_64K_4KEYS 4 /* PowerVM: pkey-0, pkey-1,
+ pkey-31 and exec-only key */
#define PKEY_BITS_PER_PKEY 2
#define HPAGE_SIZE (1UL << 24)
#define PAGE_SIZE (1UL << 16)
@@ -65,12 +68,27 @@ static inline int cpu_has_pku(void)
return 1;
}
+static inline bool arch_is_powervm()
+{
+ struct stat buf;
+
+ if ((stat("/sys/firmware/devicetree/base/ibm,partition-name", &buf) == 0) &&
+ (stat("/sys/firmware/devicetree/base/hmc-managed?", &buf) == 0) &&
+ (stat("/sys/firmware/devicetree/base/chosen/qemu,graphic-width", &buf) == -1) )
+ return true;
+
+ return false;
+}
+
static inline int get_arch_reserved_keys(void)
{
if (sysconf(_SC_PAGESIZE) == 4096)
return NR_RESERVED_PKEYS_4K;
else
- return NR_RESERVED_PKEYS_64K;
+ if (arch_is_powervm())
+ return NR_RESERVED_PKEYS_64K_4KEYS;
+ else
+ return NR_RESERVED_PKEYS_64K_3KEYS;
}
void expect_fault_on_read_execonly_key(void *p1, int pkey)
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
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,
linux-mm@kvack.org, aneesh.kumar@linux.ibm.com, x86@kernel.org,
linuxram@us.ibm.com, mhocko@kernel.org, dave.hansen@intel.com,
mingo@redhat.com,
"Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>,
msuchanek@suse.de, linuxppc-dev@lists.ozlabs.org,
bauerman@linux.ibm.com
Subject: [PATCH v16 14/23] selftests/vm/pkeys: Fix number of reserved powerpc pkeys
Date: Fri, 17 Jan 2020 18:19:53 +0530 [thread overview]
Message-ID: <2ef4b0cdc95953235d3e5687d98da8a3a074aaf5.1579265066.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1579265066.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1579265066.git.sandipan@linux.ibm.com>
From: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
The number of reserved pkeys in a PowerNV environment is
different from that on PowerVM or KVM.
Tested on PowerVM and PowerNV environments.
Signed-off-by: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
---
tools/testing/selftests/vm/pkey-powerpc.h | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/vm/pkey-powerpc.h b/tools/testing/selftests/vm/pkey-powerpc.h
index f4599a35d2a9..eaced8c198a2 100644
--- a/tools/testing/selftests/vm/pkey-powerpc.h
+++ b/tools/testing/selftests/vm/pkey-powerpc.h
@@ -28,7 +28,10 @@
#define NR_RESERVED_PKEYS_4K 27 /* pkey-0, pkey-1, exec-only-pkey
and 24 other keys that cannot be
represented in the PTE */
-#define NR_RESERVED_PKEYS_64K 3 /* pkey-0, pkey-1 and exec-only-pkey */
+#define NR_RESERVED_PKEYS_64K_3KEYS 3 /* PowerNV and KVM: pkey-0,
+ pkey-1 and exec-only key */
+#define NR_RESERVED_PKEYS_64K_4KEYS 4 /* PowerVM: pkey-0, pkey-1,
+ pkey-31 and exec-only key */
#define PKEY_BITS_PER_PKEY 2
#define HPAGE_SIZE (1UL << 24)
#define PAGE_SIZE (1UL << 16)
@@ -65,12 +68,27 @@ static inline int cpu_has_pku(void)
return 1;
}
+static inline bool arch_is_powervm()
+{
+ struct stat buf;
+
+ if ((stat("/sys/firmware/devicetree/base/ibm,partition-name", &buf) == 0) &&
+ (stat("/sys/firmware/devicetree/base/hmc-managed?", &buf) == 0) &&
+ (stat("/sys/firmware/devicetree/base/chosen/qemu,graphic-width", &buf) == -1) )
+ return true;
+
+ return false;
+}
+
static inline int get_arch_reserved_keys(void)
{
if (sysconf(_SC_PAGESIZE) == 4096)
return NR_RESERVED_PKEYS_4K;
else
- return NR_RESERVED_PKEYS_64K;
+ if (arch_is_powervm())
+ return NR_RESERVED_PKEYS_64K_4KEYS;
+ else
+ return NR_RESERVED_PKEYS_64K_3KEYS;
}
void expect_fault_on_read_execonly_key(void *p1, int pkey)
--
2.17.1
next prev parent reply other threads:[~2020-01-17 12:50 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 12:49 [PATCH v16 00/23] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 01/23] selftests/x86/pkeys: Move selftests to arch-neutral directory Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 02/23] selftests/vm: Rename all references to pkru to a generic name Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 03/23] selftests/vm: Move generic definitions to header file Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 04/23] selftests/vm: Move some definitions to arch-specific header Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 05/23] selftests/vm: Make gcc check arguments of sigsafe_printf() Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 06/23] selftests/vm: Typecast references to pkey register Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 07/23] selftests: vm: pkeys: Add helpers for pkey bits Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 08/23] selftests/vm: Fix pkey_disable_clear() Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 09/23] selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear() Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 10/23] selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 11/23] selftests: vm: pkeys: Use the correct huge page size Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 12/23] selftests/vm/pkeys: Introduce generic pkey abstractions Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 13/23] selftests/vm/pkeys: Introduce powerpc support Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das [this message]
2020-01-17 12:49 ` [PATCH v16 14/23] selftests/vm/pkeys: Fix number of reserved powerpc pkeys Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 15/23] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 16/23] selftests/vm/pkeys: Improve checks to determine pkey support Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 17/23] selftests/vm/pkeys: Associate key on a mapped page and detect access violation Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 18/23] selftests/vm/pkeys: Associate key on a mapped page and detect write violation Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 19/23] selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` [PATCH v16 20/23] selftests/vm/pkeys: Introduce a sub-page allocator Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:49 ` Sandipan Das
2020-01-17 12:50 ` [PATCH v16 21/23] selftests/vm/pkeys: Test correct behaviour of pkey-0 Sandipan Das
2020-01-17 12:50 ` Sandipan Das
2020-01-17 12:50 ` Sandipan Das
2020-01-17 12:50 ` [PATCH v16 22/23] selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das
2020-01-17 12:50 ` Sandipan Das
2020-01-17 12:50 ` Sandipan Das
2020-01-17 12:50 ` [PATCH v16 23/23] selftests: vm: pkeys: Use the correct page size " Sandipan Das
2020-01-17 12:50 ` Sandipan Das
2020-01-17 12:50 ` Sandipan Das
2020-01-17 18:02 ` [PATCH v16 00/23] selftests, powerpc, x86: Memory Protection Keys Dave Hansen
2020-01-17 18:02 ` Dave Hansen
2020-01-18 9:24 ` Sandipan Das
2020-01-18 9:24 ` 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=2ef4b0cdc95953235d3e5687d98da8a3a074aaf5.1579265066.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=desnesn@linux.vnet.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.