From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 044041F541E; Wed, 22 Oct 2025 00:58:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761094684; cv=none; b=KDIxtTHu0Bizo9ZJzZFyl2V+gInSIOKqehLZ9bS9cfRHh5PHFcTbhfPPUyXrGSeHVy7ZngfxaaB3wRpvOViApZoMQnA3224cxGHYw1BdfB1x6fwFVDV91But1b7+xoznNZqtLz3ntcSSZUMm91yfzlQGxCI0ZDZEEXg/EaQ01o4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761094684; c=relaxed/simple; bh=uMDPju61XWbh4c9f5TQ4DN2PgD9sxPz1PbXcXRPEvn0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YQeuHc2vVSmmo8PvOs6rKHv8m7ukHK0C0TgW5SMugWRGR3NGj3n0hoo2OwqwzTOZcADnm5b866YZbqj/v2xqUieL/nKROxSw+eOVO2levhNocnccmy4pwUMwKTCNRj+6mssvAyE/GM//h1qPWWeG/EEzlfFHxnnNJkxggqizzRs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cHYoAxeX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cHYoAxeX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1652C4CEF1; Wed, 22 Oct 2025 00:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761094683; bh=uMDPju61XWbh4c9f5TQ4DN2PgD9sxPz1PbXcXRPEvn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cHYoAxeX1mBsM50GUoTBiKQA0EvY5sgw4FRV4RoYjanT4dnftwTWcoJd/MQn7mHxb EFJioz5CpR6TTmatbSnDRZMfwmwlKRZboL4ApGZum8p7WeInD8+6g9nZrFPO08e4So lFdwfyccMQQq/7+KnJfYk4jfngER+mFgWj2NabWwEr3TKpfm+Z7Oiv0rcfejulsZ1n lOCACY/UzkQxNDuxLqLIDN96/KcYtidFwzGseIW013jN9PWY4FxgK1mWd3uT7sGaW2 bDfqn8bQImUsukgBSx3CtG6hBr/Q/by+u7x3NK7mJ0Cu8I51Mx6qzJdUsIRlOCl3YF dkOJESLGxtkSQ== From: SeongJae Park To: Shakeel Butt Cc: SeongJae Park , Andrew Morton , 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: Re: [PATCH] memcg: manually uninline __memcg_memory_event Date: Tue, 21 Oct 2025 17:58:00 -0700 Message-ID: <20251022005801.120250-1-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021234425.1885471-1-shakeel.butt@linux.dev> References: Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On Tue, 21 Oct 2025 16:44:25 -0700 Shakeel Butt wrote: > The function __memcg_memory_event has been unnecessarily marked inline > even when it is not really performance critical. It is usually called > to track extreme conditions. Over the time, it has evolved to include > more functionality and inlining it is causing more harm. > > Before the patch: > $ size mm/memcontrol.o net/ipv4/tcp_input.o net/ipv4/tcp_output.o > text data bss dec hex filename > 35645 10574 4192 50411 c4eb mm/memcontrol.o > 54738 1658 0 56396 dc4c net/ipv4/tcp_input.o > 34644 1065 0 35709 8b7d net/ipv4/tcp_output.o > > After the patch: > $ size mm/memcontrol.o net/ipv4/tcp_input.o net/ipv4/tcp_output.o > text data bss dec hex filename > 35137 10446 4192 49775 c26f mm/memcontrol.o > 54322 1562 0 55884 da4c net/ipv4/tcp_input.o > 34492 1017 0 35509 8ab5 net/ipv4/tcp_output.o > > Signed-off-by: Shakeel Butt > --- > include/linux/memcontrol.h | 32 ++------------------------------ > mm/memcontrol.c | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 33 insertions(+), 30 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index d37e7c93bb8c..8d2e250535a8 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1002,36 +1002,8 @@ static inline void count_memcg_event_mm(struct mm_struct *mm, > count_memcg_events_mm(mm, idx, 1); > } > > -static inline void __memcg_memory_event(struct mem_cgroup *memcg, > - enum memcg_memory_event event, > - bool allow_spinning) > -{ > - bool swap_event = event == MEMCG_SWAP_HIGH || event == MEMCG_SWAP_MAX || > - event == MEMCG_SWAP_FAIL; > - > - /* For now only MEMCG_MAX can happen with !allow_spinning context. */ > - VM_WARN_ON_ONCE(!allow_spinning && event != MEMCG_MAX); > - > - atomic_long_inc(&memcg->memory_events_local[event]); > - if (!swap_event && allow_spinning) > - cgroup_file_notify(&memcg->events_local_file); > - > - do { > - atomic_long_inc(&memcg->memory_events[event]); > - if (allow_spinning) { > - if (swap_event) > - cgroup_file_notify(&memcg->swap_events_file); > - else > - cgroup_file_notify(&memcg->events_file); > - } > - > - if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) > - break; > - if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS) > - break; > - } while ((memcg = parent_mem_cgroup(memcg)) && > - !mem_cgroup_is_root(memcg)); > -} > +void __memcg_memory_event(struct mem_cgroup *memcg, > + enum memcg_memory_event event, bool allow_spinning); > > static inline void memcg_memory_event(struct mem_cgroup *memcg, > enum memcg_memory_event event) > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 1a95049d8b88..93f7c76f0ce9 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1626,6 +1626,37 @@ unsigned long mem_cgroup_size(struct mem_cgroup *memcg) > return page_counter_read(&memcg->memory); > } > > +void __memcg_memory_event(struct mem_cgroup *memcg, > + enum memcg_memory_event event, bool allow_spinning) Seems this function is called only from memcontrol.c. Why not making it a static function? > +{ > + bool swap_event = event == MEMCG_SWAP_HIGH || event == MEMCG_SWAP_MAX || > + event == MEMCG_SWAP_FAIL; > + > + /* For now only MEMCG_MAX can happen with !allow_spinning context. */ > + VM_WARN_ON_ONCE(!allow_spinning && event != MEMCG_MAX); > + > + atomic_long_inc(&memcg->memory_events_local[event]); > + if (!swap_event && allow_spinning) > + cgroup_file_notify(&memcg->events_local_file); > + > + do { > + atomic_long_inc(&memcg->memory_events[event]); > + if (allow_spinning) { > + if (swap_event) > + cgroup_file_notify(&memcg->swap_events_file); > + else > + cgroup_file_notify(&memcg->events_file); > + } > + > + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) > + break; > + if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS) > + break; > + } while ((memcg = parent_mem_cgroup(memcg)) && > + !mem_cgroup_is_root(memcg)); > +} > +EXPORT_SYMBOL(__memcg_memory_event); Also, seems there is no reason to export this symbol? Thanks, SJ [...]