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

mm: rename vma_flag_test/set_atomic() to vma_test/set_atomic_flag() 

In order to stay consistent between functions which manipulate a
vm_flags_t argument of the form of vma_flags_...() and those which
manipulate a VMA (in this case the flags field of a VMA), rename
vma_flag_[test/set]_atomic() to vma_[test/set]_atomic_flag().

This lays the groundwork for adding VMA flag manipulation functions in a
subsequent commit.

Link: https://lkml.kernel.org/r/033dcf12e819dee5064582bced9b12ea346d1607.1769097829.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarPedro Falcato <pfalcato@suse.de>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Yury Norov <ynorov@nvidia.com>
Cc: Chris Mason <clm@fb.com>
Cc: Pedro Falcato <pfalcato@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a30de4c6

include/linux/mm.h

+5 −8
Original line number Diff line number Diff line
@@ -987,8 +987,7 @@ static inline void vm_flags_mod(struct vm_area_struct *vma, 
	__vm_flags_mod(vma, set, clear);

}



static inline bool __vma_flag_atomic_valid(struct vm_area_struct *vma,

					   vma_flag_t bit)

static inline bool __vma_atomic_valid_flag(struct vm_area_struct *vma, vma_flag_t bit)

{

	const vm_flags_t mask = BIT((__force int)bit);
@@ -1003,13 +1002,12 @@ static inline bool __vma_flag_atomic_valid(struct vm_area_struct *vma, 
 * Set VMA flag atomically. Requires only VMA/mmap read lock. Only specific

 * valid flags are allowed to do this.

 */

static inline void vma_flag_set_atomic(struct vm_area_struct *vma,

				       vma_flag_t bit)

static inline void vma_set_atomic_flag(struct vm_area_struct *vma, vma_flag_t bit)

{

	unsigned long *bitmap = vma->flags.__vma_flags;



	vma_assert_stabilised(vma);

	if (__vma_flag_atomic_valid(vma, bit))

	if (__vma_atomic_valid_flag(vma, bit))

		set_bit((__force int)bit, bitmap);

}
@@ -1020,10 +1018,9 @@ static inline void vma_flag_set_atomic(struct vm_area_struct *vma, 
 * This is necessarily racey, so callers must ensure that serialisation is

 * achieved through some other means, or that races are permissible.

 */

static inline bool vma_flag_test_atomic(struct vm_area_struct *vma,

					vma_flag_t bit)

static inline bool vma_test_atomic_flag(struct vm_area_struct *vma, vma_flag_t bit)

{

	if (__vma_flag_atomic_valid(vma, bit))

	if (__vma_atomic_valid_flag(vma, bit))

		return test_bit((__force int)bit, &vma->vm_flags);



	return false;

mm/khugepaged.c

+1 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,7 @@ static bool file_backed_vma_is_retractable(struct vm_area_struct *vma) 
	 * obtained on guard region installation after the flag is set, so this

	 * check being performed under this lock excludes races.

	 */

	if (vma_flag_test_atomic(vma, VMA_MAYBE_GUARD_BIT))

	if (vma_test_atomic_flag(vma, VMA_MAYBE_GUARD_BIT))

		return false;



	return true;

mm/madvise.c

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ static long madvise_guard_install(struct madvise_behavior *madv_behavior) 
	 * acquire an mmap/VMA write lock to read it. All remaining readers may

	 * or may not see the flag set, but we don't care.

	 */

	vma_flag_set_atomic(vma, VMA_MAYBE_GUARD_BIT);

	vma_set_atomic_flag(vma, VMA_MAYBE_GUARD_BIT);



	/*

	 * If anonymous and we are establishing page tables the VMA ought to