mm-avoid-extra-mem_alloc_profiling_enabled-checks.patch removed from -mm tree
The quilt patch titled
Subject: mm: avoid extra mem_alloc_profiling_enabled() checks
has been removed from the -mm tree. Its filename was
mm-avoid-extra-mem_alloc_profiling_enabled-checks.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: Suren Baghdasaryan <[email protected]>
Subject: mm: avoid extra mem_alloc_profiling_enabled() checks
Date: Sat, 1 Feb 2025 15:18:00 -0800
Refactor code to avoid extra mem_alloc_profiling_enabled() checks inside pgalloc_tag_get() function which is often called after that check was already done.
Signed-off-by Suren Baghdasaryan <[email protected]>
Reviewed-by Shakeel Butt <[email protected]>
Cc David Wang <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Kent Overstreet <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Pasha Tatashin <[email protected]>
Cc Peter Zijlstra (Intel) <[email protected]>
Cc Sourav Panda <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Yu Zhao <[email protected]>
Cc Zhenhua Huang <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/pgalloc_tag.h | 33 ++++++++++++++++++--------------- lib/alloc_tag.c | 6 +++--- mm/page_alloc.c | 3 +-- 3 files changed, 22 insertions(+), 20 deletions(-)
include/linux/pgalloc_tag.h renamed from include/linux/pgalloc_tag.h~mm-avoid-extra-mem_alloc_profiling_enabled-checks +18 -15
@@ -205,28 +205,32 @@ static inline void pgalloc_tag_sub(struc } } -static inline struct alloc_tag *pgalloc_tag_get (struct page *page) +/* Should be called only if mem_alloc_profiling_enabled() */ +static inline struct alloc_tag *__pgalloc_tag_get (struct page *page) {struct alloc_tag *tag =NULL ; +union pgtag_ref_handle handle; +union codetag_ref ref; -if (mem_alloc_profiling_enabled ()) { -union pgtag_ref_handle handle; -union codetag_ref ref; - -if (get_page_tag_ref (page, &ref, &handle)) { -alloc_tag_sub_check (&ref); -if (ref.ct) - tag =ct_to_alloc_tag (ref.ct); -put_page_tag_ref (handle); - } +if (get_page_tag_ref (page, &ref, &handle)) { +alloc_tag_sub_check (&ref); +if (ref.ct) + tag =ct_to_alloc_tag (ref.ct); +put_page_tag_ref (handle); }return tag; } -static inline void pgalloc_tag_sub_pages (struct alloc_tag *tag,unsigned int nr) +static inline void pgalloc_tag_sub_pages (struct page *page,unsigned int nr) { -if (mem_alloc_profiling_enabled () && tag) +struct alloc_tag *tag; + +if (!mem_alloc_profiling_enabled ()) +return ; + + tag =__pgalloc_tag_get (page); +if (tag)this_cpu_sub (tag->counters->bytes,PAGE_SIZE * nr); }
@@ -241,8 +245,7 @@ static inline void clear_page_tag_ref(ststatic inline void pgalloc_tag_add (struct page *page,struct task_struct *task,unsigned int nr) {}static inline void pgalloc_tag_sub (struct page *page,unsigned int nr) {} -static inline struct alloc_tag *pgalloc_tag_get (struct page *page) {return NULL ; } -static inline void pgalloc_tag_sub_pages (struct alloc_tag *tag,unsigned int nr) {} +static inline void pgalloc_tag_sub_pages (struct page *page,unsigned int nr) {}static inline void alloc_tag_sec_init (void ) {}static inline void pgalloc_tag_split (struct folio *folio,int old_order,int new_order) {}static inline void pgalloc_tag_swap (struct folio *new,struct folio *old) {}
lib/alloc_tag.c renamed from lib/alloc_tag.c~mm-avoid-extra-mem_alloc_profiling_enabled-checks +3 -3
@@ -174,7 +174,7 @@ void pgalloc_tag_split(struct folio *folif (!mem_alloc_profiling_enabled ())return ; - tag =pgalloc_tag_get (&folio->page); + tag =__pgalloc_tag_get (&folio->page);if (!tag)return ;
@@ -200,10 +200,10 @@ void pgalloc_tag_swap(struct folio *new,if (!mem_alloc_profiling_enabled ())return ; - tag_old =pgalloc_tag_get (&old->page); + tag_old =__pgalloc_tag_get (&old->page);if (!tag_old)return ; - tag_new =pgalloc_tag_get (&new->page); + tag_new =__pgalloc_tag_get (&new->page);if (!tag_new)return ;
mm/page_alloc.c renamed from mm/page_alloc.c~mm-avoid-extra-mem_alloc_profiling_enabled-checks +1 -2
@@ -4833,12 +4833,11 @@ void __free_pages(struct page *page, uns {/* get PageHead before we drop reference */ int head =PageHead (page); -struct alloc_tag *tag =pgalloc_tag_get (page);if (put_page_testzero (page))free_frozen_pages (page, order);else if (!head) { -pgalloc_tag_sub_pages (tag, (1 << order) -1 ); +pgalloc_tag_sub_pages (page, (1 << order) -1 );while (order-- >0 )free_frozen_pages (page + (1 << order), order); }
_
Patches currently in -mm which might be from [email protected] are