selftests/mm: remove the local PKEY_UNRESTRICTED fallback
Subsystems (3)
PATCH v3 1/1 selftests/mm: remove the local PKEY_UNRESTRICTED fallback
pkey-helpers.h defines PKEY_UNRESTRICTED itself when the macro is not already known, a stopgap from when the generic definition was still under review. It has been merged since, commit 6d61527d931b ("mm/pkey:
Add PKEY_UNRESTRICTED macro"), so the guard is never taken and the FIXME can be honoured.
The definition comes from tools/include/uapi/asm-generic/mman-common.h via TOOLS_INCLUDES, which commit e076eaca5906 ("selftests: break the dependency upon local header files") added so that the mm selftests build without "make headers". It is reached through the <asm-generic/mman.h> that the system <asm/mman.h> includes. Building the pkey tests with KHDR_INCLUDES pointing at an empty directory confirms that; emptying TOOLS_INCLUDES as well is what makes the macro go missing.
No functional change intended.
---
Changes in v3:
- Add the Assisted-by tag Lorenzo asked for; an AI assistant was used while tracing the include path and preparing the patch. The builds and the cpp output quoted below were run and checked by me.
- Pick up the acks from David and Lorenzo.
- Sent as a new mail rather than in reply to v2, as both asked.
Changes in v2:
- Drop the incorrect claim that the mm selftests are built against the headers of the kernel source and would fail without "make headers". They are not, as Lorenzo pointed out; describe where the definition really comes from instead.
- Leave tools/testing/selftests/powerpc/include/pkeys.h alone, as discussed with David on v1. Unlike the mm one it is an unconditional #undef/#define next to other powerpc specific overrides, and that header only includes <sys/mman.h>, which does not provide PKEY_UNRESTRICTED with or without TOOLS_INCLUDES, so its definition is load bearing.
The full include path, for reference:
pkey-helpers.h
-> <linux/mman.h> tools/include/uapi/linux/mman.h
-> <asm/mman.h> /usr/include/asm/mman.h
(tools/include/uapi/asm/mman.h does not exist)
-> <asm-generic/mman.h> tools/include/uapi/asm-generic/mman.h
(-isystem puts it ahead of the system one)
-> <asm-generic/mman-common-tools.h>
-> <asm-generic/mman-common.h> PKEY_UNRESTRICTEDtools/testing/selftests/mm/pkey-helpers.h | 7 ------- 1 file changed, 7 deletions(-)
tools/testing/selftests/mm/pkey-helpers.h +0 -7
@@ -112,13 +112,6 @@ void record_pkey_malloc(void *ptr, long size, int prot);#define PKEY_MASK (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE)#endif -/* -* FIXME: Remove once the generic PKEY_UNRESTRICTED definition is merged. -*/ -#ifndef PKEY_UNRESTRICTED -#define PKEY_UNRESTRICTED 0x0 -#endif -#ifndef set_pkey_bitsstatic inline u64 set_pkey_bits (u64 reg,int pkey,u64 flags) {
Signature · 1 line
2.43.7
Quoted 15 lines · On Tue, 25 Aug 2026 21:47:15 +0530 Hemanth Selam <[email protected]>…
pkey-helpers.hdefinesPKEY_UNRESTRICTEDitself when the macro is not already known, a stopgap from when the generic definition was still under review. It has been merged since, commit6d61527d931b("mm/pkey:
AddPKEY_UNRESTRICTEDmacro"), so the guard is never taken and the FIXME can be honoured.The definition comes from
tools/include/uapi/asm-generic/mman-common.hviaTOOLS_INCLUDES, which commite076eaca5906("selftests: break the dependency upon local header files") added so that the mm selftests build without "make headers". It is reached through the <asm-generic/mman.h> that the system <asm/mman.h> includes. Building the pkey tests withKHDR_INCLUDESpointing at an empty directory confirms that; emptyingTOOLS_INCLUDESas well is what makes the macro go missing.
Quoted 1 line
No functional change intended.
Makes sense to me.
Quoted 5 lines
Assisted-by Cursor:claude-opus-5Signed-off-by Hemanth Selam <[email protected]>
Thanks,
SJ
[...]