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 8B2E5C25B76 for ; Sat, 1 Jun 2024 06:39:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F38306B0098; Sat, 1 Jun 2024 02:39:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE6BD6B009E; Sat, 1 Jun 2024 02:39:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD4EE6B00A1; Sat, 1 Jun 2024 02:39:46 -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 C00B16B0098 for ; Sat, 1 Jun 2024 02:39:46 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7BBF8160670 for ; Sat, 1 Jun 2024 06:39:46 +0000 (UTC) X-FDA: 82181369172.03.BF82361 Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) by imf25.hostedemail.com (Postfix) with ESMTP id 2E8F3A0004 for ; Sat, 1 Jun 2024 06:39:43 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sjTM+oLf; spf=pass (imf25.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.181 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=1717223984; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Hm9DbePAxZcy5wqy3IhckEJObhpoh9YOVaNcMwxBlYo=; b=0Qy6IizulL7OTUVBEb3YWIvtRbqaxuCEnHU9FgEmgfuvxgqlkxDKWPsiq678MbBEE5NphU JwL/Uv951KcODb3x685tgb/SipNfykU+iSxUuA8h3VyZZpbAhycv6EdHUbM0xO70AIVukn 7rHqG3Q1PtGjAoX8P1SV1BE20p9dyOE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sjTM+oLf; spf=pass (imf25.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.181 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=1717223984; a=rsa-sha256; cv=none; b=ctLgXXKMsB2IRKcB3WibxaWKU12XfYgRiJGjBcAgW+XOKC33DSDoxHhBkEsY991wnidpYz in8xGYw/m837bj5qSRcPWebiE7nxZdu1Q/CYsq74Il/i48IFNg9RLu/AniLQk2cHeUXIwQ zBnC0l/I1jBZ2L/BpLtmfnNIKzuzpjw= X-Envelope-To: roman.gushchin@linux.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1717223982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Hm9DbePAxZcy5wqy3IhckEJObhpoh9YOVaNcMwxBlYo=; b=sjTM+oLfqfdeuMnKKb9nsH/8FjelAbWqfbe1Rg2hCmQrZRBPlgBw3PLVcVLqO/Nm6KSAEj WtA57GjtQ4kjBevZ8vxdmblTnAh1bVaNi2ElG5qQKj0b8Zzc2cPHQxlSWYrw+efxmewX5y 9B5UlySR+W/hcn63V+tOA4d5BFMvEu0= X-Envelope-To: akpm@linux-foundation.org X-Envelope-To: muchun.song@linux.dev X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: mhocko@kernel.org X-Envelope-To: willy@infradead.org X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org Date: Fri, 31 May 2024 23:39:39 -0700 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Roman Gushchin Cc: Andrew Morton , Muchun Song , Johannes Weiner , Michal Hocko , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 07/14] mm: memcg: rename memcg_check_events() Message-ID: References: <20240528202101.3099300-1-roman.gushchin@linux.dev> <20240528202101.3099300-8-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240528202101.3099300-8-roman.gushchin@linux.dev> X-Migadu-Flow: FLOW_OUT X-Stat-Signature: pfj9bxa3kgirfyc8aarnbnhrtz1gcw4e X-Rspamd-Queue-Id: 2E8F3A0004 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1717223983-204392 X-HE-Meta: U2FsdGVkX1+1GA4Hy2tnsKCnCekWh3VNSprwI/qyKJ/k3aQ3NflwvHXsM4UTJP+bRF6Ynap76NZVEqwlFDf97CEBcE58yOVfiqu6kBNryNzHrPUkP+UH8Djj1Ocexjh8XpWLd+ZAscI0B8t4fF9EPwTNoCb+FZUey2YUFtKvG55ar9F3Nu0tp0hsK4LPjEJ2AAHP3hD0b+0svM85XD2oQTxG5bAkYh5WxUrF7m8lTPlCU1Kge6IhOas2/57CSJp9/oHedg7eZZK8/sYfBgLZ+/okH9AHe/PSS9kQ1rAAJ/mmX1ll2SJ0SR/6f9U1ZT6aj/YYwj5QkGmHkKJuKwcQbGWnG1CqH6Gv/5BCnfFUJRozYQa1JN+5TARgau0V3sXESJsG12SflA5imCqBEsZSdzmCWZRTenEd5fg2gti44r1YAN489anQbdxVMRc9uzsnFm+tgUu1maK+RIL/eSQVnecUVxUSlq/d81jhknbfM/93sbIs9T4ictkZ9GYF3yoEqqbipDgcTrKXrxtMAIhVivEoX2+VkDQV9W3PaW3WqKj5zTduo0wp2JXp4TISXBb5qTtzHlx5JdNoaYtGe8HzmQDJsfTKVr0q5waoMDNLdXILLGUqjmQHo1SNeII3IkkiieP05bJ/+phFLXH6Px3n/j52y/QBxVF3ZDjvGxvSbMZxOq5T4JqLvi6Iva/4H6rGw6AzaX8NSoIo2kuBS+5wTubHQ8INlY0zVefTcTV4gCNtuK+Bj0Fbml9/kMZyL131y9UhWSAV59/s/H/2Zte66rvduJizZ3Gi86O7riVO4ot4JeKsBSXRfZlQ1e4ODY+6lwiTVQOhOhYAFwqLaf1D1v+CfS1PhHDKIYMgXFYTXdC1o3Kzo9BBmxA/I+D6Ax7bt5ipzTDj+v3ukLwJ0esr0k+gP/lM2NFHkrTk6ta8cX1my6XHfgn8HqTd5/sPG3dN1YN4u149fIo/CHLCdkw kexFGAFI 3xLQoDAl1Br3bdl9qUSdyWrVx3oAg5fVtuGchzj5AzTqAA70zm2EcEg/Sor+vCStw5wUhgcQtui+pn4A4bmprSAbv4VTYgJ2FPp+wabm3OhEUTZNRV4VJRgLXtjGi5WgLuCS8 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: On Tue, May 28, 2024 at 01:20:59PM GMT, Roman Gushchin wrote: > Rename memcg_check_events() into memcg1_check_events() for > consistency with other cgroup v1-specific functions. > > Signed-off-by: Roman Gushchin > --- > mm/memcontrol-v1.c | 6 +++--- > mm/memcontrol-v1.h | 2 +- > mm/memcontrol.c | 8 ++++---- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index c47ffb6105931..8b8c2c9516349 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -835,9 +835,9 @@ static int mem_cgroup_move_account(struct folio *folio, > > local_irq_disable(); > mem_cgroup_charge_statistics(to, nr_pages); > - memcg_check_events(to, nid); > + memcg1_check_events(to, nid); > mem_cgroup_charge_statistics(from, -nr_pages); > - memcg_check_events(from, nid); > + memcg1_check_events(from, nid); > local_irq_enable(); > out: > return ret; > @@ -1424,7 +1424,7 @@ static void mem_cgroup_threshold(struct mem_cgroup *memcg) > * Check events in order. > * > */ > -void memcg_check_events(struct mem_cgroup *memcg, int nid) > +void memcg1_check_events(struct mem_cgroup *memcg, int nid) > { > if (IS_ENABLED(CONFIG_PREEMPT_RT)) > return; > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 524a2c76ffc97..ef1b7037cbdcc 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -12,7 +12,7 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) > } > > void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages); > -void memcg_check_events(struct mem_cgroup *memcg, int nid); > +void memcg1_check_events(struct mem_cgroup *memcg, int nid); > void memcg_oom_recover(struct mem_cgroup *memcg); > int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > unsigned int nr_pages); > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 6bc9009bee517..c14b1b01bcf53 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2632,7 +2632,7 @@ void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memcg) > Once we have memcg->vmstats_v1_percpu field, we can move mem_cgroup_charge_statistics() to v1 file and the following code blocks can be abstracted out as well. > local_irq_disable(); > mem_cgroup_charge_statistics(memcg, folio_nr_pages(folio)); > - memcg_check_events(memcg, folio_nid(folio)); > + memcg1_check_events(memcg, folio_nid(folio)); > local_irq_enable(); > } > > @@ -5699,7 +5699,7 @@ static void uncharge_batch(const struct uncharge_gather *ug) > local_irq_save(flags); > __count_memcg_events(ug->memcg, PGPGOUT, ug->pgpgout); > __this_cpu_add(ug->memcg->vmstats_percpu->nr_page_events, ug->nr_memory); > - memcg_check_events(ug->memcg, ug->nid); > + memcg1_check_events(ug->memcg, ug->nid); > local_irq_restore(flags); > > /* drop reference from uncharge_folio */ > @@ -5839,7 +5839,7 @@ void mem_cgroup_replace_folio(struct folio *old, struct folio *new) > > local_irq_save(flags); > mem_cgroup_charge_statistics(memcg, nr_pages); > - memcg_check_events(memcg, folio_nid(new)); > + memcg1_check_events(memcg, folio_nid(new)); > local_irq_restore(flags); > } > > @@ -6106,7 +6106,7 @@ void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry) > memcg_stats_lock(); > mem_cgroup_charge_statistics(memcg, -nr_entries); > memcg_stats_unlock(); > - memcg_check_events(memcg, folio_nid(folio)); > + memcg1_check_events(memcg, folio_nid(folio)); > > css_put(&memcg->css); > } > -- > 2.45.1 >