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

mm: update core kernel code to use vm_flags_t consistently 

The core kernel code is currently very inconsistent in its use of
vm_flags_t vs.  unsigned long.  This prevents us from changing the type of
vm_flags_t in the future and is simply not correct, so correct this.

While this results in rather a lot of churn, it is a critical
pre-requisite for a future planned change to VMA flag type.

Additionally, update VMA userland tests to account for the changes.

To make review easier and to break things into smaller parts, driver and
architecture-specific changes is left for a subsequent commit.

The code has been adjusted to cascade the changes across all calling code
as far as is needed.

We will adjust architecture-specific and driver code in a subsequent patch.

Overall, this patch does not introduce any functional change.

Link: https://lkml.kernel.org/r/d1588e7bb96d1ea3fe7b9df2c699d5b4592d901d.1750274467.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: default avatarKees Cook <kees@kernel.org>
Acked-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarPedro Falcato <pfalcato@suse.de>
Acked-by: default avatarZi Yan <ziy@nvidia.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Jann Horn <jannh@google.com>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 78ddaa35

fs/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ int setup_arg_pages(struct linux_binprm *bprm, 
	struct mm_struct *mm = current->mm;

	struct vm_area_struct *vma = bprm->vma;

	struct vm_area_struct *prev = NULL;

	unsigned long vm_flags;

	vm_flags_t vm_flags;

	unsigned long stack_base;

	unsigned long stack_size;

	unsigned long stack_expand;

fs/userfaultfd.c

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, 
	int ret;

	struct uffdio_register uffdio_register;

	struct uffdio_register __user *user_uffdio_register;

	unsigned long vm_flags;

	vm_flags_t vm_flags;

	bool found;

	bool basic_ioctls;

	unsigned long start, end;

include/linux/coredump.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#ifdef CONFIG_COREDUMP

struct core_vma_metadata {

	unsigned long start, end;

	unsigned long flags;

	vm_flags_t flags;

	unsigned long dump_size;

	unsigned long pgoff;

	struct file   *file;

include/linux/huge_mm.h

+6 −6
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static inline unsigned long thp_vma_suitable_orders(struct vm_area_struct *vma, 
}



unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,

					 unsigned long vm_flags,

					 vm_flags_t vm_flags,

					 unsigned long tva_flags,

					 unsigned long orders);
@@ -282,7 +282,7 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, 
 */

static inline

unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma,

				       unsigned long vm_flags,

				       vm_flags_t vm_flags,

				       unsigned long tva_flags,

				       unsigned long orders)

{
@@ -317,7 +317,7 @@ struct thpsize { 
	 (1<<TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG))



static inline bool vma_thp_disabled(struct vm_area_struct *vma,

		unsigned long vm_flags)

		vm_flags_t vm_flags)

{

	/*

	 * Explicitly disabled through madvise or prctl, or some
@@ -431,7 +431,7 @@ change_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma, 
			__split_huge_pud(__vma, __pud, __address);	\

	}  while (0)



int hugepage_madvise(struct vm_area_struct *vma, unsigned long *vm_flags,

int hugepage_madvise(struct vm_area_struct *vma, vm_flags_t *vm_flags,

		     int advice);

int madvise_collapse(struct vm_area_struct *vma,

		     struct vm_area_struct **prev,
@@ -524,7 +524,7 @@ static inline unsigned long thp_vma_suitable_orders(struct vm_area_struct *vma, 
}



static inline unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma,

					unsigned long vm_flags,

					vm_flags_t vm_flags,

					unsigned long tva_flags,

					unsigned long orders)

{
@@ -593,7 +593,7 @@ static inline bool unmap_huge_pmd_locked(struct vm_area_struct *vma, 
	do { } while (0)



static inline int hugepage_madvise(struct vm_area_struct *vma,

				   unsigned long *vm_flags, int advice)

				   vm_flags_t *vm_flags, int advice)

{

	return -EINVAL;

}

include/linux/khugepaged.h

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ extern int start_stop_khugepaged(void); 
extern void __khugepaged_enter(struct mm_struct *mm);

extern void __khugepaged_exit(struct mm_struct *mm);

extern void khugepaged_enter_vma(struct vm_area_struct *vma,

				 unsigned long vm_flags);

				 vm_flags_t vm_flags);

extern void khugepaged_min_free_kbytes_update(void);

extern bool current_is_khugepaged(void);

extern int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr,
@@ -37,7 +37,7 @@ static inline void khugepaged_exit(struct mm_struct *mm) 
{

}

static inline void khugepaged_enter_vma(struct vm_area_struct *vma,

					unsigned long vm_flags)

					vm_flags_t vm_flags)

{

}

static inline int collapse_pte_mapped_thp(struct mm_struct *mm,