* [PATCH v3 0/2] Add test for atomic uaccess with permission overlay
@ 2026-11-19 10:56 Kevin Brodsky
2026-11-19 10:56 ` [PATCH v3 1/2] arm64: mm: Add note about overlays in PIE_EL1 Kevin Brodsky
2026-11-19 10:56 ` [PATCH v3 2/2] kselftest/arm64: Add test for atomic futex uaccess with POE Kevin Brodsky
0 siblings, 2 replies; 3+ messages in thread
From: Kevin Brodsky @ 2026-11-19 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Kevin Brodsky, Catalin Marinas, Joey Gouly, Linu Cherian,
Mark Brown, Shuah Khan, Will Deacon, Yeoreum Yun, linux-kernel,
linux-kselftest
POE is not currently enabled at EL1, but my series [1] protecting
page tables does exactly that, and it has revealed an interesting
issue.
Regular uaccess uses unprivileged loads/stores, which have overlays
applied and are checked against the user's POR_EL0 as intended (same
restrictions as when accessing memory from userspace). In some
cases, such as atomic operations when FEAT_LSUI isn't available, we
need to use privileged L/S with PAN disabled instead; overlays are
not applied in that case.
Once POE is enabled at EL1, we have to ensure that overlays are
still not applied to these accesses. Otherwise, they will be checked
against POR_EL1, which is completely invalid as kernel
pkeys/POIndices are unrelated to user pkeys.
If PIE is used, then we have to ensure that user memory types do not
have overlays applied in POR_EL1, as Sashiko reported [2] on an
earlier version of my series protecting page tables. Patch 1 tries
to preempt such errors by adding a comment. If PIE isn't available,
then... we're out of luck, as Sashiko reported later on [3]: we
cannot prevent overlays from being applied to user memory. We'll
most likely have to require PIE at least when POE is enabled at
EL1.
To avoid accidents in the future, patch 2 adds a kselftest to ensure
that atomic futex uaccess (which uses privileged loads/stores unless
FEAT_LSUI is available) does work on memory mapped with a
non-default pkey.
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
[1] https://lore.kernel.org/r/20261109-kpkeys-v10-0-aa6c4d9603bc@arm.com
[2] https://sashiko.dev/#/patchset/20260505-kpkeys-v7-0-20c0bdd97197%40arm.com?part=3
[3] https://lore.kernel.org/r/sashiko-outbox-207324@kernel.org
---
v2..v3:
* Patch 2: free memory/pkey at the end of the test [Mark B]
* Added Yeoreum's R-b (thanks!)
v1..v2:
* Reworded the cover letter and the commit message of patch 2 in
light of Sashiko's new findings (when PIE isn't available).
* Rebased on v7.4-rc3
v1: https://lore.kernel.org/all/20260521-poe_futex-v1-0-1da286b8f9b2@arm.com/
---
To: linux-arm-kernel@lists.infradead.org
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Joey Gouly <joey.gouly@arm.com>
Cc: Linu Cherian <linu.cherian@arm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Yeoreum Yun <yeoreum.yun@arm.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-kselftest@vger.kernel.org
---
Kevin Brodsky (2):
arm64: mm: Add note about overlays in PIE_EL1
kselftest/arm64: Add test for atomic futex uaccess with POE
arch/arm64/include/asm/pgtable-prot.h | 7 +++
tools/testing/selftests/arm64/Makefile | 2 +-
tools/testing/selftests/arm64/poe/.gitignore | 2 +
tools/testing/selftests/arm64/poe/Makefile | 6 +++
tools/testing/selftests/arm64/poe/poe_futex.c | 70 +++++++++++++++++++++++++++
5 files changed, 86 insertions(+), 1 deletion(-)
---
base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3
change-id: 20260520-poe_futex-ecb8c2276894
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 1/2] arm64: mm: Add note about overlays in PIE_EL1
2026-11-19 10:56 [PATCH v3 0/2] Add test for atomic uaccess with permission overlay Kevin Brodsky
@ 2026-11-19 10:56 ` Kevin Brodsky
2026-11-19 10:56 ` [PATCH v3 2/2] kselftest/arm64: Add test for atomic futex uaccess with POE Kevin Brodsky
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Brodsky @ 2026-11-19 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Kevin Brodsky, Catalin Marinas, Joey Gouly, Linu Cherian,
Mark Brown, Shuah Khan, Will Deacon, Yeoreum Yun, linux-kernel,
linux-kselftest
It isn't completely obvious why user page types do not have overlays
applied in PIE_EL1. Add a comment to that effect, to avoid
unpleasant surprises in the future.
Reviewed-by: Yeoreum Yun <yeoreum.yun@arm.com>
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
---
arch/arm64/include/asm/pgtable-prot.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h
index 590ef4328f12..e6788e2e23bf 100644
--- a/arch/arm64/include/asm/pgtable-prot.h
+++ b/arch/arm64/include/asm/pgtable-prot.h
@@ -175,6 +175,13 @@ static inline bool __pure lpa2_is_enabled(void)
PIRx_ELx_PERM_PREP(pte_pi_index(_PAGE_READONLY), PIE_R_O) | \
PIRx_ELx_PERM_PREP(pte_pi_index(_PAGE_SHARED), PIE_RW_O))
+/*
+ * Regular user page types such as _PAGE_SHARED must not have overlays applied
+ * in PIE_EL1. If POE is enabled at EL1, and in the absence of FEAT_LSUI, this
+ * would break futex atomic operations on user memory with a non-default
+ * POIndex; the privileged atomic load/store instructions would be mistakenly
+ * checked against POR_EL1.
+ */
#define PIE_E1 ( \
PIRx_ELx_PERM_PREP(pte_pi_index(_PAGE_GCS), PIE_NONE_O) | \
PIRx_ELx_PERM_PREP(pte_pi_index(_PAGE_GCS_RO), PIE_NONE_O) | \
--
2.56.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 2/2] kselftest/arm64: Add test for atomic futex uaccess with POE
2026-11-19 10:56 [PATCH v3 0/2] Add test for atomic uaccess with permission overlay Kevin Brodsky
2026-11-19 10:56 ` [PATCH v3 1/2] arm64: mm: Add note about overlays in PIE_EL1 Kevin Brodsky
@ 2026-11-19 10:56 ` Kevin Brodsky
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Brodsky @ 2026-11-19 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Kevin Brodsky, Catalin Marinas, Joey Gouly, Linu Cherian,
Mark Brown, Shuah Khan, Will Deacon, Yeoreum Yun, linux-kernel,
linux-kselftest
Add a new test to ensure that atomic futex uaccess succeeds on
memory mapped with a non-default POIndex/pkey.
In the absence of FEAT_LSUI, atomic futex uaccess operations such as
those triggered by FUTEX_WAKE_OP use privileged atomic load/store
instructions and thus cannot have user permission overlays (POR_EL0)
applied. In case the kernel enabled POE at EL1, it is worth
checking that kernel overlays (POR_EL1) are not applied to these
accesses, as that would fail for non-zero pkeys.
Note that if such misconfiguration occurs, futex_wake_op() may get
stuck in an infinite loop because futex_atomic_op_inuser() will fail
but fault_in_user_writeable() will still report success.
Reviewed-by: Yeoreum Yun <yeoreum.yun@arm.com>
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
---
tools/testing/selftests/arm64/Makefile | 2 +-
tools/testing/selftests/arm64/poe/.gitignore | 2 +
tools/testing/selftests/arm64/poe/Makefile | 6 +++
tools/testing/selftests/arm64/poe/poe_futex.c | 70 +++++++++++++++++++++++++++
4 files changed, 79 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/arm64/Makefile b/tools/testing/selftests/arm64/Makefile
index e456f3b62fa1..bad5c3b33dce 100644
--- a/tools/testing/selftests/arm64/Makefile
+++ b/tools/testing/selftests/arm64/Makefile
@@ -4,7 +4,7 @@
ARCH ?= $(shell uname -m 2>/dev/null || echo not)
ifneq (,$(filter $(ARCH),aarch64 arm64))
-ARM64_SUBTARGETS ?= tags signal pauth fp mte bti abi gcs
+ARM64_SUBTARGETS ?= tags signal pauth fp mte bti abi gcs poe
else
ARM64_SUBTARGETS :=
endif
diff --git a/tools/testing/selftests/arm64/poe/.gitignore b/tools/testing/selftests/arm64/poe/.gitignore
new file mode 100644
index 000000000000..0dce4a3aa38b
--- /dev/null
+++ b/tools/testing/selftests/arm64/poe/.gitignore
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+poe_futex
diff --git a/tools/testing/selftests/arm64/poe/Makefile b/tools/testing/selftests/arm64/poe/Makefile
new file mode 100644
index 000000000000..2af2bbf3f6d3
--- /dev/null
+++ b/tools/testing/selftests/arm64/poe/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+
+CFLAGS += $(KHDR_INCLUDES)
+TEST_GEN_PROGS := poe_futex
+
+include ../../lib.mk
diff --git a/tools/testing/selftests/arm64/poe/poe_futex.c b/tools/testing/selftests/arm64/poe/poe_futex.c
new file mode 100644
index 000000000000..65c5be8fb9ec
--- /dev/null
+++ b/tools/testing/selftests/arm64/poe/poe_futex.c
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <linux/futex.h>
+#include <sys/syscall.h>
+
+#include "kselftest_harness.h"
+
+static int sys_pkey_alloc(unsigned long flags, unsigned long init_val)
+{
+ return syscall(__NR_pkey_alloc, flags, init_val);
+}
+
+static int sys_pkey_mprotect(void *ptr, size_t size, int prot, int pkey)
+{
+ return syscall(__NR_pkey_mprotect, ptr, size, prot, pkey);
+}
+
+static int sys_pkey_free(int pkey)
+{
+ return syscall(__NR_pkey_free, pkey);
+}
+
+static int futex_wake_op(uint32_t *uaddr, uint32_t val, uint32_t val2,
+ uint32_t *uaddr2, uint32_t val3)
+{
+ return syscall(SYS_futex, uaddr, FUTEX_WAKE_OP, val, val2,
+ uaddr2, val3);
+}
+
+/*
+ * Trigger some atomic uaccess on a page mapped with a non-default pkey.
+ *
+ * This ensures that such access is not mistakenly checked against the
+ * kernel's POR_EL1 register.
+ */
+TEST(poe_futex)
+{
+ int ret, pkey;
+ void *ptr;
+ size_t size = getpagesize();
+
+ pkey = sys_pkey_alloc(0, 0);
+
+ if (pkey == -1 && errno == ENOSPC)
+ SKIP(return, "pkeys are not supported");
+
+ ASSERT_GT(pkey, 0);
+
+ ptr = mmap(NULL, size, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ ASSERT_NE(ptr, MAP_FAILED);
+
+ ret = sys_pkey_mprotect(ptr, size, PROT_READ | PROT_WRITE, pkey);
+ ASSERT_EQ(ret, 0);
+
+ /*
+ * There is no one to wake up so this syscall boils down to *(ptr+4) = 0
+ * (arch_futex_atomic_op_inuser() called with FUTEX_OP_SET and op_arg=0).
+ */
+ ret = futex_wake_op(ptr, 1, 1, ptr + sizeof(uint32_t), 0);
+ ASSERT_EQ(ret, 0);
+
+ sys_pkey_free(pkey);
+ munmap(ptr, size);
+}
+
+TEST_HARNESS_MAIN
--
2.56.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-19 10:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 10:56 [PATCH v3 0/2] Add test for atomic uaccess with permission overlay Kevin Brodsky
2026-11-19 10:56 ` [PATCH v3 1/2] arm64: mm: Add note about overlays in PIE_EL1 Kevin Brodsky
2026-11-19 10:56 ` [PATCH v3 2/2] kselftest/arm64: Add test for atomic futex uaccess with POE Kevin Brodsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®