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 AE2DFC282EC for ; Thu, 13 Mar 2025 14:59:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A959280004; Thu, 13 Mar 2025 10:59:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96536280006; 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 7D0DF280004; Thu, 13 Mar 2025 10:59:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5BFCC280002 for ; Thu, 13 Mar 2025 10:59:01 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 949211A0104 for ; Thu, 13 Mar 2025 14:59:01 +0000 (UTC) X-FDA: 83216835282.06.72A92FA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id F10CE4000A for ; Thu, 13 Mar 2025 14:58:59 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dQWK7GXH; spf=none (imf27.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=LfkvB1pvWTAWlDqoowhmwCZSBvNkbpiSUAwNWEscEQU=; b=6A3+WLsshPubELS5NeCxSF9Fzvf/ZbnpjC6nHh1/CuiYkq1vi4ZYaiTBNF8XY0ULoMxzSG 0lm4ccam6ZqginOUGqqEvtlEHwLyd7qFDLFUgV+D75gFiaF7kGYw62Ay8xMJaSy6OFH3VI ZjYdJePDiEx2tGTsH08HjemF1BJ6OBU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741877940; a=rsa-sha256; cv=none; b=j8A6943XnBvzgIuZulHwHiG7gRc3ZsI+koW6E6Ia6ijM/Tl/0yF2ujEq7SuEgsMxxQoOuq GdixL0BtffJxjiqScnPmi6gVjhXt/4opN/BjxBkkfqAV6pd0+066eQYezFf/u38l2dWX8b /Cy18CYRKM3btc7BEtDf/lrogYDnvhQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dQWK7GXH; spf=none (imf27.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=LfkvB1pvWTAWlDqoowhmwCZSBvNkbpiSUAwNWEscEQU=; b=dQWK7GXHrynpf0TSwvRmlNV+zM Wsh4CWJ3yK/lomUzD1gL3PQahs1s6RBxWosyXrwKRKfzv9v9pJDICQQJpmlrFNaejJxwNnEmjbdTK 9O/268fpSUgPd4JtNoHyFeZNj+l9Ulwc28MGN6zHgFyTeuZyy+BYeR2cGLT52h7bsaXWu6WW1uiRj wNgbXnFgsNBk2ZIoColmaEezNTz6X1oikqmcpMSNoPuB1yvocs7/R2OrhSP0Z+1+coegwDtQVT3rX 1A+ySWRALbgsugFkNfnyIREiIbj1urWUdfcJiU4JTfoMvWHkHQDqu0lyPYI5Bz5/0L1DMjhxacTbW kAkT7wgg==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tsk1S-0000000HHPL-1aks; 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 4/5] mm: Simplify folio_memcg_charged() Date: Thu, 13 Mar 2025 14:58:53 +0000 Message-ID: <20250313145856.4118428-5-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: rspam02 X-Rspamd-Queue-Id: F10CE4000A X-Stat-Signature: mgf73drkfcz59msmht5fdhbqrkuzpftu X-HE-Tag: 1741877939-967818 X-HE-Meta: U2FsdGVkX1/Za0aaaBBWNmaQ1U9kACryM0rQS7JBOr7R5LbjTjnUmUzcqK95or5RED8bSZ37Nts/AN5GP86nNlpAf7C8ap4lsRFStCd7I2XFqkD5eZKWLIOnMytlFGdJEnHpsIJaBoEQJbzHd8oh90ZH7KpfshGkntTw8DUJ32w8XIgFXyBXQg9HCmXgLM3upkJFDU9FtNwEPMbLK04eh7fjjaGy5l8FuN1BLUk1FnHL6mpiHU0prVFl+U0NsW3lxSy+Us1OD8XLafFz+YsBslxyTN3RSzgcBffrI7WEAVgOIbaaKj6ekT8EgTzYA4BEbjcljQQ6N3TyNQFOCFywVD3HqnKtCfRVwXyokrOKhQ5sWpO0fdycAY1rkChTxNbN0Q/hdfpnLLkftFvZkZKbNxTyYHbaL+BxCRTxfz65Jw1zcCCUiTjF5vlY2ILRsqnz0x01cHXM3wa4FokXIvKT0RaqMMzPigdthktNRItsC8sV9fhz8CDPfW1GVgKaqk34J3PFaotxGcl3FINuqKEc0OiuAf7u0ecYpiS6XDlEKiTBnm+6wdIei5L7Irv9y0RUo3ilN/KHY4ismWMSqJ1ZTpC/gcJqrlI+pU55rUYZ8OX2WUHeuhrcJCoGJyCaE3i+zvHfebO+YKEqWgGIAs4sfyfVLRMQpl+YsDx3CLU8ASM269Gzjf3xv4CvY41n+8n7ygHzeqColvFYQGQtKEv2Jhnte4BjkQUCa30PI5XAPkzvXnO+lpXFrhfC6OcBX7r2VF7lUESA6bWCRLyK6/6DEXzxV0HMOvWunoA6Ek1IshJ1gs8lm9ngb8xdvK5rs7pBoxZsTnneQmAay0Fpk71hrM/XkASYFYASpNr7VaOniYI/I0FkM8/RK9JYDvIAjDjprZ//iX6HEz/OhUbWj4GLQ+XHwT1pWCGj/Rcwhl6uLrhUcNeKa0segtkJCe+oDqlUICNkiWuRTd7AN96EDa2 odn6742h +o4+XPHXMDwiXVL8yqhqQdjqdqx5RNaU5nrXyT89ZiOMKxK3yzpwzOoJRHB7mo/Hbfw3WFOTawpDUDdJDla8bgMLdQqdutqRfg0qacl7QQsAM9wOc1DTcBiRmDQgKKbo9PAZA9Jyl+ASmWkt3FFB8XfzfJQbvmhtCFZyL6YoR9swGX1JXpEUKeMr/VaKpAfppz6WID7pHq9p2NJ0+RITvD7SAf3qIHSsibzkT+Gspoch8jRJcGDFaGyVahw130CwYACoFptzSi44K/BLjEK6uFUVEW4MkH4C9LeZv 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: There's no need to check which kind of pointer is in the memcg_data field, all we actually care about is whether it's zero or not. Saves 70 bytes in workingset_activation() with the Debian config. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/memcontrol.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 381c5b565dca..28c251e34cdf 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -438,9 +438,7 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) */ static inline bool folio_memcg_charged(struct folio *folio) { - if (folio_memcg_kmem(folio)) - return __folio_objcg(folio) != NULL; - return __folio_memcg(folio) != NULL; + return folio->memcg_data != 0; } /* -- 2.47.2