Skip to contentSkip to conversation

mm-page_alloc-fix-incorrect-pgfree-and-pgalloc-for-high-order-page.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 12, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/page_alloc: fix incorrect PGFREE and PGALLOC for high-order page
has been removed from the -mm tree. Its filename was
mm-page_alloc-fix-incorrect-pgfree-and-pgalloc-for-high-order-page.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yafang Shao <[email protected]>
Subject: mm/page_alloc: fix incorrect PGFREE and PGALLOC for high-order page
Date: Thu, 6 Oct 2022 10:15:40 +0000

PGFREE and PGALLOC represent the number of freed and allocated pages. So the page order must be considered.

Fixes 44042b449872 ("mm/page_alloc: allow high-order pages to be stored on the per-cpu lists")

---

 mm/page_alloc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-fix-incorrect-pgfree-and-pgalloc-for-high-order-page +2 -2
@@ -3446,7 +3446,7 @@ static void free_unref_page_commit(struc
 	int pindex;
 	bool free_high;
 
-	__count_vm_event(PGFREE);
+	__count_vm_events(PGFREE, 1 << order);
 	pindex = order_to_pindex(migratetype, order);
 	list_add(&page->pcp_list, &pcp->lists[pindex]);
 	pcp->count += 1 << order;
@@ -3803,7 +3803,7 @@ static struct page *rmqueue_pcplist(stru
 	pcp_spin_unlock_irqrestore(pcp, flags);
 	pcp_trylock_finish(UP_flags);
 	if (page) {
-		__count_zid_vm_events(PGALLOC, page_zonenum(page), 1);
+		__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
 		zone_statistics(preferred_zone, zone, 1);
 	}
 	return page;

_

Patches currently in -mm which might be from [email protected] are