Commit 659df86a authored by Thomas Huth's avatar Thomas Huth Committed by Ingo Molnar
Browse files

x86: Remove the arch_calc_vm_prot_bits() macro from the UAPI 



The arch_calc_vm_prot_bits() macro uses VM_PKEY_BIT0 etc. which are
not part of the UAPI, so the macro is completely useless for userspace.

It is also hidden behind the CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
config switch which we shouldn't expose to userspace. Thus let's move
this macro into a new internal header instead.

Fixes: 8f62c883 ("x86/mm/pkeys: Add arch-specific VMA protection bits")
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarNicolas Schier <nicolas@fjasle.eu>
Acked-by: default avatarDave Hansen <dave.hansen@intel.com>
Link: https://lore.kernel.org/r/20230906162658.142511-1-thuth@redhat.com
parent 65e71089

arch/x86/include/asm/mman.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_MMAN_H__

#define __ASM_MMAN_H__



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

#define arch_calc_vm_prot_bits(prot, key) (		\

		((key) & 0x1 ? VM_PKEY_BIT0 : 0) |      \

		((key) & 0x2 ? VM_PKEY_BIT1 : 0) |      \

		((key) & 0x4 ? VM_PKEY_BIT2 : 0) |      \

		((key) & 0x8 ? VM_PKEY_BIT3 : 0))

#endif



#include <uapi/asm/mman.h>



#endif /* __ASM_MMAN_H__ */

arch/x86/include/uapi/asm/mman.h

+0 −8
Original line number Diff line number Diff line
@@ -5,14 +5,6 @@ 
#define MAP_32BIT	0x40		/* only give out 32bit addresses */

#define MAP_ABOVE4G	0x80		/* only map above 4GB */



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

#define arch_calc_vm_prot_bits(prot, key) (		\

		((key) & 0x1 ? VM_PKEY_BIT0 : 0) |      \

		((key) & 0x2 ? VM_PKEY_BIT1 : 0) |      \

		((key) & 0x4 ? VM_PKEY_BIT2 : 0) |      \

		((key) & 0x8 ? VM_PKEY_BIT3 : 0))

#endif



/* Flags for map_shadow_stack(2) */

#define SHADOW_STACK_SET_TOKEN	(1ULL << 0)	/* Set up a restore token in the shadow stack */

scripts/headers_install.sh

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO 
arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT

arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION

arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64

arch/x86/include/uapi/asm/mman.h:CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

"



for c in $configs