From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Roman Gushchin <roman.gushchin@linux.dev>,
Shakeel Butt <shakeel.butt@linux.dev>,
Muchun Song <muchun.song@linux.dev>, Zi Yan <ziy@nvidia.com>,
David Hildenbrand <david@redhat.com>
Subject: [PATCH 5/5] mm: Remove references to folio in __memcg_kmem_uncharge_page()
Date: Thu, 13 Mar 2025 14:58:54 +0000 [thread overview]
Message-ID: <20250313145856.4118428-6-willy@infradead.org> (raw)
In-Reply-To: <20250313145856.4118428-1-willy@infradead.org>
This use of folios is misleading because these pages are not part of
a folio. Remove an unnecessary call to page_folio(), saving 58 bytes
of text in a Debian kernel build.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/memcontrol.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 93102319409a..d12afda6d58c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2746,16 +2746,14 @@ int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order)
*/
void __memcg_kmem_uncharge_page(struct page *page, int order)
{
- struct folio *folio = page_folio(page);
- struct obj_cgroup *objcg;
+ struct obj_cgroup *objcg = page_objcg(page);
unsigned int nr_pages = 1 << order;
- if (!folio_memcg_kmem(folio))
+ if (!objcg)
return;
- objcg = __folio_objcg(folio);
obj_cgroup_uncharge_pages(objcg, nr_pages);
- folio->memcg_data = 0;
+ page->memcg_data = 0;
obj_cgroup_put(objcg);
}
--
2.47.2
next prev parent reply other threads:[~2025-03-13 14:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 14:58 [PATCH 0/5] Minor memcg cleanups & prep for memdescs Matthew Wilcox (Oracle)
2025-03-13 14:58 ` [PATCH 1/5] mm: Separate folio_split_memcg() from split_page_memcg() Matthew Wilcox (Oracle)
2025-03-13 15:52 ` Johannes Weiner
2025-03-13 17:07 ` Shakeel Butt
2025-03-13 17:22 ` Zi Yan
2025-03-13 14:58 ` [PATCH 2/5] mm: Simplify split_page_memcg() Matthew Wilcox (Oracle)
2025-03-13 15:54 ` Johannes Weiner
2025-03-13 17:08 ` Shakeel Butt
2025-03-13 17:23 ` Zi Yan
2025-03-13 14:58 ` [PATCH 3/5] mm: Remove references to folio in split_page_memcg() Matthew Wilcox (Oracle)
2025-03-13 16:01 ` Johannes Weiner
2025-03-13 16:05 ` Matthew Wilcox
2025-03-13 17:59 ` Matthew Wilcox
2025-03-13 18:03 ` Johannes Weiner
2025-03-13 17:10 ` Shakeel Butt
2025-03-13 14:58 ` [PATCH 4/5] mm: Simplify folio_memcg_charged() Matthew Wilcox (Oracle)
2025-03-13 16:03 ` Johannes Weiner
2025-03-13 16:15 ` Matthew Wilcox
2025-03-13 16:57 ` Shakeel Butt
2025-03-13 17:10 ` Shakeel Butt
2025-03-13 14:58 ` Matthew Wilcox (Oracle) [this message]
2025-03-13 16:04 ` [PATCH 5/5] mm: Remove references to folio in __memcg_kmem_uncharge_page() Johannes Weiner
2025-03-13 17:12 ` Shakeel Butt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250313145856.4118428-6-willy@infradead.org \
--to=willy@infradead.org \
--cc=david@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=muchun.song@linux.dev \
--cc=roman.gushchin@linux.dev \
--cc=shakeel.butt@linux.dev \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox