[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <451b1e7c-3669-7b55-7daa-9a2911aaf5c5@redhat.com>
Date: Tue, 20 Jun 2023 17:23:59 +0200
From: David Hildenbrand <david@...hat.com>
To: Peter Xu <peterx@...hat.com>, linux-mm@...ck.org,
linux-kernel@...r.kernel.org
Cc: Andrea Arcangeli <aarcange@...hat.com>,
Mike Rapoport <rppt@...nel.org>,
Matthew Wilcox <willy@...radead.org>,
Vlastimil Babka <vbabka@...e.cz>,
John Hubbard <jhubbard@...dia.com>,
"Kirill A . Shutemov" <kirill@...temov.name>,
James Houghton <jthoughton@...gle.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Lorenzo Stoakes <lstoakes@...il.com>,
Hugh Dickins <hughd@...gle.com>,
Mike Kravetz <mike.kravetz@...cle.com>,
Jason Gunthorpe <jgg@...dia.com>
Subject: Re: [PATCH v2 4/8] mm/gup: Cleanup next_page handling
On 20.06.23 01:10, Peter Xu wrote:
> The only path that doesn't use generic "**pages" handling is the gate vma.
> Make it use the same path, meanwhile tune the next_page label upper to
> cover "**pages" handling. This prepares for THP handling for "**pages".
>
> Reviewed-by: Lorenzo Stoakes <lstoakes@...il.com>
> Signed-off-by: Peter Xu <peterx@...hat.com>
> ---
> mm/gup.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/mm/gup.c b/mm/gup.c
> index 9fc9271cba8d..4a00d609033e 100644
> --- a/mm/gup.c
> +++ b/mm/gup.c
> @@ -1124,7 +1124,7 @@ static long __get_user_pages(struct mm_struct *mm,
> if (!vma && in_gate_area(mm, start)) {
> ret = get_gate_page(mm, start & PAGE_MASK,
> gup_flags, &vma,
> - pages ? &pages[i] : NULL);
> + pages ? &page : NULL);
> if (ret)
> goto out;
> ctx.page_mask = 0;
> @@ -1194,19 +1194,18 @@ static long __get_user_pages(struct mm_struct *mm,
> ret = PTR_ERR(page);
> goto out;
> }
> -
> - goto next_page;
> } else if (IS_ERR(page)) {
> ret = PTR_ERR(page);
> goto out;
> }
> +next_page:
> if (pages) {
> pages[i] = page;
> flush_anon_page(vma, page, start);
> flush_dcache_page(page);
> ctx.page_mask = 0;
> }
> -next_page:
> +
> page_increm = 1 + (~(start >> PAGE_SHIFT) & ctx.page_mask);
> if (page_increm > nr_pages)
> page_increm = nr_pages;
Acked-by: David Hildenbrand <david@...hat.com>
--
Cheers,
David / dhildenb
Powered by blists - more mailing lists