Make VM_* flag constant definitions consistent - unify all to use BIT() macro. We have previously changed VM_MERGEABLE in a separate bugfix. This is a follow-up to make all the VM_* flag constant definitions consistent, as suggested by David in [1]. [1]: https://lore.kernel.org/all/85f852f9-8577-4230-adc7-c52e7f479454@redhat.com/ Signed-off-by: Jakub Acs Cc: Andrew Morton Cc: David Hildenbrand Cc: Xu Xin Cc: Chengming Zhou Cc: Peter Xu Cc: Axel Rasmussen Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- v3 -> v4: - fix VM_MAYOVERLAY and VM_PFNMAP definitions - send outside the series This depends on the following patch: https://lore.kernel.org/all/20251001090353.57523-2-acsjakub@amazon.de/ v3: https://lore.kernel.org/all/20251001090353.57523-3-acsjakub@amazon.de/ include/linux/mm.h | 66 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index c6794d0e24eb..cb33f967d327 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -246,56 +246,56 @@ extern unsigned int kobjsize(const void *objp); * vm_flags in vm_area_struct, see mm_types.h. * When changing, update also include/trace/events/mmflags.h */ -#define VM_NONE 0x00000000 +#define VM_NONE 0 -#define VM_READ 0x00000001 /* currently active flags */ -#define VM_WRITE 0x00000002 -#define VM_EXEC 0x00000004 -#define VM_SHARED 0x00000008 +#define VM_READ BIT(0) /* currently active flags */ +#define VM_WRITE BIT(1) +#define VM_EXEC BIT(2) +#define VM_SHARED BIT(3) /* mprotect() hardcodes VM_MAYREAD >> 4 == VM_READ, and so for r/w/x bits. */ -#define VM_MAYREAD 0x00000010 /* limits for mprotect() etc */ -#define VM_MAYWRITE 0x00000020 -#define VM_MAYEXEC 0x00000040 -#define VM_MAYSHARE 0x00000080 +#define VM_MAYREAD BIT(4) /* limits for mprotect() etc */ +#define VM_MAYWRITE BIT(5) +#define VM_MAYEXEC BIT(6) +#define VM_MAYSHARE BIT(7) -#define VM_GROWSDOWN 0x00000100 /* general info on the segment */ +#define VM_GROWSDOWN BIT(8) /* general info on the segment */ #ifdef CONFIG_MMU -#define VM_UFFD_MISSING 0x00000200 /* missing pages tracking */ +#define VM_UFFD_MISSING BIT(9) /* missing pages tracking */ #else /* CONFIG_MMU */ -#define VM_MAYOVERLAY 0x00000200 /* nommu: R/O MAP_PRIVATE mapping that might overlay a file mapping */ +#define VM_MAYOVERLAY BIT(9) /* nommu: R/O MAP_PRIVATE mapping that might overlay a file mapping */ #define VM_UFFD_MISSING 0 #endif /* CONFIG_MMU */ -#define VM_PFNMAP 0x00000400 /* Page-ranges managed without "struct page", just pure PFN */ -#define VM_UFFD_WP 0x00001000 /* wrprotect pages tracking */ +#define VM_PFNMAP BIT(10) /* Page-ranges managed without "struct page", just pure PFN */ +#define VM_UFFD_WP BIT(12) /* wrprotect pages tracking */ -#define VM_LOCKED 0x00002000 -#define VM_IO 0x00004000 /* Memory mapped I/O or similar */ +#define VM_LOCKED BIT(13) +#define VM_IO BIT(14) /* Memory mapped I/O or similar */ /* Used by sys_madvise() */ -#define VM_SEQ_READ 0x00008000 /* App will access data sequentially */ -#define VM_RAND_READ 0x00010000 /* App will not benefit from clustered reads */ - -#define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */ -#define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */ -#define VM_LOCKONFAULT 0x00080000 /* Lock the pages covered when they are faulted in */ -#define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */ -#define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */ -#define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ -#define VM_SYNC 0x00800000 /* Synchronous page faults */ -#define VM_ARCH_1 0x01000000 /* Architecture-specific flag */ -#define VM_WIPEONFORK 0x02000000 /* Wipe VMA contents in child. */ -#define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */ +#define VM_SEQ_READ BIT(15) /* App will access data sequentially */ +#define VM_RAND_READ BIT(16) /* App will not benefit from clustered reads */ + +#define VM_DONTCOPY BIT(17) /* Do not copy this vma on fork */ +#define VM_DONTEXPAND BIT(18) /* Cannot expand with mremap() */ +#define VM_LOCKONFAULT BIT(19) /* Lock the pages covered when they are faulted in */ +#define VM_ACCOUNT BIT(20) /* Is a VM accounted object */ +#define VM_NORESERVE BIT(21) /* should the VM suppress accounting */ +#define VM_HUGETLB BIT(22) /* Huge TLB Page VM */ +#define VM_SYNC BIT(23) /* Synchronous page faults */ +#define VM_ARCH_1 BIT(24) /* Architecture-specific flag */ +#define VM_WIPEONFORK BIT(25) /* Wipe VMA contents in child. */ +#define VM_DONTDUMP BIT(26) /* Do not include in the core dump */ #ifdef CONFIG_MEM_SOFT_DIRTY -# define VM_SOFTDIRTY 0x08000000 /* Not soft dirty clean area */ +# define VM_SOFTDIRTY BIT(27) /* Not soft dirty clean area */ #else # define VM_SOFTDIRTY 0 #endif -#define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ -#define VM_HUGEPAGE 0x20000000 /* MADV_HUGEPAGE marked this vma */ -#define VM_NOHUGEPAGE 0x40000000 /* MADV_NOHUGEPAGE marked this vma */ +#define VM_MIXEDMAP BIT(28) /* Can contain "struct page" and pure PFN pages */ +#define VM_HUGEPAGE BIT(29) /* MADV_HUGEPAGE marked this vma */ +#define VM_NOHUGEPAGE BIT(30) /* MADV_NOHUGEPAGE marked this vma */ #define VM_MERGEABLE BIT(31) /* KSM may merge identical pages */ #ifdef CONFIG_ARCH_USES_HIGH_VMA_FLAGS -- 2.47.3 Amazon Web Services Development Center Germany GmbH Tamara-Danz-Str. 13 10243 Berlin Geschaeftsfuehrung: Christian Schlaeger Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597