mm-page_alloc-dedupe-some-memcg-uncharging-logic.patch removed from -mm tree
The quilt patch titled
Subject: mm/page_alloc: dedupe some memcg uncharging logic
has been removed from the -mm tree. Its filename was
mm-page_alloc-dedupe-some-memcg-uncharging-logic.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: Brendan Jackman <[email protected]>
Subject: mm/page_alloc: dedupe some memcg uncharging logic
Date: Wed, 8 Nov 2023 16:49:20 +0000
The duplication makes it seem like some work is required before uncharging in the !PageHWPoison case. But it isn't, so we can simplify the code a little.
Note the PageMemcgKmem check is redundant, but I've left it in as it avoids an unnecessary function call.
---
mm/page_alloc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-dedupe-some-memcg-uncharging-logic +4 -8
@@ -1086,13 +1086,11 @@ static __always_inline bool free_pages_ptrace_mm_page_free (page, order);kmsan_free_page (page, order); +if (memcg_kmem_online () &&PageMemcgKmem (page)) +__memcg_kmem_uncharge_page (page, order); +if (unlikely (PageHWPoison (page)) && !order) { -/* -* Do not let hwpoison pages hit pcplists/buddy -* Untie memcg state and reset page's owner -*/ -if (memcg_kmem_online () &&PageMemcgKmem (page)) -__memcg_kmem_uncharge_page (page, order); +/* Do not let hwpoison pages hit pcplists/buddy */ reset_page_owner (page, order);page_table_check_free (page, order);return false;
@@ -1123,8 +1121,6 @@ static __always_inline bool free_pages_p }if (PageMappingFlags (page)) page->mapping =NULL ; -if (memcg_kmem_online () &&PageMemcgKmem (page)) -__memcg_kmem_uncharge_page (page, order);if (is_check_pages_enabled ()) {if (free_page_is_bad (page)) bad++;
_
Patches currently in -mm which might be from [email protected] are