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 11D19C28B28 for ; Wed, 12 Mar 2025 22:26:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4131280006; Wed, 12 Mar 2025 18:26:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F0F2280002; Wed, 12 Mar 2025 18:26:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B9E0280006; Wed, 12 Mar 2025 18:26:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6D9DC280002 for ; Wed, 12 Mar 2025 18:26:26 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2CF6F1A174F for ; Wed, 12 Mar 2025 22:26:27 +0000 (UTC) X-FDA: 83214334014.27.123E56D Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) by imf27.hostedemail.com (Postfix) with ESMTP id 65F6440007 for ; Wed, 12 Mar 2025 22:26:25 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=QDGH1kxg; spf=pass (imf27.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.174 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741818385; 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:references:dkim-signature; bh=AFPGE3NPG2ZVG/y8e2qb1wahSmn2Ta6Uouhe/XHQ2mk=; b=fACW+S/atph/W77Uqh4D6GEixSRy4jrIiWJUKPuNDQgmR4gxu2hJ1GNqwtkXAd54QPfJAS pMiwJRhNzFQgl+1N58wzyi0R36FLP41cwlZWQ7Wc8NQjPcamZ/eOr3eK/okOaPU/2n8CPI VDnqQLklztBSQIssHWVwB04iWa+2Rgg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=QDGH1kxg; spf=pass (imf27.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.174 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741818385; a=rsa-sha256; cv=none; b=W9wPVBlTzBiU6a/1T3s/67qX/MUKeHZ/zlhRJILSV+ZvyAvIKX8zEevu1JTIYxBA+UCMjE rSpzDeLnE6E3NCOkCrnFaUsdxKlMBFB5m2z95yPaY5ib2hGbfsP6/yEPda67iIrtA5Gj4o /4ID17u7+IFdTYLyX8nfYfOmyhRN8l8= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1741818383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=AFPGE3NPG2ZVG/y8e2qb1wahSmn2Ta6Uouhe/XHQ2mk=; b=QDGH1kxgBQDIZIVNIJ/FPtae8q7wBN0php2sCcnEruis6Xcbnx+qQh59arbRhlfFXYPoWb bovPKIkiCMKW9BRyWIx5xy725Lf0QHgisp8i62QTkCrbzylESvSWtQmTyYTUeAaFmASiZi N9UJ50PI0Ix63ZPRbaYWdf0LkM3Zw1M= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH] memcg: move do_memsw_account() to CONFIG_MEMCG_V1 Date: Wed, 12 Mar 2025 15:25:52 -0700 Message-ID: <20250312222552.3284173-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Queue-Id: 65F6440007 X-Rspamd-Server: rspam08 X-Stat-Signature: wcffg6tyi5oc8z84bqpeioxj4by64s1i X-HE-Tag: 1741818385-475726 X-HE-Meta: U2FsdGVkX1/XV+MIXC7oavuinc9cdyqlZMZ/tMx+8SMv2Bg7NROi0e7EcC2nRLo7hEv0BYQNMISRCbS2tORLKBkNrFxxCmqoUsp363T4fJ9Q3Bm3T8H2+fwhvjNMG743kptGd+UtI5RBu3ua2Yn/RFhqZ6MzMlNru/M2x/DW027I+AqjDD9apiB9zdADBna1Qc2TwDxOlSY6KWkLTft/PO1EElmRFFxqZCMBRM/17xuEWs56Vckp1TVq3WHSIt+Vhf5RucJgBRjcY5KaTKAglFiOsU/6sktsUn4MWWwo+2/HKS15M8yoFxSsaAhcg6UNLyPXvvffVAQGJAcprpBNlmH4tJ9bq2P6JpKMzrvEP3XNV6529BEtF3u+DqQyfI+zvLsr836WZjVki5SlN6FCe4X6f+HcRyZdFjgArHIBQ4cxVml0silsUPbx0jGsJoKDBX4ZfgDr3IoZG10wuhw04Uf3G7Ety0lQTOOcXAyxe/RvgaNFO4lp41O2zqAcWJ3aiq+tPFag9ztPj9kcB0ME5ugI6MRVfHUFdUWWYSTLKk/i7o15w8VDHgDeV5aKLtjScZ/RBd6BFB6wFhwWFm2r2T9P2TJiGydtU2TsXQfvpm3hycsiGPI0Jye0XaKzciVpnXaiTA1zxbDA/1WRXBmuaKe5zKi6TCLQegQZGrw202i2wR1vvdYCIeWFNSJq9YcA+2N83vG1vxNsmKIlYMdTKC+Dz6TMUpbHX4zG59LQpPmSh/TS/emd+No6gtrc2vzC0pgDdlYF9hZCCvYi1Zz5Oghltzt4+klE+BU8bQ0vpY4hMg1GDe0KC18R7vTFt3CMB6YCPaXbZU8/lgaIVz4DXavpltRUzT1IEqn3jk/xe//nxx88+PvgAU3nGZ3w3/5YcP3FSHLvaaNdkAulbfu7z7Ns101P+FuYiOOjtfcCufmzBExtSvp4ZqlYpmn8f8qrLg+qZUUrYgWhFItTSEc c0csDq9a RQ3S2RUMPNGD//EurLBOdlH/7BO3S6o/Rh75WYeQhmY+Pi55Q2piVFK2l2WGfv8Y0nZcJ/TfmVNVnAO3JfK48BeINvQ0voDXQr7X47wHgmk2fvSMV/7tSS+FjlWmFVQiJcBiP+Q/sBZp1K7zFK4X/7yvp9+x+s6aFjECFy8j4xNZ1J/HBD01QQoWRInKgephlWs4zCMbSzbJATUj6zMiP1B2Nfg== 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: The do_memsw_account() is used to enable or disable legacy memory+swap accounting in memory cgroup. However with disabled CONFIG_MEMCG_V1, we don't need to keep checking it. So, let's always return false for !CONFIG_MEMCG_V1 configs. Before the patch: $ size mm/memcontrol.o text data bss dec hex filename 49928 10736 4172 64836 fd44 mm/memcontrol.o After the patch: $ size mm/memcontrol.o text data bss dec hex filename 49430 10480 4172 64082 fa52 mm/memcontrol.o Signed-off-by: Shakeel Butt --- mm/memcontrol-v1.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 653ff1bad244..6358464bb416 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -22,12 +22,6 @@ iter != NULL; \ iter = mem_cgroup_iter(NULL, iter, NULL)) -/* Whether legacy memory+swap accounting is active */ -static inline bool do_memsw_account(void) -{ - return !cgroup_subsys_on_dfl(memory_cgrp_subsys); -} - unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap); void drain_all_stock(struct mem_cgroup *root_memcg); @@ -42,6 +36,12 @@ struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg); /* Cgroup v1-specific declarations */ #ifdef CONFIG_MEMCG_V1 +/* Whether legacy memory+swap accounting is active */ +static inline bool do_memsw_account(void) +{ + return !cgroup_subsys_on_dfl(memory_cgrp_subsys); +} + unsigned long memcg_events_local(struct mem_cgroup *memcg, int event); unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int idx); unsigned long memcg_page_state_local_output(struct mem_cgroup *memcg, int item); @@ -94,6 +94,7 @@ extern struct cftype mem_cgroup_legacy_files[]; #else /* CONFIG_MEMCG_V1 */ +static inline bool do_memsw_account(void) { return false; } static inline bool memcg1_alloc_events(struct mem_cgroup *memcg) { return true; } static inline void memcg1_free_events(struct mem_cgroup *memcg) {} -- 2.47.1