Message ID | 1582692658-3294-4-git-send-email-anshuman.khandual@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | mm/vma: some more minor changes | expand |
On 2/26/20 5:50 AM, Anshuman Khandual wrote: > Currently the declaration and definition for is_vma_temporary_stack() are > scattered. Lets make is_vma_temporary_stack() helper available for general > use and also drop the declaration from (include/linux/huge_mm.h) which is > no longer required. This should not cause any functional change. > > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-kernel@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> The move made it plainly visible that the is_vma_* name differs from all the other vma_is_* names. So this is a good chance to unify it? Thanks, Vlastimil
On 02/26/2020 07:33 PM, Vlastimil Babka wrote: > On 2/26/20 5:50 AM, Anshuman Khandual wrote: >> Currently the declaration and definition for is_vma_temporary_stack() are >> scattered. Lets make is_vma_temporary_stack() helper available for general >> use and also drop the declaration from (include/linux/huge_mm.h) which is >> no longer required. This should not cause any functional change. >> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> Cc: linux-kernel@vger.kernel.org >> Cc: linux-mm@kvack.org >> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > > The move made it plainly visible that the is_vma_* name differs from all the > other vma_is_* names. So this is a good chance to unify it? Yes, we can unify it while moving. Will change.
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 5aca3d1bdb32..87f46b11efe8 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -87,8 +87,6 @@ extern struct kobj_attribute shmem_enabled_attr; #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) -extern bool is_vma_temporary_stack(struct vm_area_struct *vma); - extern unsigned long transparent_hugepage_flags; /* diff --git a/include/linux/mm.h b/include/linux/mm.h index 2fd4b9bec4be..3bbd9c06171b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -543,6 +543,20 @@ static inline bool vma_is_anonymous(struct vm_area_struct *vma) return !vma->vm_ops; } +static inline bool is_vma_temporary_stack(struct vm_area_struct *vma) +{ + int maybe_stack = vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP); + + if (!maybe_stack) + return false; + + if ((vma->vm_flags & VM_STACK_INCOMPLETE_SETUP) == + VM_STACK_INCOMPLETE_SETUP) + return true; + + return false; +} + static inline bool vma_is_foreign(struct vm_area_struct *vma) { if (!current->mm) diff --git a/mm/rmap.c b/mm/rmap.c index b3e381919835..3d9d5e372710 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1696,20 +1696,6 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, return ret; } -bool is_vma_temporary_stack(struct vm_area_struct *vma) -{ - int maybe_stack = vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP); - - if (!maybe_stack) - return false; - - if ((vma->vm_flags & VM_STACK_INCOMPLETE_SETUP) == - VM_STACK_INCOMPLETE_SETUP) - return true; - - return false; -} - static bool invalid_migration_vma(struct vm_area_struct *vma, void *arg) { return is_vma_temporary_stack(vma);
Currently the declaration and definition for is_vma_temporary_stack() are scattered. Lets make is_vma_temporary_stack() helper available for general use and also drop the declaration from (include/linux/huge_mm.h) which is no longer required. This should not cause any functional change. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- include/linux/huge_mm.h | 2 -- include/linux/mm.h | 14 ++++++++++++++ mm/rmap.c | 14 -------------- 3 files changed, 14 insertions(+), 16 deletions(-)