lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 096/110] mm: page_vma_mapped_walk(): use goto instead of while (1)
    Date
    From: Hugh Dickins <hughd@google.com>

    commit 474466301dfd8b39a10c01db740645f3f7ae9a28 upstream.

    page_vma_mapped_walk() cleanup: add a label this_pte, matching next_pte,
    and use "goto this_pte", in place of the "while (1)" loop at the end.

    Link: https://lkml.kernel.org/r/a52b234a-851-3616-2525-f42736e8934@google.com
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: Alistair Popple <apopple@nvidia.com>
    Cc: Matthew Wilcox <willy@infradead.org>
    Cc: Peter Xu <peterx@redhat.com>
    Cc: Ralph Campbell <rcampbell@nvidia.com>
    Cc: Wang Yugui <wangyugui@e16-tech.com>
    Cc: Will Deacon <will@kernel.org>
    Cc: Yang Shi <shy828301@gmail.com>
    Cc: Zi Yan <ziy@nvidia.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    mm/page_vma_mapped.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
    index 4a8a069c5e87..8803dd93c049 100644
    --- a/mm/page_vma_mapped.c
    +++ b/mm/page_vma_mapped.c
    @@ -144,6 +144,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
    {
    struct mm_struct *mm = pvmw->vma->vm_mm;
    struct page *page = pvmw->page;
    + unsigned long end;
    pgd_t *pgd;
    p4d_t *p4d;
    pud_t *pud;
    @@ -233,10 +234,7 @@ restart:
    }
    if (!map_pte(pvmw))
    goto next_pte;
    - }
    - while (1) {
    - unsigned long end;
    -
    +this_pte:
    if (check_pte(pvmw))
    return true;
    next_pte:
    @@ -265,6 +263,7 @@ next_pte:
    pvmw->ptl = pte_lockptr(mm, pvmw->pmd);
    spin_lock(pvmw->ptl);
    }
    + goto this_pte;
    }
    }

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 16:29    [W:4.041 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site