Commit f04fd85f authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

mm: correct type for vmalloc vm_flags fields 

Several functions refer to the unfortunately named 'vm_flags' field when
referencing vmalloc flags, which happens to be the precise same name used
for VMA flags.

As a result these were erroneously changed to use the vm_flags_t type
(which currently is a typedef equivalent to unsigned long).

Currently this has no impact, but in future when vm_flags_t changes this
will result in issues, so change the type to unsigned long to account for
this.

[lorenzo.stoakes@oracle.com: fixup very disguised vmalloc flags parameter]
  Link: https://lkml.kernel.org/r/e74dd8de-7e60-47ab-8a45-2c851f3c5d26@lucifer.local
Link: https://lkml.kernel.org/r/20250729114906.55347-1-lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reported-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Closes: https://lore.kernel.org/all/aIgSpAnU8EaIcqd9@hyeyoo/


Reviewed-by: default avatarPedro Falcato <pfalcato@suse.de>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: "Uladzislau Rezki (Sony)" <urezki@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent de55be42

arch/arm64/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ void mark_rodata_ro(void) 


static void __init declare_vma(struct vm_struct *vma,

			       void *va_start, void *va_end,

			       vm_flags_t vm_flags)

			       unsigned long vm_flags)

{

	phys_addr_t pa_start = __pa_symbol(va_start);

	unsigned long size = va_end - va_start;

mm/execmem.c

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static struct execmem_info default_execmem_info __ro_after_init; 


#ifdef CONFIG_MMU

static void *execmem_vmalloc(struct execmem_range *range, size_t size,

			     pgprot_t pgprot, vm_flags_t vm_flags)

			     pgprot_t pgprot, unsigned long vm_flags)

{

	bool kasan = range->flags & EXECMEM_KASAN_SHADOW;

	gfp_t gfp_flags = GFP_KERNEL | __GFP_NOWARN;
@@ -82,7 +82,7 @@ struct vm_struct *execmem_vmap(size_t size) 
}

#else

static void *execmem_vmalloc(struct execmem_range *range, size_t size,

			     pgprot_t pgprot, vm_flags_t vm_flags)

			     pgprot_t pgprot, unsigned long vm_flags)

{

	return vmalloc(size);

}
@@ -283,7 +283,7 @@ static void *__execmem_cache_alloc(struct execmem_range *range, size_t size) 


static int execmem_cache_populate(struct execmem_range *range, size_t size)

{

	vm_flags_t vm_flags = VM_ALLOW_HUGE_VMAP;

	unsigned long vm_flags = VM_ALLOW_HUGE_VMAP;

	struct vm_struct *vm;

	size_t alloc_size;

	int err = -ENOMEM;
@@ -465,7 +465,7 @@ void *execmem_alloc(enum execmem_type type, size_t size) 
{

	struct execmem_range *range = &execmem_info->ranges[type];

	bool use_cache = range->flags & EXECMEM_ROX_CACHE;

	vm_flags_t vm_flags = VM_FLUSH_RESET_PERMS;

	unsigned long vm_flags = VM_FLUSH_RESET_PERMS;

	pgprot_t pgprot = range->pgprot;

	void *p = NULL;

mm/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -1391,7 +1391,7 @@ int migrate_device_coherent_folio(struct folio *folio); 


struct vm_struct *__get_vm_area_node(unsigned long size,

				     unsigned long align, unsigned long shift,

				     vm_flags_t vm_flags, unsigned long start,

				     unsigned long vm_flags, unsigned long start,

				     unsigned long end, int node, gfp_t gfp_mask,

				     const void *caller);

mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) 


void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align,

		unsigned long start, unsigned long end, gfp_t gfp_mask,

		pgprot_t prot, vm_flags_t vm_flags, int node,

		pgprot_t prot, unsigned long vm_flags, int node,

		const void *caller)

{

	return __vmalloc_noprof(size, gfp_mask);