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/page_alloc: don't pass pfn to free_unref_page_commit() 

Bugzilla: https://bugzilla.redhat.com/2120352

commit 566513775dca7f0d4ba15da4bc8394cdb2c98829
Author: Nicolas Saenz Julienne <nsaenzju@redhat.com>
Date:   Tue Mar 22 14:43:14 2022 -0700

    mm/page_alloc: don't pass pfn to free_unref_page_commit()

    free_unref_page_commit() doesn't make use of its pfn argument, so get
    rid of it.

    Link: https://lkml.kernel.org/r/20220202140451.415928-1-nsaenzju@redhat.com
    Signed-off-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
    Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
    Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Chris von Recklinghausen <crecklin@redhat.com>
This commit is contained in:
Chris von Recklinghausen 2022-10-12 07:09:12 -04:00
parent 20e3edb8a6
commit ab6763a437
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mm/page_alloc.c
View File

@ -3334,8 +3334,8 @@ static int nr_pcp_high(struct per_cpu_pages *pcp, struct zone *zone,
return min(READ_ONCE(pcp->batch) << 2, high);
}
static void free_unref_page_commit(struct page *page, unsigned long pfn,
int migratetype, unsigned int order)
static void free_unref_page_commit(struct page *page, int migratetype,
unsigned int order)
{
struct zone *zone = page_zone(page);
struct per_cpu_pages *pcp;
@ -3394,7 +3394,7 @@ void free_unref_page(struct page *page, unsigned int order)
}
local_lock_irqsave(&pagesets.lock, flags);
free_unref_page_commit(page, pfn, migratetype, order);
free_unref_page_commit(page, migratetype, order);
local_unlock_irqrestore(&pagesets.lock, flags);
}
@ -3404,13 +3404,13 @@ void free_unref_page(struct page *page, unsigned int order)
void free_unref_page_list(struct list_head *list)
{
struct page *page, *next;
unsigned long flags, pfn;
unsigned long flags;
int batch_count = 0;
int migratetype;
/* Prepare pages for freeing */
list_for_each_entry_safe(page, next, list, lru) {
pfn = page_to_pfn(page);
unsigned long pfn = page_to_pfn(page);
if (!free_unref_page_prepare(page, pfn, 0)) {
list_del(&page->lru);
continue;
@ -3426,15 +3426,10 @@ void free_unref_page_list(struct list_head *list)
free_one_page(page_zone(page), page, pfn, 0, migratetype, FPI_NONE);
continue;
}
set_page_private(page, pfn);
}
local_lock_irqsave(&pagesets.lock, flags);
list_for_each_entry_safe(page, next, list, lru) {
pfn = page_private(page);
set_page_private(page, 0);
/*
* Non-isolated types over MIGRATE_PCPTYPES get added
* to the MIGRATE_MOVABLE pcp list.
@ -3444,7 +3439,7 @@ void free_unref_page_list(struct list_head *list)
migratetype = MIGRATE_MOVABLE;
trace_mm_page_free_batched(page);
free_unref_page_commit(page, pfn, migratetype, 0);
free_unref_page_commit(page, migratetype, 0);
/*
* Guard against excessive IRQ disabled times when we get