Skip to content

Commit 63c17fb

Browse files
hansendcIngo Molnar
authored andcommitted
mm/core, x86/mm/pkeys: Store protection bits in high VMA flags
vma->vm_flags is an 'unsigned long', so has space for 32 flags on 32-bit architectures. The high 32 bits are unused on 64-bit platforms. We've steered away from using the unused high VMA bits for things because we would have difficulty supporting it on 32-bit. Protection Keys are not available in 32-bit mode, so there is no concern about supporting this feature in 32-bit mode or on 32-bit CPUs. This patch carves out 4 bits from the high half of vma->vm_flags and allows architectures to set config option to make them available. Sparse complains about these constants unless we explicitly call them "UL". Signed-off-by: Dave Hansen <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dan Williams <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Jan Kara <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Konstantin Khlebnikov <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Sasha Levin <[email protected]> Cc: Valentin Rothberg <[email protected]> Cc: Vladimir Davydov <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Xie XiuQi <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent b3ecd51 commit 63c17fb

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

arch/x86/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ config X86
155155
select VIRT_TO_BUS
156156
select X86_DEV_DMA_OPS if X86_64
157157
select X86_FEATURE_NAMES if PROC_FS
158+
select ARCH_USES_HIGH_VMA_FLAGS if X86_INTEL_MEMORY_PROTECTION_KEYS
158159

159160
config INSTRUCTION_DECODER
160161
def_bool y

include/linux/mm.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,17 @@ extern unsigned int kobjsize(const void *objp);
170170
#define VM_NOHUGEPAGE 0x40000000 /* MADV_NOHUGEPAGE marked this vma */
171171
#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
172172

173+
#ifdef CONFIG_ARCH_USES_HIGH_VMA_FLAGS
174+
#define VM_HIGH_ARCH_BIT_0 32 /* bit only usable on 64-bit architectures */
175+
#define VM_HIGH_ARCH_BIT_1 33 /* bit only usable on 64-bit architectures */
176+
#define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */
177+
#define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */
178+
#define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0)
179+
#define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1)
180+
#define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2)
181+
#define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3)
182+
#endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */
183+
173184
#if defined(CONFIG_X86)
174185
# define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */
175186
#elif defined(CONFIG_PPC)

mm/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,3 +669,6 @@ config ZONE_DEVICE
669669

670670
config FRAME_VECTOR
671671
bool
672+
673+
config ARCH_USES_HIGH_VMA_FLAGS
674+
bool

0 commit comments

Comments
 (0)