From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44B16C282DE for ; Thu, 13 Mar 2025 14:59:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1ABB3280002; Thu, 13 Mar 2025 10:59:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF8CD280007; Thu, 13 Mar 2025 10:59:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFE0A280002; Thu, 13 Mar 2025 10:59:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8AC68280005 for ; Thu, 13 Mar 2025 10:59:01 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 91CBC160186 for ; Thu, 13 Mar 2025 14:59:01 +0000 (UTC) X-FDA: 83216835282.04.9B4395D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 06437180008 for ; Thu, 13 Mar 2025 14:58:59 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TP4aI86Y; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741877940; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qBbewm7JigqkvduasB+aAzQLAKPHmNZ8oFmdw2p5ybY=; b=a2lew71+20/274u6ThSER90u51R/GqCoBTbV+fXkn9NeqzZLcphCtO2tPwYLqLiNsTkdN+ Icr4N3tKlpm+VuQ23wMUdgYJuSzZq9hxUKVkx/j7421rmAZmwSGL+WfBQeVad34q7uwWY0 JWUZBcGWSTiVHpv4gqz/Wq9y7kVZ2Tk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741877940; a=rsa-sha256; cv=none; b=XXqswbWiH9iIUKx/tJlG6gWuXey9cGhPxMzupkqGfvotTPrK7w2BfEbWhBS1iZTdhhPFet FdJ+lc1PKcT0pDH4Q0XY2f+PmhkIoGDeQD8C56gcSxLVhobHEHC15ceT9/MtGc/PtZicKE ykGEjzCrkeWb75ACvjik5MozaJov+Jk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TP4aI86Y; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=qBbewm7JigqkvduasB+aAzQLAKPHmNZ8oFmdw2p5ybY=; b=TP4aI86Y59cufTuriACY4QA66z wGrViHfdAazIo65FEgafKFS2mXyU4raw7fo8lFyHTb4CnzupACQW1RsETymYh/450bLJGhn3K5SJy Tw+RPY0B1M1Xe4SfOevk2sH0yT2YZqjTHegChh7FJbmq0dA5gk/skUhwG5IyJvaDv4Psqe1e5q6tf TFaKZJOB2sjn6dWLcHg8bnrCQ0kEAfBSdeIMKKNtXf89z7zaEDFc0QB/cYiTLuKltHo97yT968QHB SgtEvWH2j/+AMyDZ2iGM9/056hVKaVYjJKLTIx8yt00k8NmsSuKdy00kFLtOKF8CG0kVbdUYoYhZJ ib9FPm2A==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tsk1S-0000000HHPY-2BTy; Thu, 13 Mar 2025 14:58:58 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Zi Yan , David Hildenbrand Subject: [PATCH 5/5] mm: Remove references to folio in __memcg_kmem_uncharge_page() Date: Thu, 13 Mar 2025 14:58:54 +0000 Message-ID: <20250313145856.4118428-6-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313145856.4118428-1-willy@infradead.org> References: <20250313145856.4118428-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 06437180008 X-Stat-Signature: pn5s8i8ffu6ch1w3oer53f4bfczppy67 X-HE-Tag: 1741877939-577449 X-HE-Meta: U2FsdGVkX1++HOaLbHd3VZVhtxcwiuGTW9RPv6+F5vYdzRFsydamhZkFFRycFRIvtH4RCeqiXCYvRRwq921pTDJSJXjnykLxenUGyO6Po+1s4wL9wcuuJszos52s6arVIu+0RwcZ974rkgygHeLAJRl3dCjWsD/q8h51T9hR6ZdPJ/vJb4Cwu4s8xZGUMTw3VKkgI30P3WUvDotV0pVgWTVdcsb2HkPc5pXse19nCpYCEZ0gS0QxDwOqeWFHXhhLtKAgznvV3CZhEbxck8fhglMFjWAX0OVB1dJJs4BiLnRZpvcpEyiPIhwK7x5lKc7lxTQDBXGOYaRHHX+JcG0gYDxjv3iQO7BH3TllScbsUtkzTN40FYc3TTMTNzhsDIlpby98wDDu/DyE1sxwo5Ui9AtRg2YVjk7y6uv3FmQhjCaT54P+Kw39DIYenzbBLgF80+npbT1WOULP44JPSY+KGeiayw9AYAS5WekmWzommf9GmFmTM1rkZQJa/Koyfwd2NPlA9AnhrEC1DXZ/hBkSsKDt9nBHxf2PK5LfmU3HOnu15rhO2nSEBki82/3E23Qof/EkaiRIZJf0a6CK/0aSKDO7OxrafaYm3tgA3zcV0mgKZbnBcgE19zKrJASM+ZQ525dGLAnTFD+TjUWiv9HnH38+lEhKtamqhuWHftpqRhQeZBOMuD7Ug8cQSf5sxI/cHan/uBbqnyghNr/2I4j7ywGsFC58qdOcZSzQRBixZbm/xVBntY8IkvQurTyb2ohsmA9N7D8O00N6aSb10syr4cWSOdSoGSlHp4uG2o2YmNUXZFXtc2EY5z1YYh96SRXeIs/eIREzq+mq0FSICGifo32kp4LU6fNA1RvHm8b4RZN7MsJiIhDvDlh/wXG/1w3KnKqZQ5EbUJWzx0fZREtmZoJsuLapQ+hQLlRa7/ZM9/3pt6g94TJrPhoLNLaeSYKTHhUqv9BMiU7XMLlWXTm o37LTFqV EvYfjK40WOipMniXxoz8csNr0rg8cTu8XPe6WjfFMW+cigCjx8KR2ann+Qlh7iN9hBUgly9FPNC11PILvLEEJ/OQwpDGwsYwC6CZNWHzJdCYbq+uvyTNkIUJ1aa8EMKGUCJrbwTW3GvDdZO2P3RgKJjsd2RJXIiIm9YYGXhmmH0dxFXYGOQTEmIEZplDTQ0Ehw8IP7NilGzZqM7PKioWXOgh7UfpfovwgyxfhQ34o6tv7ke9a45RBG42ebJzdzIISvc2ShUnL1ElyApwBYcMY6dkO1C6uGuvjog0O X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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) --- 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