qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/gup: Change the calling convention for compound_range_next() 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2083861
Tested: by me with multiple test suites

commit 8f39f5fcb7963f0a01b8077c92e627af279de65e
Author: Matthew Wilcox (Oracle) <willy@infradead.org>
Date:   Sun Jan 9 16:05:11 2022 -0500

    mm/gup: Change the calling convention for compound_range_next()

    Return the head page instead of storing it to a passed parameter.
    Pass the start page directly instead of passing a pointer to it.
    Reorder the arguments to match the calling function's arguments.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    Reviewed-by: John Hubbard <jhubbard@nvidia.com>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Reviewed-by: William Kucharski <william.kucharski@oracle.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
This commit is contained in:
Aristeu Rozanski 2022-07-10 10:44:05 -04:00
parent 5c3946b7f8
commit 153cd867d2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mm/gup.c
View File

@ -359,21 +359,20 @@ void unpin_user_page(struct page *page)
}
EXPORT_SYMBOL(unpin_user_page);
static inline void compound_range_next(unsigned long i, unsigned long npages,
struct page **list, struct page **head,
unsigned int *ntails)
static inline struct page *compound_range_next(struct page *start,
unsigned long npages, unsigned long i, unsigned int *ntails)
{
struct page *next, *page;
unsigned int nr = 1;
next = *list + i;
next = start + i;
page = compound_head(next);
if (PageCompound(page) && compound_order(page) >= 1)
nr = min_t(unsigned int,
page + compound_nr(page) - next, npages - i);
*head = page;
*ntails = nr;
return page;
}
static inline void compound_next(unsigned long i, unsigned long npages,
@ -485,7 +484,7 @@ void unpin_user_page_range_dirty_lock(struct page *page, unsigned long npages,
unsigned int ntails;
for (index = 0; index < npages; index += ntails) {
compound_range_next(index, npages, &page, &head, &ntails);
head = compound_range_next(page, npages, index, &ntails);
if (make_dirty && !PageDirty(head))
set_page_dirty_lock(head);
put_compound_head(head, ntails, FOLL_PIN);