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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E13ACA9EB7 for ; Wed, 23 Oct 2019 14:22:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E7E6C2070B for ; Wed, 23 Oct 2019 14:22:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7E6C2070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 94E906B0007; Wed, 23 Oct 2019 10:22:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FE646B000A; Wed, 23 Oct 2019 10:22:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83AB66B000C; Wed, 23 Oct 2019 10:22:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0128.hostedemail.com [216.40.44.128]) by kanga.kvack.org (Postfix) with ESMTP id 5E6D36B0007 for ; Wed, 23 Oct 2019 10:22:02 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 0B9E18249980 for ; Wed, 23 Oct 2019 14:22:02 +0000 (UTC) X-FDA: 76075263684.04.rod29_4bdd134adfb03 X-HE-Tag: rod29_4bdd134adfb03 X-Filterd-Recvd-Size: 4803 Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Wed, 23 Oct 2019 14:22:01 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DC62FAFE1; Wed, 23 Oct 2019 14:21:59 +0000 (UTC) Date: Wed, 23 Oct 2019 16:21:58 +0200 From: Michal Hocko To: Johannes Weiner Cc: Andrew Morton , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: Re: [PATCH 6/8] mm: vmscan: turn shrink_node_memcg() into shrink_lruvec() Message-ID: <20191023142158.GG17610@dhcp22.suse.cz> References: <20191022144803.302233-1-hannes@cmpxchg.org> <20191022144803.302233-7-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191022144803.302233-7-hannes@cmpxchg.org> User-Agent: Mutt/1.10.1 (2018-07-13) 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: On Tue 22-10-19 10:48:01, Johannes Weiner wrote: > A lruvec holds LRU pages owned by a certain NUMA node and cgroup. > Instead of awkwardly passing around a combination of a pgdat and a > memcg pointer, pass down the lruvec as soon as we can look it up. > > Nested callers that need to access node or cgroup properties can look > them them up if necessary, but there are only a few cases. > > Signed-off-by: Johannes Weiner Acked-by: Michal Hocko > --- > mm/vmscan.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 235d1fc72311..db073b40c432 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -2280,9 +2280,10 @@ enum scan_balance { > * nr[0] = anon inactive pages to scan; nr[1] = anon active pages to scan > * nr[2] = file inactive pages to scan; nr[3] = file active pages to scan > */ > -static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg, > - struct scan_control *sc, unsigned long *nr) > +static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, > + unsigned long *nr) > { > + struct mem_cgroup *memcg = lruvec_memcg(lruvec); > int swappiness = mem_cgroup_swappiness(memcg); > struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; > u64 fraction[2]; > @@ -2530,13 +2531,8 @@ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg, > } > } > > -/* > - * This is a basic per-node page freer. Used by both kswapd and direct reclaim. > - */ > -static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memcg, > - struct scan_control *sc) > +static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) > { > - struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); > unsigned long nr[NR_LRU_LISTS]; > unsigned long targets[NR_LRU_LISTS]; > unsigned long nr_to_scan; > @@ -2546,7 +2542,7 @@ static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memc > struct blk_plug plug; > bool scan_adjusted; > > - get_scan_count(lruvec, memcg, sc, nr); > + get_scan_count(lruvec, sc, nr); > > /* Record the original scan target for proportional adjustments later */ > memcpy(targets, nr, sizeof(nr)); > @@ -2741,6 +2737,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) > > memcg = mem_cgroup_iter(root, NULL, NULL); > do { > + struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); > unsigned long reclaimed; > unsigned long scanned; > > @@ -2777,7 +2774,8 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) > > reclaimed = sc->nr_reclaimed; > scanned = sc->nr_scanned; > - shrink_node_memcg(pgdat, memcg, sc); > + > + shrink_lruvec(lruvec, sc); > > shrink_slab(sc->gfp_mask, pgdat->node_id, memcg, > sc->priority); > @@ -3281,6 +3279,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, > pg_data_t *pgdat, > unsigned long *nr_scanned) > { > + struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); > struct scan_control sc = { > .nr_to_reclaim = SWAP_CLUSTER_MAX, > .target_mem_cgroup = memcg, > @@ -3307,7 +3306,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, > * will pick up pages from other mem cgroup's as well. We hack > * the priority and make it zero. > */ > - shrink_node_memcg(pgdat, memcg, &sc); > + shrink_lruvec(lruvec, &sc); > > trace_mm_vmscan_memcg_softlimit_reclaim_end( > cgroup_ino(memcg->css.cgroup), > -- > 2.23.0 -- Michal Hocko SUSE Labs