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=-14.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL autolearn=ham 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 9BA7CFC6194 for ; Thu, 7 Nov 2019 02:52:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 50387217F5 for ; Thu, 7 Nov 2019 02:52:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YWUaaCR1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50387217F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 062006B0006; Wed, 6 Nov 2019 21:52:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F2D6B6B0007; Wed, 6 Nov 2019 21:52:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1D026B000D; Wed, 6 Nov 2019 21:52:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0148.hostedemail.com [216.40.44.148]) by kanga.kvack.org (Postfix) with ESMTP id CBAD66B0006 for ; Wed, 6 Nov 2019 21:52:11 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 878203A91 for ; Thu, 7 Nov 2019 02:52:11 +0000 (UTC) X-FDA: 76127957262.17.glove78_1316ef589854b X-HE-Tag: glove78_1316ef589854b X-Filterd-Recvd-Size: 6081 Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Thu, 7 Nov 2019 02:52:11 +0000 (UTC) Received: by mail-ot1-f66.google.com with SMTP id e17so712859otk.6 for ; Wed, 06 Nov 2019 18:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QrlsmiSp9MaTLUUYnVA3xTtIb+I1YUcCTslV0/OmSFI=; b=YWUaaCR128DURGqWr9aDknrAFS+YYlD99jyCFzrnkBJytTen48x97ZotJo5kZT3QYa ZjUE1oID3Dz3eEh0vpwgEwGeKs1IlCU141yRD3Ii3VpOrdmuUt1pXff6VBBrmPDXf5BR qXBM00zj3eBtlE8qYCpEysmNqZNhlKyUyCZKV/BxMWYzxoRprgj3lbp8NIAqz2rLFUpO z7KJKXpi8gtqrRNZgvaqQz1TR+YS3y5+HWIU9XjnZ22K3cvZzhrU+m8RD2I10tL57kPA EJd3iqWEZrVXgSl0eXR0vr+OCwqGyOaSN396/nYQDmw7ApNC7AemBk6nrILEpvaB45N8 B34w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QrlsmiSp9MaTLUUYnVA3xTtIb+I1YUcCTslV0/OmSFI=; b=coQ41YLfRq9TZ7fm61kdE54AnWzpeu7Ry2JGEDJA2HK/SQk/mByuastFILgCNDmJKQ X5lAv02kkSK8Ytl1WufKOt2Ehidu31LiUGEoqdX3mIbUUgROuk5Oc3jI3ZPjPBaj3ZMm 6gpl1LLVeal5kV7G7huPigr3BkJS4Kt5/oj2PeRIMUXBa7Tld4ch6dJSMScKeev+DvT+ zHZq3oA9MM9oJ9TBO+nCxYByQ5qpHp8EhcFteU6WtL0jkeWcXmEmMKW2GWnpzoxDWOUd FPsshjdDzKGj00ipHNW+xiuSGJLXNr7FIc22Ne3YRA3ZglzR0QWDFWvWSct/K/Z741G0 XDPA== X-Gm-Message-State: APjAAAU/VxUfuhCXVQABP/vlVoIO6YcPon7AsV6fKzon/j7C+toRm+2m 5PNOulkXyRiWZazSZGDBO78qdB4bxhRYdznABpfWJw== X-Google-Smtp-Source: APXvYqxOEA6/MtSOLc+2Sk75LPiZD356yYgPUUdsBFVv+mxA1p5VnjYskNRQd2hJyi8yasnt75D22lhdfdnhROetgTM= X-Received: by 2002:a9d:5e10:: with SMTP id d16mr886624oti.191.1573095130142; Wed, 06 Nov 2019 18:52:10 -0800 (PST) MIME-Version: 1.0 References: <20190603210746.15800-1-hannes@cmpxchg.org> <20190603210746.15800-8-hannes@cmpxchg.org> In-Reply-To: <20190603210746.15800-8-hannes@cmpxchg.org> From: Shakeel Butt Date: Wed, 6 Nov 2019 18:51:59 -0800 Message-ID: Subject: Re: [PATCH 07/11] mm: vmscan: split shrink_node() into node part and memcgs part To: Johannes Weiner Cc: Andrew Morton , Andrey Ryabinin , Suren Baghdasaryan , Michal Hocko , Linux MM , Cgroups , LKML , Kernel Team Content-Type: text/plain; charset="UTF-8" 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 Mon, Jun 3, 2019 at 3:00 PM Johannes Weiner wrote: > > This function is getting long and unwieldy. The new shrink_node() > handles the generic (node) reclaim aspects: > - global vmpressure notifications > - writeback and congestion throttling > - reclaim/compaction management > - kswapd giving up on unreclaimable nodes > > It then calls shrink_node_memcgs() which handles cgroup specifics: > - the cgroup tree traversal > - memory.low considerations > - per-cgroup slab shrinking callbacks > - per-cgroup vmpressure notifications > > Signed-off-by: Johannes Weiner Reviewed-by: Shakeel Butt > --- > mm/vmscan.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index b85111474ee2..ee79b39d0538 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -2665,24 +2665,15 @@ static bool pgdat_memcg_congested(pg_data_t *pgdat, struct mem_cgroup *memcg) > (memcg && memcg_congested(pgdat, memcg)); > } > > -static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) > +static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc) > { > - struct reclaim_state *reclaim_state = current->reclaim_state; > struct mem_cgroup *root = sc->target_mem_cgroup; > struct mem_cgroup_reclaim_cookie reclaim = { > .pgdat = pgdat, > .priority = sc->priority, > }; > - unsigned long nr_reclaimed, nr_scanned; > - bool reclaimable = false; > struct mem_cgroup *memcg; > > -again: > - memset(&sc->nr, 0, sizeof(sc->nr)); > - > - nr_reclaimed = sc->nr_reclaimed; > - nr_scanned = sc->nr_scanned; > - > memcg = mem_cgroup_iter(root, NULL, &reclaim); > do { > struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); > @@ -2750,6 +2741,22 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) > break; > } > } while ((memcg = mem_cgroup_iter(root, memcg, &reclaim))); > +} > + > +static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) > +{ > + struct reclaim_state *reclaim_state = current->reclaim_state; > + struct mem_cgroup *root = sc->target_mem_cgroup; > + unsigned long nr_reclaimed, nr_scanned; > + bool reclaimable = false; > + > +again: > + memset(&sc->nr, 0, sizeof(sc->nr)); > + > + nr_reclaimed = sc->nr_reclaimed; > + nr_scanned = sc->nr_scanned; > + > + shrink_node_memcgs(pgdat, sc); > > if (reclaim_state) { > sc->nr_reclaimed += reclaim_state->reclaimed_slab; > @@ -2757,7 +2764,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) > } > > /* Record the subtree's reclaim efficiency */ > - vmpressure(sc->gfp_mask, sc->target_mem_cgroup, true, > + vmpressure(sc->gfp_mask, root, true, > sc->nr_scanned - nr_scanned, > sc->nr_reclaimed - nr_reclaimed); > > -- > 2.21.0 >