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 2F6CAC2BBCA for ; Tue, 25 Jun 2024 07:07:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B95876B0325; Tue, 25 Jun 2024 03:07:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B1F566B0326; Tue, 25 Jun 2024 03:07:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C0666B0327; Tue, 25 Jun 2024 03:07:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7CEBB6B0325 for ; Tue, 25 Jun 2024 03:07:04 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3FDF7A1739 for ; Tue, 25 Jun 2024 07:07:04 +0000 (UTC) X-FDA: 82268529168.06.A07AF29 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by imf02.hostedemail.com (Postfix) with ESMTP id 5A7318001B for ; Tue, 25 Jun 2024 07:07:02 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=RTiP8JrQ; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf02.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719299211; a=rsa-sha256; cv=none; b=LJr7qeOwkHp9nKaI7myz/cGJEzixSSs4uLTZVoKLIXBrdQkzwS//S4uCfDYUtXlVGCkL0q wlj1f9d3NBTIT17XXpN6F/Ed45EYJXd9kaCmaQLWSwylkP+oegNsPk1YrxhxMHW0CeN/wU Fvr3HzCZ1WbtOdgmTx/lgGM2F3uaLCQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=RTiP8JrQ; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf02.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719299211; 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=tBnjieBKnSNXiXs3LFFb3+UTctu7j97oa3WJTwneIP4=; b=Te8d7nHshdkWIBHKJnf2opmdEWIaxST/8ZWKmrkFvmwonaz5dQaHiJ4+sNj+FXOeP0zo/u Vln1Ogh3SfH9cVB4JYA8z0PZU0+DuRSWeezgGya0avIpparkhLdN1C1ACo6zCXYMBdGAdo DCDAL7IeFe4uz3VJAnLu3b552XT0iIs= Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-57d05e0017aso6128195a12.1 for ; Tue, 25 Jun 2024 00:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719299221; x=1719904021; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=tBnjieBKnSNXiXs3LFFb3+UTctu7j97oa3WJTwneIP4=; b=RTiP8JrQMPU0X0hBIFH+811GU645dFQNaf7qjd70qlDpTBKX4AAWD0//b38CIx1ZWa 0hgb97I91PKzd5BBhHhJuMQZ9R+ZbKkHX86QV+T5BVhH+zYji/Dkq0NoPRC8jcYNPf21 mdSsMYTKQpSTX1CNr9EJB2VWfmnx8LdM6POipZeCHriB5pEnXSa1LvyIp6aaTSU/Mko8 6j/FyeWZapL+nbx40gS6vywhj88RmK/aL29ZR0w2z29/gL2+FDDxouXth8pEV72BYUOu AeJczCdR8YI7deVSR6Sx0q07XP7WP9TaNovYIs0GZ1bbfOGTLM0S/xsGql1U8Zr6SjIB 6HfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719299221; x=1719904021; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tBnjieBKnSNXiXs3LFFb3+UTctu7j97oa3WJTwneIP4=; b=R90fjRjvBOmD3Wt/ARXk0g2VF0GQ/0EXPUI6e94lRU1KB9Q//9f9HympeabD3ewcAq Wx0uEt2PLbHfMdpl1pxA4I+kxu3d4h267/2k83IuegBGBGSY2leH+YV/9X5jTwNnaWvJ +UF67Yf+v/M9alTipI6tUv+iQKgsrJA4vX1yzx3dcHeiVPc3J52BuhrAYGLaQoMZAczs 0k80wVPQLvs2BDktr9ucGV63Bfq/Amvx/l46Wy3x2PXYytpw6NezijKewJc2HVy3zVnP +q4WyPqvvwVpFdrLZmt/gBph0sTNywbXP3eEvMA2djoPqK2K/eQFddzLaufqWlMdqQ5c Stpg== X-Forwarded-Encrypted: i=1; AJvYcCUSreYXjSjLjfvJD4lCu3ckN+SZFGEc88Mx8dUcTdvyVBk9gLUHldGGwPTZmUrO15fXNSPgMOuXPGnVvHqA4TDNQUQ= X-Gm-Message-State: AOJu0YwqewyinCI4Uy7RP48KnLhQtWOAvrRM3AyHkA8HdRJvxzCEueRA JC5M6Hs2PFOr6xeK2z9s11MUo1RoW0I2yKffkIFgeh4Kyj3bYioEr4JYEgEQIHo= X-Google-Smtp-Source: AGHT+IHyD9jte7ZcutqOQMcaAMjGsTYOxDxkPRF6/pVK32a+zUwsInesnxzyA2WjqVMGCFaK1SG2tg== X-Received: by 2002:a50:c359:0:b0:57c:a886:c402 with SMTP id 4fb4d7f45d1cf-57d45791c04mr6137793a12.12.1719299220786; Tue, 25 Jun 2024 00:07:00 -0700 (PDT) Received: from localhost (109-81-95-13.rct.o2.cz. [109.81.95.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57d30563026sm5535506a12.85.2024.06.25.00.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 00:07:00 -0700 (PDT) Date: Tue, 25 Jun 2024 09:06:59 +0200 From: Michal Hocko To: Roman Gushchin Cc: Andrew Morton , Johannes Weiner , Shakeel Butt , Muchun Song , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2 03/14] mm: memcg: rename soft limit reclaim-related functions Message-ID: References: <20240625005906.106920-1-roman.gushchin@linux.dev> <20240625005906.106920-4-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625005906.106920-4-roman.gushchin@linux.dev> X-Rspamd-Queue-Id: 5A7318001B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: q3r1uq49ghx86dfmeki8oczacc45ipxu X-HE-Tag: 1719299222-478207 X-HE-Meta: U2FsdGVkX19GfIxOc3lx2EVY6r6uTpIygeW3qzMdD7QczPQcpD61JAY33ZSwK4iC9bOQ5xC74ymynLusMHDrC/Ww0GiEEZv7ot2y13PBxfOIiZxnSjlz5JEaRpTH77LiB/CpoAPCwbIUV9YelUWNXdw4YYs91Bp544+gbBlw/mmsKes0OS3fZOtQsOwWCVZGMbTevHZbTVPvq06dfJfO65+S+mGM+8OyCdrZ/HUpBB56dqZ2hqAGtz7/5TK8z5AtQXfOdX9NRO3aZBPEqgL1PQbOys8AjmAIPEDZf5FezX06U11pxw9HjnRaIo+ieZ/cv0mcr1V4GEUaPjED92cFxkfucUdaJ4UVMqwHT4tDFJu1QhrAyn2ANlNZ1kJzZJHwC05JCqiSkI/aBYO2Hl59iYTJq04VyqhGXMM8zVMy9KaUC35tMtwyBY8XM0hDoszTvqsLZGtV1Km6d4+NbX/qVQOPpagMlbTHmB/eQTanWfdanur9gju5T6IcPiGxzGlnrvGXSNMWRxUKekCKEHuclJ7tpfcnSjAs3irEbh3x5DWGeR8CEPazLNtVoZuLoUUmZ0zT2pmIkukiV/8DsIQZi1lwQVipnpKzRQAvchB7Otyem7AhaDgD6yVsOC/gY6qAKGezbsz7woxLbn5EJTpnAqnq2Zd5Ot+GizgpM3x6brWKAFN77T8MnetWzkzth7xD20rLGmfuna4QWn3+YT5KjlWQlmV8n+wMOOZAgYFU0bI7jA8GSj4PzWZHPK8tROAkGHeVPPIV07yhuxscQz/ubsRrhMeLY3Onx/2d/YCEMnWIAq96ZEYefz4J8kh7gZ/VmzrBKGe2ciDgA2qQT1mqHst3aROCjd8GuFYukwOMv+FHBzNEfDxXYaeQu3xE93OCRLOPRzcWfq0vcwD6PD/EdHbXU9RyKGwrI2aeylNdC50xTf+T2gbkGdGbWBCTDxFwEbIhzddm6sR/JzfAHWl BayiQ1cw pRONXVHB0ujHH6Njzec5C2U9Zs2+IAJ2/Qyhj9F4HV8a6DabXTRM7Bip8tnfYEk/s+VTeyWZ7safYbwbxXp6GePqHFZ66DQz8AGu8DgJ3gUo7KXB9Jx+Kn/FA/EirPk4qoZC/JvjJY0mL9YMUUfriYTYfcvXURIYkvQXtmoWm0ITLuTxZ0CX2EvzPlmL90wfe6q2YZuAchznoVxYVN10CjjgLNNQy30Om4yDxJVCg6fmSgONM6xxgXb++l9lRIZWtxZq36QJcJRspoxrQ0Lm5xjiLkf0yI5qYt+XnxtfF26F0C95CO2CFVYUxn3wWUtcdla1WYj7nZj39k7CfpbwNMoQ4kg== 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 Mon 24-06-24 17:58:55, Roman Gushchin wrote: > Rename exported function related to the softlimit reclaim > to have memcg1_ prefix. > > Signed-off-by: Roman Gushchin Acked-by: Michal Hocko > --- > include/linux/memcontrol.h | 12 ++++++------ > mm/memcontrol-v1.c | 6 +++--- > mm/memcontrol-v1.h | 4 ++-- > mm/memcontrol.c | 4 ++-- > mm/vmscan.c | 10 +++++----- > 5 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 7403dd5926eb..83c8327455d8 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1121,9 +1121,9 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, > > void split_page_memcg(struct page *head, int old_order, int new_order); > > -unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, > - gfp_t gfp_mask, > - unsigned long *total_scanned); > +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > + gfp_t gfp_mask, > + unsigned long *total_scanned); > > #else /* CONFIG_MEMCG */ > > @@ -1572,9 +1572,9 @@ static inline void split_page_memcg(struct page *head, int old_order, int new_or > } > > static inline > -unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, > - gfp_t gfp_mask, > - unsigned long *total_scanned) > +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > + gfp_t gfp_mask, > + unsigned long *total_scanned) > { > return 0; > } > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index 2ccb8406fa84..68e2f1a718d3 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -100,7 +100,7 @@ static unsigned long soft_limit_excess(struct mem_cgroup *memcg) > return excess; > } > > -void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) > +void memcg1_update_tree(struct mem_cgroup *memcg, int nid) > { > unsigned long excess; > struct mem_cgroup_per_node *mz; > @@ -143,7 +143,7 @@ void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) > } > } > > -void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg) > +void memcg1_remove_from_trees(struct mem_cgroup *memcg) > { > struct mem_cgroup_tree_per_node *mctz; > struct mem_cgroup_per_node *mz; > @@ -243,7 +243,7 @@ static int mem_cgroup_soft_reclaim(struct mem_cgroup *root_memcg, > return total; > } > > -unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, > +unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order, > gfp_t gfp_mask, > unsigned long *total_scanned) > { > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 4da6fa561c6d..e37bc7e8d955 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -3,8 +3,8 @@ > #ifndef __MM_MEMCONTROL_V1_H > #define __MM_MEMCONTROL_V1_H > > -void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid); > -void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg); > +void memcg1_update_tree(struct mem_cgroup *memcg, int nid); > +void memcg1_remove_from_trees(struct mem_cgroup *memcg); > > static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) > { > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 003e944f34ea..3479e1af12d5 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1012,7 +1012,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, int nid) > MEM_CGROUP_TARGET_SOFTLIMIT); > mem_cgroup_threshold(memcg); > if (unlikely(do_softlimit)) > - mem_cgroup_update_tree(memcg, nid); > + memcg1_update_tree(memcg, nid); > } > } > > @@ -5610,7 +5610,7 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) > > vmpressure_cleanup(&memcg->vmpressure); > cancel_work_sync(&memcg->high_work); > - mem_cgroup_remove_from_trees(memcg); > + memcg1_remove_from_trees(memcg); > free_shrinker_info(memcg); > mem_cgroup_free(memcg); > } > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 900bad16e506..3d4c681c6d40 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -6186,9 +6186,9 @@ static void shrink_zones(struct zonelist *zonelist, struct scan_control *sc) > * and balancing, not for a memcg's limit. > */ > nr_soft_scanned = 0; > - nr_soft_reclaimed = mem_cgroup_soft_limit_reclaim(zone->zone_pgdat, > - sc->order, sc->gfp_mask, > - &nr_soft_scanned); > + nr_soft_reclaimed = memcg1_soft_limit_reclaim(zone->zone_pgdat, > + sc->order, sc->gfp_mask, > + &nr_soft_scanned); > sc->nr_reclaimed += nr_soft_reclaimed; > sc->nr_scanned += nr_soft_scanned; > /* need some check for avoid more shrink_zone() */ > @@ -6952,8 +6952,8 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) > /* Call soft limit reclaim before calling shrink_node. */ > sc.nr_scanned = 0; > nr_soft_scanned = 0; > - nr_soft_reclaimed = mem_cgroup_soft_limit_reclaim(pgdat, sc.order, > - sc.gfp_mask, &nr_soft_scanned); > + nr_soft_reclaimed = memcg1_soft_limit_reclaim(pgdat, sc.order, > + sc.gfp_mask, &nr_soft_scanned); > sc.nr_reclaimed += nr_soft_reclaimed; > > /* > -- > 2.45.2 -- Michal Hocko SUSE Labs