From: ira.weiny@intel.com
To: Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Dan Williams <dan.j.williams@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
"Shankar, Ravi V" <ravi.v.shankar@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V10 43/44] mm/pkeys: PKS testing, test pks_update_exception()
Date: Tue, 19 Apr 2022 10:06:48 -0700 [thread overview]
Message-ID: <20220419170649.1022246-44-ira.weiny@intel.com> (raw)
In-Reply-To: <20220419170649.1022246-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
A common use case for the custom fault callbacks will be for the
callback to warn of the violation and relax the permissions rather than
crash the kernel. pks_update_exception() was added for this purpose.
Add a test which uses pks_update_exception() to clear the pkey
permissions. Verify that the permissions are changed in the interrupted
thread.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes for V9
Update the commit message
Clean up test name
Add test_pks support
s/pks_mk_*/pks_set_*/
Simplify the use of globals for the faults
From Rick Edgecombe
Use WRITE_ONCE to protect against races with the fault
handler
s/RUN_FAULT_ABANDON/RUN_FAULT_CALLBACK
Changes for V8
New test developed just to double check for regressions while
reworking the code.
---
lib/pks/pks_test.c | 60 ++++++++++++++++++++++++++
tools/testing/selftests/x86/test_pks.c | 5 ++-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/lib/pks/pks_test.c b/lib/pks/pks_test.c
index 762f4a19cb7d..a9cd2a49abfa 100644
--- a/lib/pks/pks_test.c
+++ b/lib/pks/pks_test.c
@@ -49,6 +49,7 @@
#define ARM_CTX_SWITCH 2
#define CHECK_CTX_SWITCH 3
#define RUN_EXCEPTION 4
+#define RUN_EXCEPTION_UPDATE 5
#define RUN_CRASH_TEST 9
DECLARE_PER_CPU(u32, pkrs_cache);
@@ -64,6 +65,7 @@ struct pks_test_ctx {
void *test_page;
bool fault_seen;
bool validate_exp_handling;
+ bool validate_update_exp;
};
static bool check_pkey_val(u32 pk_reg, u8 pkey, u32 expected)
@@ -164,6 +166,16 @@ static void validate_exception(struct pks_test_ctx *ctx, u32 thread_pkrs)
}
}
+static bool handle_update_exception(struct pt_regs *regs, struct pks_test_ctx *ctx)
+{
+ pr_debug("Updating pkey %d during exception\n", ctx->pkey);
+
+ ctx->fault_seen = true;
+ pks_update_exception(regs, ctx->pkey, 0);
+
+ return true;
+}
+
/* Global data protected by test_run_lock */
struct pks_test_ctx *g_ctx_under_test;
@@ -190,6 +202,9 @@ bool pks_test_fault_callback(struct pt_regs *regs, unsigned long address,
if (!g_ctx_under_test)
return false;
+ if (g_ctx_under_test->validate_update_exp)
+ return handle_update_exception(regs, g_ctx_under_test);
+
if (g_ctx_under_test->validate_exp_handling) {
validate_exception(g_ctx_under_test, pkrs);
/*
@@ -518,6 +533,47 @@ static void check_ctx_switch(struct pks_session_data *sd)
}
}
+static bool run_exception_update(struct pks_session_data *sd)
+{
+ struct pks_test_ctx *ctx;
+
+ ctx = alloc_ctx(PKS_KEY_TEST);
+ if (IS_ERR(ctx))
+ return false;
+
+ set_ctx_data(sd, ctx);
+
+ ctx->fault_seen = false;
+ ctx->validate_update_exp = true;
+ pks_set_noaccess(ctx->pkey);
+
+ set_context_for_fault(ctx);
+
+ /* fault */
+ memcpy(ctx->test_page, ctx->data, 8);
+
+ if (!ctx->fault_seen) {
+ pr_err("Failed to see the callback\n");
+ return false;
+ }
+
+ ctx->fault_seen = false;
+ ctx->validate_update_exp = false;
+
+ set_context_for_fault(ctx);
+
+ /* no fault */
+ memcpy(ctx->test_page, ctx->data, 8);
+
+ if (ctx->fault_seen) {
+ pr_err("Pkey %d failed to be set RD/WR in the callback\n",
+ ctx->pkey);
+ return false;
+ }
+
+ return true;
+}
+
static ssize_t pks_read_file(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
@@ -584,6 +640,10 @@ static ssize_t pks_write_file(struct file *file, const char __user *user_buf,
pr_debug("Exception checking\n");
sd->last_test_pass = run_exception_test(file->private_data);
break;
+ case RUN_EXCEPTION_UPDATE:
+ pr_debug("Fault clear test\n");
+ sd->last_test_pass = run_exception_update(file->private_data);
+ break;
default:
pr_debug("Unknown test\n");
sd->last_test_pass = false;
diff --git a/tools/testing/selftests/x86/test_pks.c b/tools/testing/selftests/x86/test_pks.c
index c40035803e38..194c9dd9a211 100644
--- a/tools/testing/selftests/x86/test_pks.c
+++ b/tools/testing/selftests/x86/test_pks.c
@@ -36,6 +36,7 @@
#define ARM_CTX_SWITCH "2"
#define CHECK_CTX_SWITCH "3"
#define RUN_EXCEPTION "4"
+#define RUN_EXCEPTION_UPDATE "5"
#define RUN_CRASH_TEST "9"
time_t g_start_time;
@@ -63,6 +64,7 @@ enum {
TEST_SINGLE,
TEST_CTX_SWITCH,
TEST_EXCEPTION,
+ TEST_FAULT_CALLBACK,
MAX_TESTS,
} tests;
@@ -77,7 +79,8 @@ struct test_item {
{ "check_defaults", CHECK_DEFAULTS, do_simple_test },
{ "single", RUN_SINGLE, do_simple_test },
{ "context_switch", ARM_CTX_SWITCH, do_context_switch },
- { "exception", RUN_EXCEPTION, do_simple_test }
+ { "exception", RUN_EXCEPTION, do_simple_test },
+ { "exception_update", RUN_EXCEPTION_UPDATE, do_simple_test }
};
static char *get_test_name(int test_num)
--
2.35.1
next prev parent reply other threads:[~2022-04-19 17:09 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 17:06 [PATCH V10 00/44] PKS/PMEM: Add Stray Write Protection ira.weiny
2022-04-19 17:06 ` [PATCH V10 01/44] Documentation/protection-keys: Clean up documentation for User Space pkeys ira.weiny
2022-06-07 23:09 ` [tip: x86/mm] " tip-bot2 for Ira Weiny
2022-04-19 17:06 ` [PATCH V10 02/44] x86/pkeys: Clarify PKRU_AD_KEY macro ira.weiny
2022-06-07 23:09 ` [tip: x86/mm] " tip-bot2 for Ira Weiny
2022-04-19 17:06 ` [PATCH V10 03/44] x86/pkeys: Make PKRU macros generic ira.weiny
2022-04-19 17:06 ` [PATCH V10 04/44] x86/fpu: Refactor arch_set_user_pkey_access() ira.weiny
2022-04-19 17:06 ` [PATCH V10 05/44] mm/pkeys: Add Kconfig options for PKS ira.weiny
2022-04-19 17:06 ` [PATCH V10 06/44] x86/pkeys: Add PKS CPU feature bit ira.weiny
2022-04-19 17:06 ` [PATCH V10 07/44] x86/fault: Adjust WARN_ON for pkey fault ira.weiny
2022-04-19 17:06 ` [PATCH V10 08/44] Documentation/pkeys: Add initial PKS documentation ira.weiny
2022-05-09 22:03 ` Kees Cook
2022-05-10 17:18 ` Ira Weiny
2022-05-10 20:17 ` Kees Cook
2022-04-19 17:06 ` [PATCH V10 09/44] mm/pkeys: Provide for PKS key allocation ira.weiny
2022-04-19 17:06 ` [PATCH V10 10/44] x86/pkeys: Enable PKS on cpus which support it ira.weiny
2022-04-19 17:06 ` [PATCH V10 11/44] mm/pkeys: Define PKS page table macros ira.weiny
2022-04-19 17:06 ` [PATCH V10 12/44] x86/pkeys: Introduce pks_write_pkrs() ira.weiny
2022-04-19 17:06 ` [PATCH V10 13/44] x86/pkeys: Preserve the PKS MSR on context switch ira.weiny
2022-04-19 17:06 ` [PATCH V10 14/44] mm/pkeys: Introduce pks_set_readwrite() ira.weiny
2022-05-09 21:38 ` Kees Cook
2022-05-10 21:33 ` Ira Weiny
2022-05-10 22:08 ` Kees Cook
2022-05-10 22:26 ` Edgecombe, Rick P
2022-05-11 3:15 ` Kees Cook
2022-05-11 17:59 ` Ira Weiny
2022-04-19 17:06 ` [PATCH V10 15/44] mm/pkeys: Introduce pks_set_noaccess() ira.weiny
2022-04-19 17:06 ` [PATCH V10 16/44] mm/pkeys: Introduce PKS fault callbacks ira.weiny
2022-04-19 17:06 ` [PATCH V10 17/44] x86/entry: Add auxiliary pt_regs space ira.weiny
2022-04-19 17:06 ` [PATCH V10 18/44] entry: Pass pt_regs to irqentry_exit_cond_resched() ira.weiny
2022-04-19 17:06 ` [PATCH V10 19/44] entry: Add calls for save/restore auxiliary pt_regs ira.weiny
2022-04-19 17:06 ` [PATCH V10 20/44] x86/entry: Define arch_{save|restore}_auxiliary_pt_regs() ira.weiny
2022-04-19 17:06 ` [PATCH V10 21/44] x86/pkeys: Preserve PKRS MSR across exceptions ira.weiny
2022-04-19 17:06 ` [PATCH V10 22/44] x86/fault: Print PKS MSR on fault ira.weiny
2022-04-19 17:06 ` [PATCH V10 23/44] mm/pkeys: Introduce pks_update_exception() ira.weiny
2022-04-19 17:06 ` [PATCH V10 24/44] mm/pkeys: Add pks_available() ira.weiny
2022-04-19 17:06 ` [PATCH V10 25/44] memremap_pages: Add Kconfig for DEVMAP_ACCESS_PROTECTION ira.weiny
2022-04-19 17:06 ` [PATCH V10 26/44] memremap_pages: Introduce pgmap_protection_available() ira.weiny
2022-04-19 17:06 ` [PATCH V10 27/44] memremap_pages: Introduce a PGMAP_PROTECTION flag ira.weiny
2022-04-19 17:06 ` [PATCH V10 28/44] memremap_pages: Introduce devmap_protected() ira.weiny
2022-04-19 17:06 ` [PATCH V10 29/44] memremap_pages: Reserve a PKS pkey for eventual use by PMEM ira.weiny
2022-04-19 17:06 ` [PATCH V10 30/44] memremap_pages: Set PKS pkey in PTEs if requested ira.weiny
2022-04-19 17:06 ` [PATCH V10 31/44] memremap_pages: Define pgmap_set_{readwrite|noaccess}() calls ira.weiny
2022-04-19 17:06 ` [PATCH V10 32/44] memremap_pages: Add memremap.pks_fault_mode ira.weiny
2022-04-19 17:06 ` [PATCH V10 33/44] kmap: Make kmap work for devmap protected pages ira.weiny
2022-04-28 15:50 ` Christoph Hellwig
2022-05-12 1:25 ` Ira Weiny
2022-05-17 22:46 ` Ira Weiny
2022-05-18 7:33 ` Christoph Hellwig
2022-05-19 20:29 ` Ira Weiny
2022-04-19 17:06 ` [PATCH V10 34/44] dax: Stray access protection for dax_direct_access() ira.weiny
2022-04-19 17:06 ` [PATCH V10 35/44] nvdimm/pmem: Enable stray access protection ira.weiny
2022-04-19 17:06 ` [PATCH V10 36/44] devdax: " ira.weiny
2022-04-19 17:06 ` [PATCH V10 37/44] mm/pkeys: PKS testing, add initial test code ira.weiny
2022-04-19 17:06 ` [PATCH V10 38/44] x86/selftests: Add test_pks ira.weiny
2022-04-19 17:06 ` [PATCH V10 39/44] mm/pkeys: PKS testing, add a fault call back ira.weiny
2022-04-19 17:06 ` [PATCH V10 40/44] mm/pkeys: PKS testing, add pks_set_*() tests ira.weiny
2022-04-19 17:06 ` [PATCH V10 41/44] mm/pkeys: PKS testing, test context switching ira.weiny
2022-04-19 17:06 ` [PATCH V10 42/44] mm/pkeys: PKS testing, Add exception test ira.weiny
2022-04-19 17:06 ` ira.weiny [this message]
2022-04-19 17:06 ` [PATCH V10 44/44] mm/pkeys: PKS testing, add test for all keys 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=20220419170649.1022246-44-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ravi.v.shankar@intel.com \
--cc=rick.p.edgecombe@intel.com \
/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).