shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-26 04:20:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

FROMLIST: BACKPORT: mm/page_alloc: Add page->buddy_list and page->pcp_list

Browse Source 
The page allocator uses page->lru for storing pages on either buddy or
PCP lists. Create page->buddy_list and page->pcp_list as a union with
page->lru. This is simply to clarify what type of list a page is on
in the page allocator.

No functional change intended.

Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Link: https://lore.kernel.org/all/20220420095906.27349-2-mgorman@techsingularity.net/

Bug: 230899966
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: Ieef253fa28c2a411008da64b38716f6401a66961
This commit is contained in:
Mel Gorman
2022-04-28 10:22:03 -07:00
committed by Minchan Kim
parent e70a2e110b
commit a248d08a94
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/mm_types.h
View File

@@ -83,12 +83,18 @@ struct page {
*/ */
union { union {
struct { /* Page cache and anonymous pages */ struct { /* Page cache and anonymous pages */
union {
/** /**
* @lru: Pageout list, eg. active_list protected by * @lru: Pageout list, eg. active_list protected by
* pgdat->lru_lock. Sometimes used as a generic list * pgdat->lru_lock. Sometimes used as a generic list
* by the page owner. * by the page owner.
*/ */
struct list_head lru; struct list_head lru;
/* Or, free page */
struct list_head buddy_list;
struct list_head pcp_list;
};
/* See page-flags.h for PAGE_MAPPING_FLAGS */ /* See page-flags.h for PAGE_MAPPING_FLAGS */
struct address_space *mapping; struct address_space *mapping;
pgoff_t index; /* Our offset within mapping. */ pgoff_t index; /* Our offset within mapping. */

18
mm/page_alloc.c
View File

@@ -747,7 +747,7 @@ static inline bool set_page_guard(struct zone *zone, struct page *page,
return false; return false;
__SetPageGuard(page); __SetPageGuard(page);
INIT_LIST_HEAD(&page->lru); INIT_LIST_HEAD(&page->buddy_list);
set_page_private(page, order); set_page_private(page, order);
/* Guard pages are not available for any usage */ /* Guard pages are not available for any usage */
__mod_zone_freepage_state(zone, -(1 << order), migratetype); __mod_zone_freepage_state(zone, -(1 << order), migratetype);
@@ -921,7 +921,7 @@ static inline void add_to_free_list(struct page *page, struct zone *zone,
{ {
struct free_area *area = &zone->free_area[order]; struct free_area *area = &zone->free_area[order];
list_add(&page->lru, &area->free_list[migratetype]); list_add(&page->buddy_list, &area->free_list[migratetype]);
area->nr_free++; area->nr_free++;
} }
@@ -931,7 +931,7 @@ static inline void add_to_free_list_tail(struct page *page, struct zone *zone,
{ {
struct free_area *area = &zone->free_area[order]; struct free_area *area = &zone->free_area[order];
list_add_tail(&page->lru, &area->free_list[migratetype]); list_add_tail(&page->buddy_list, &area->free_list[migratetype]);
area->nr_free++; area->nr_free++;
} }
@@ -945,7 +945,7 @@ static inline void move_to_free_list(struct page *page, struct zone *zone,
{ {
struct free_area *area = &zone->free_area[order]; struct free_area *area = &zone->free_area[order];
list_move_tail(&page->lru, &area->free_list[migratetype]); list_move_tail(&page->buddy_list, &area->free_list[migratetype]);
} }
static inline void del_page_from_free_list(struct page *page, struct zone *zone, static inline void del_page_from_free_list(struct page *page, struct zone *zone,
@@ -955,7 +955,7 @@ static inline void del_page_from_free_list(struct page *page, struct zone *zone,
if (page_reported(page)) if (page_reported(page))
__ClearPageReported(page); __ClearPageReported(page);
list_del(&page->lru); list_del(&page->buddy_list);
__ClearPageBuddy(page); __ClearPageBuddy(page);
set_page_private(page, 0); set_page_private(page, 0);
zone->free_area[order].nr_free--; zone->free_area[order].nr_free--;
@@ -1461,7 +1461,7 @@ static void free_pcppages_bulk(struct zone *zone, int count,
do { do {
page = list_last_entry(list, struct page, lru); page = list_last_entry(list, struct page, lru);
/* must delete to avoid corrupting pcp list */ /* must delete to avoid corrupting pcp list */
list_del(&page->lru); list_del(&page->pcp_list);
pcp->count--; pcp->count--;
if (bulkfree_pcp_prepare(page)) if (bulkfree_pcp_prepare(page))
@@ -3061,7 +3061,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
* for IO devices that can merge IO requests if the physical * for IO devices that can merge IO requests if the physical
* pages are ordered properly. * pages are ordered properly.
*/ */
list_add_tail(&page->lru, list); list_add_tail(&page->pcp_list, list);
alloced++; alloced++;
if (is_migrate_cma(get_pcppage_migratetype(page))) if (is_migrate_cma(get_pcppage_migratetype(page)))
__mod_zone_page_state(zone, NR_FREE_CMA_PAGES, __mod_zone_page_state(zone, NR_FREE_CMA_PAGES,
@@ -3349,7 +3349,7 @@ static void free_unref_page_commit(struct page *page, int migratetype)
__count_vm_event(PGFREE); __count_vm_event(PGFREE);
pcp = &this_cpu_ptr(zone->pageset)->pcp; pcp = &this_cpu_ptr(zone->pageset)->pcp;
list_add(&page->lru, &pcp->lists[migratetype]); list_add(&page->pcp_list, &pcp->lists[migratetype]);
pcp->count++; pcp->count++;
if (pcp->count >= pcp->high) { if (pcp->count >= pcp->high) {
unsigned long batch = READ_ONCE(pcp->batch); unsigned long batch = READ_ONCE(pcp->batch);
@@ -3596,7 +3596,7 @@ static struct page *__rmqueue_pcplist(struct zone *zone, int migratetype,
} }
page = list_first_entry(list, struct page, lru); page = list_first_entry(list, struct page, lru);
list_del(&page->lru); list_del(&page->pcp_list);
pcp->count--; pcp->count--;
} while (check_new_pcp(page)); } while (check_new_pcp(page));