From patchwork Fri Mar 14 13:36:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14016920 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 E028FC282EC for ; Fri, 14 Mar 2025 13:36:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF43B280005; Fri, 14 Mar 2025 09:36:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCBF0280001; Fri, 14 Mar 2025 09:36:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A223F280005; Fri, 14 Mar 2025 09:36:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 60E90280001 for ; Fri, 14 Mar 2025 09:36:28 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 80793B8951 for ; Fri, 14 Mar 2025 13:36:29 +0000 (UTC) X-FDA: 83220256098.23.2F5F7D1 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id D5F0F140011 for ; Fri, 14 Mar 2025 13:36:27 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jXR9C9Ca; spf=none (imf26.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=1741959387; 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=fC5DoxNuYoKV+R7qEc+/iHREUpcwj9ubSKHO4mNm/rQ=; b=cwBPaUlZPsuzNvIFFYtppGoeCtCPMjwG3qv2EETo6Kf5CtDesOhupWRbosuYGDKPC1Ir6M 51GEYwRgEpx70BT6xDkKOfOrxi4Gd5jwNFJbOiOn736N4lgp/2pWCO1I6uomO4A9Fv6fXr Jf7/zAt7QoIG+e2q8edI7/OzDR4HQQ0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741959387; a=rsa-sha256; cv=none; b=KlelrP/ADnAF2CBw4rHJnwYIjZXQ4+wU7GBHQz0MPhV0qAQlPcjUjeXxSA9U4jNg/h4mTx 3KEBH5ofEnE03znGs724YZ46v9qV20MRhoHvEJlz1TmMqnZBYZ5UoVJlEn4kjNF+yTPTSI Czk/xTRToOdFVsbwvJtsnGuDy5oBI7w= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jXR9C9Ca; spf=none (imf26.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=fC5DoxNuYoKV+R7qEc+/iHREUpcwj9ubSKHO4mNm/rQ=; b=jXR9C9Ca7DyodmKtKnqhkF/FWg kGjHvyL+KNTMD/r6MpS0l8yTqrXPVsFEukBXlBu6IgLRoJBqc6VrCNAZJPglvilxUANhkWzkF1ZpU E/lwK11Sv/0lM0l8MqbmkxOlfSsroyWcH28PIE4AqhkyPyquPmLMz47YpWobwIMGF3Ndg3FBrJMkf bCcsZIyb3Q7eWwi21zrNlJhUkrQlBu2CsUzx+lXI/FdRgTLluuI4jE0I0/OonkT67UFL1rQR5Ngnm bsTToHL9DkW66VVf2dAxaedtvInKCUOvfneEsrGABXPH8HUjsRatJegTFW1KA4PdrU05Ic2ZzSay2 cMX1YIWQ==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tt5D7-00000000Zyo-30bu; Fri, 14 Mar 2025 13:36:25 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Zi Yan , David Hildenbrand Subject: [PATCH v2 5/5] mm: Remove references to folio in __memcg_kmem_uncharge_page() Date: Fri, 14 Mar 2025 13:36:15 +0000 Message-ID: <20250314133617.138071-6-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250314133617.138071-1-willy@infradead.org> References: <20250314133617.138071-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D5F0F140011 X-Stat-Signature: eh9gq1tmw8ufyuyofcmfcxqw3n8qrhux X-HE-Tag: 1741959387-365891 X-HE-Meta: U2FsdGVkX19MH0jt7JYi7ss2hDzG3kb3mdVnk/3EUHN/Y/LdZCmUHLeskFXLr69bCYzuL1wFVP3QvSSf3mOt3pCBpNYpmvSe/sD5uii+xFakZSwgvWA4MZSUZkB4SXoqBwE1I1BjWpo6+Hf0DLuUGEKcdN7kv3wy+vzumvBuiiEfzJywQZh0XFkqzlAA5051Ma+MuiU86vb7Z54diWpTDR1I4LAKhM2DFoIMWr4ZnMLEQqTuDWsGEJDaDO2gJ8OzOoo6FraprH+YU+/IfYk9y0IFuesY4lF3bInKN0jtu6/2u5hdLVdEiaauzHPu5R+4rP3qS0Jz2cM4WNK6w3myVdlBMl7IuaGP7Vo2qlE44+bPdTcdxmwSp3ChSB61skHVHIfJrAOWqBeLdlNtVT8WIum0ufUZHowWCPU5Xrtq51ujBkN6+frpBZxmDa3GxUJ1kgil3qhimiif8QcHG85E6AYQz0IoEmSBjsHVGD+xW9ezI16ul3aSa2j2QxkK1G5kKO5LGDxX3z5xqVuhO0lkRToslqIFm3DKjFZYYkKw6xWDOr8jta1Zk4kLx4HBZ14x9TN9qW0jzbGa8PTJ9TKVw9Ge6x1vJJw6wJ+VxvALKAAIRrfv43MQCPTz4TtWQ9dMwry67KWfnUasrJuH4QKGY2knXKvi0gcwIbNUoIuDLkoCXavyrHa1ibVS0S6cG1iG+m1gpCDPlCkOs4Ns0n+KXx0tEt75/If6EbZ1yZ4/gWxMzgNmKypQwoi3Uko0ohFtmEDX3vjy7scpAhkGUeIk+Erm5BwRrmbLlx2JSozxKmeoxAQo2KkJ3+1+8NgSpgiTDs+ssh1lz8TGkrAZSSYD1WaBPm2bIwdfkWrvo5zBWlAq2gMXHcvtkviGIk6y0dpDuDC8Zxj4QCHSMlwp+nq+3ep49t7yu6HcrAgdt/ApyMQ8gG92nz/GQKun8KwINy1IbQUaeFJvGYJQBiLemMv X27OGHbf yFG3YP+9ir1XrkjZxTwWoFJN+BvyDUKvI9FHf/Css8LtX4SY6hkbf6etfiARUwZ5FtcSixtLrNvBVi6t3lMIq0hkSpf7TPFQjMlRCBlXO8nGwwNf1Af1hc1KfMY9cxs8LrJrOa6rGB5vMIm0HoFBdsOnflZP+uchcBXhH3d5lhuWSrixyNG6DQbjYwaRHeCNXPucZd2Qrl6R/1/1o0C+OIi3GTdO7Ng4rxVgHfJah1kLFPh9T70lF7Vpgc7JVxqczBMcO0MJ9SLrCCUQBlINYmB7zWwtbu5LzJWCFG1nbPG1Uqz/G3wYX3nvCo1xKnWLWqtNqOsE+ibNyTzpzEhxz70fxNlGv0r+k939z 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) Acked-by: Johannes Weiner Acked-by: Shakeel Butt --- mm/memcontrol.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9e9027dda78c..76ba1953173a 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); }