From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51571C34032 for ; Tue, 18 Feb 2020 02:21:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14677214D8 for ; Tue, 18 Feb 2020 02:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581992518; bh=UFm8ktdZhblu/2s0ozFeAb4+2Rlmv3TL7j0nOVximz0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=G0VruMFfqwpa/U70UtsWQJ4s957a6JD3CbwY2z3A1c4lfWIDS1DRK9DpakE2O8OZ2 Ep7wsXHLMKqwN3g3vHMDu9hihcGn3shNgx3tfrwV9jNUEBH76CTBDAIeZ6MGS81aYH hzeUFiClHNAtVC82d6t2p1IvY1BRUOgKXO7oF470= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726346AbgBRCV4 (ORCPT ); Mon, 17 Feb 2020 21:21:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:50370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726182AbgBRCV4 (ORCPT ); Mon, 17 Feb 2020 21:21:56 -0500 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B29A2465D; Tue, 18 Feb 2020 02:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581992514; bh=UFm8ktdZhblu/2s0ozFeAb4+2Rlmv3TL7j0nOVximz0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=PEjs99KqMCb92Wk1M7ayKtUXgPiXb6a6dacanXMhKN3X7z8L+Cz0w2BVaE9c0lCaZ LyfwA8H6aLbB2uEYNoNrEedS7L6KUhhtxCx3d86P/WAoReitv9/CxEH8jK18jLmsZc YnCh6IVgQrm1txL3nvx1nek6grRsjJ2XJXdnqhRM= Received: by mail-lj1-f175.google.com with SMTP id x14so21035842ljd.13; Mon, 17 Feb 2020 18:21:54 -0800 (PST) X-Gm-Message-State: APjAAAXOlTyL4bMDkP8vL+7ftRh9Zs+6tG3jyQxTRJ9yyQgy2jBEJMiF t/PQh2YEUCoKQIylSulg2BsvkczsYDP8DIdKggo= X-Google-Smtp-Source: APXvYqwLxeMgM+mSk0yU+FYSCGy3AfSLs0zCZ4mYg0byKooBHPWU4rt3UmuGmS6NBw9sW9r0FPIiyiQYYxAAvpvgI18= X-Received: by 2002:a2e:81c3:: with SMTP id s3mr11214674ljg.168.1581992512158; Mon, 17 Feb 2020 18:21:52 -0800 (PST) MIME-Version: 1.0 References: <1581915833-21984-1-git-send-email-anshuman.khandual@arm.com> <1581915833-21984-3-git-send-email-anshuman.khandual@arm.com> In-Reply-To: <1581915833-21984-3-git-send-email-anshuman.khandual@arm.com> From: Guo Ren Date: Tue, 18 Feb 2020 10:21:40 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/5] mm/vma: Make vma_is_accessible() available for general use To: Anshuman Khandual Cc: linux-mm@kvack.org, Linux Kernel Mailing List , Geert Uytterhoeven , Ralf Baechle , Paul Burton , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Yoshinori Sato , Rich Felker , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Andrew Morton , Steven Rostedt , Mel Gorman , linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org csky: Acked-by: Guo Ren On Mon, Feb 17, 2020 at 1:04 PM Anshuman Khandual wrote: > > Lets move vma_is_accessible() helper to include/linux/mm.h which makes it > available for general use. While here, this replaces all remaining open > encodings for VMA access check with vma_is_accessible(). > > Cc: Guo Ren > Cc: Geert Uytterhoeven Cc: Ralf Baechle > Cc: Paul Burton > Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > Cc: Michael Ellerman > Cc: Yoshinori Sato > Cc: Rich Felker > Cc: Dave Hansen > Cc: Andy Lutomirski > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Andrew Morton > Cc: Steven Rostedt > Cc: Mel Gorman > Cc: linux-kernel@vger.kernel.org > Cc: linux-m68k@lists.linux-m68k.org > Cc: linux-mips@vger.kernel.org > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-sh@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Anshuman Khandual > --- > arch/csky/mm/fault.c | 2 +- > arch/m68k/mm/fault.c | 2 +- > arch/mips/mm/fault.c | 2 +- > arch/powerpc/mm/fault.c | 2 +- > arch/sh/mm/fault.c | 2 +- > arch/x86/mm/fault.c | 2 +- > include/linux/mm.h | 5 +++++ > kernel/sched/fair.c | 2 +- > mm/gup.c | 2 +- > mm/memory.c | 5 ----- > mm/mempolicy.c | 3 +-- > 11 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c > index f76618b630f9..4b3511b8298d 100644 > --- a/arch/csky/mm/fault.c > +++ b/arch/csky/mm/fault.c > @@ -137,7 +137,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, > if (!(vma->vm_flags & VM_WRITE)) > goto bad_area; > } else { > - if (!(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))) > + if (!vma_is_accessible(vma)) > goto bad_area; > } > > diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c > index e9b1d7585b43..d5131ec5d923 100644 > --- a/arch/m68k/mm/fault.c > +++ b/arch/m68k/mm/fault.c > @@ -125,7 +125,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, > case 1: /* read, present */ > goto acc_err; > case 0: /* read, not present */ > - if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))) > + if (!vma_is_accessible(vma)) > goto acc_err; > } > > diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c > index 1e8d00793784..5b9f947bfa32 100644 > --- a/arch/mips/mm/fault.c > +++ b/arch/mips/mm/fault.c > @@ -142,7 +142,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, > goto bad_area; > } > } else { > - if (!(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))) > + if (!vma_is_accessible(vma)) > goto bad_area; > } > } > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 8db0507619e2..71a3658c516b 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -314,7 +314,7 @@ static bool access_error(bool is_write, bool is_exec, > return false; > } > > - if (unlikely(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))) > + if (unlikely(!vma_is_accessible(vma))) > return true; > /* > * We should ideally do the vma pkey access check here. But in the > diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c > index 5f51456f4fc7..a8c4253f37d7 100644 > --- a/arch/sh/mm/fault.c > +++ b/arch/sh/mm/fault.c > @@ -355,7 +355,7 @@ static inline int access_error(int error_code, struct vm_area_struct *vma) > return 1; > > /* read, not present: */ > - if (unlikely(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))) > + if (unlikely(!vma_is_accessible(vma))) > return 1; > > return 0; > diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c > index fa4ea09593ab..c461eaab0306 100644 > --- a/arch/x86/mm/fault.c > +++ b/arch/x86/mm/fault.c > @@ -1200,7 +1200,7 @@ access_error(unsigned long error_code, struct vm_area_struct *vma) > return 1; > > /* read, not present: */ > - if (unlikely(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))) > + if (unlikely(!vma_is_accessible(vma))) > return 1; > > return 0; > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 52269e56c514..b0e53ef13ff1 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -541,6 +541,11 @@ static inline bool vma_is_anonymous(struct vm_area_struct *vma) > return !vma->vm_ops; > } > > +static inline bool vma_is_accessible(struct vm_area_struct *vma) > +{ > + return vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC); > +} > + > #ifdef CONFIG_SHMEM > /* > * The vma_is_shmem is not inline because it is used only by slow > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index fe4e0d775375..6ce54d57dd09 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -2573,7 +2573,7 @@ static void task_numa_work(struct callback_head *work) > * Skip inaccessible VMAs to avoid any confusion between > * PROT_NONE and NUMA hinting ptes > */ > - if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))) > + if (!vma_is_accessible(vma)) > continue; > > do { > diff --git a/mm/gup.c b/mm/gup.c > index 1b521e0ac1de..c8ffe2e61f03 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1171,7 +1171,7 @@ long populate_vma_page_range(struct vm_area_struct *vma, > * We want mlock to succeed for regions that have any permissions > * other than PROT_NONE. > */ > - if (vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) > + if (vma_is_accessible(vma)) > gup_flags |= FOLL_FORCE; > > /* > diff --git a/mm/memory.c b/mm/memory.c > index 0bccc622e482..2f07747612b7 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3942,11 +3942,6 @@ static inline vm_fault_t wp_huge_pmd(struct vm_fault *vmf, pmd_t orig_pmd) > return VM_FAULT_FALLBACK; > } > > -static inline bool vma_is_accessible(struct vm_area_struct *vma) > -{ > - return vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE); > -} > - > static vm_fault_t create_huge_pud(struct vm_fault *vmf) > { > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > diff --git a/mm/mempolicy.c b/mm/mempolicy.c > index 977c641f78cf..91c1ad6ab8ea 100644 > --- a/mm/mempolicy.c > +++ b/mm/mempolicy.c > @@ -649,8 +649,7 @@ static int queue_pages_test_walk(unsigned long start, unsigned long end, > > if (flags & MPOL_MF_LAZY) { > /* Similar to task_numa_work, skip inaccessible VMAs */ > - if (!is_vm_hugetlb_page(vma) && > - (vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)) && > + if (!is_vm_hugetlb_page(vma) && vma_is_accessible(vma) && > !(vma->vm_flags & VM_MIXEDMAP)) > change_prot_numa(vma, start, endvma); > return 1; > -- > 2.20.1 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/