Skip to content

Commit

Permalink
mm/gup: speed up check_and_migrate_cma_pages() on huge page
Browse files Browse the repository at this point in the history
Both hugetlb and thp locate on the same migration type of pageblock, since
they are allocated from a free_list[].  Based on this fact, it is enough
to check on a single subpage to decide the migration type of the whole
huge page.  By this way, it saves (2M/4K - 1) times loop for pmd_huge on
x86, similar on other archs.

Furthermore, when executing isolate_huge_page(), it avoid taking global
hugetlb_lock many times, and meanless remove/add to the local link list
cma_page_list.

[[email protected]: make `i' and `step' unsigned]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Pingfan Liu <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Reviewed-by: Ira Weiny <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: John Hubbard <[email protected]>
Cc: "Aneesh Kumar K.V" <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Keith Busch <[email protected]>
Cc: Mike Kravetz <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
liupingfan authored and torvalds committed Jul 12, 2019
1 parent 520b4a4 commit aa71239
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions mm/gup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1449,25 +1449,31 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk,
struct vm_area_struct **vmas,
unsigned int gup_flags)
{
long i;
unsigned long i;
unsigned long step;
bool drain_allow = true;
bool migrate_allow = true;
LIST_HEAD(cma_page_list);

check_again:
for (i = 0; i < nr_pages; i++) {
for (i = 0; i < nr_pages;) {

struct page *head = compound_head(pages[i]);

/*
* gup may start from a tail page. Advance step by the left
* part.
*/
step = (1 << compound_order(head)) - (pages[i] - head);
/*
* If we get a page from the CMA zone, since we are going to
* be pinning these entries, we might as well move them out
* of the CMA zone if possible.
*/
if (is_migrate_cma_page(pages[i])) {

struct page *head = compound_head(pages[i]);

if (PageHuge(head)) {
if (is_migrate_cma_page(head)) {
if (PageHuge(head))
isolate_huge_page(head, &cma_page_list);
} else {
else {
if (!PageLRU(head) && drain_allow) {
lru_add_drain_all();
drain_allow = false;
Expand All @@ -1482,6 +1488,8 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk,
}
}
}

i += step;
}

if (!list_empty(&cma_page_list)) {
Expand Down

0 comments on commit aa71239

Please sign in to comment.