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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 7BD82CA9EB9 for ; Tue, 22 Oct 2019 14:48:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 27024218AE for ; Tue, 22 Oct 2019 14:48:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="q12d0v3z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27024218AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9CA396B0010; Tue, 22 Oct 2019 10:48:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 92C636B0266; Tue, 22 Oct 2019 10:48:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 77D0C6B0269; Tue, 22 Oct 2019 10:48:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id 58C736B0010 for ; Tue, 22 Oct 2019 10:48:26 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 02D46181AEF3F for ; Tue, 22 Oct 2019 14:48:26 +0000 (UTC) X-FDA: 76071701412.22.seat06_66a60311afb3e X-HE-Tag: seat06_66a60311afb3e X-Filterd-Recvd-Size: 10739 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Tue, 22 Oct 2019 14:48:25 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id t20so27130462qtr.10 for ; Tue, 22 Oct 2019 07:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y/S9YM5L03E9mp2moYFg2d0XgAPZjVTeoGAh0CaM0+A=; b=q12d0v3zXOV5WGnLHVwyjLzM9fmUPfDWDCKmbLLTwIQBZHcDFlV7gImPBZowyjR6Zx lB6pxnBBIOuyk2Pb2qr6t83Dh0tW0naxXd067CoC7FHaw1+uxUCAU4AxdOtf50nyMsT6 aGzqFmoduz+Tvgjc10N4tOY53iU8IMjQ3m7U7otj/BRSD/OLtkOJAKzYDRFDMY/mH4oH DliRKULyu7UQq4GUMbNRxXw25RE60ZuZ+AnCRTeuHicS5Cv+lGttW7ixocRtQTlaQr+C U4md7L2wE6RKhOlePlEk2fREDYcZecEhb91bIKtFpvSiGWhN+VPltnwNhZU0ey4/Q+n0 Ukng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y/S9YM5L03E9mp2moYFg2d0XgAPZjVTeoGAh0CaM0+A=; b=DWDp4vQiNbqlSayex/IY8tpcpuuaIkkL6mFpL1aTKF+d3pxMXY3FERmBjTGKm2ueqK rks5OBwib5Ef7qsImDXDJiJw8awX3bmGqM6boCvPb+2olEIfu80XjzdRngEaSp2qKC+C zBVqEJptksjhhMvPsYzUuVwHOEBCfxSp/Tl24VYssm1qj9nHXk1QppgKjeT+CDHQ3JG7 IXVpKX0ogk+J/TMk+009ZulMjJ/ujirNlU+etdDbBW7JnnW84Lnv9RgQltnJlAnShZsW oZGvnADuzQVt+QzdDneWmIbGRhEBDMvADteA1dAggBpcrnuqNgLTQ21pdgUoJDSQOgIY 26Xg== X-Gm-Message-State: APjAAAVMv869tbWfA2Oc0yVdkHIiW0BVhz852o0L+HOLivv4+0zX2GOr hBE4xZDf/BTnW+xXxmISDHaxZA== X-Google-Smtp-Source: APXvYqzFOGhpHSTiy9Bfr0pdbWvQdXv5B+K83ETYEPzgzz0WiqOM/UNmdII5ZyFVY3U3lJARYdnb/Q== X-Received: by 2002:ac8:2fd9:: with SMTP id m25mr3544986qta.177.1571755704659; Tue, 22 Oct 2019 07:48:24 -0700 (PDT) Received: from localhost ([2620:10d:c091:500::3:10ad]) by smtp.gmail.com with ESMTPSA id w6sm9134982qkj.136.2019.10.22.07.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 07:48:24 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: Michal Hocko , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 8/8] mm: vmscan: harmonize writeback congestion tracking for nodes & memcgs Date: Tue, 22 Oct 2019 10:48:03 -0400 Message-Id: <20191022144803.302233-9-hannes@cmpxchg.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191022144803.302233-1-hannes@cmpxchg.org> References: <20191022144803.302233-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: The current writeback congestion tracking has separate flags for kswapd reclaim (node level) and cgroup limit reclaim (memcg-node level). This is unnecessarily complicated: the lruvec is an existing abstraction layer for that node-memcg intersection. Introduce lruvec->flags and LRUVEC_CONGESTED. Then track that at the reclaim root level, which is either the NUMA node for global reclaim, or the cgroup-node intersection for cgroup reclaim. Signed-off-by: Johannes Weiner --- include/linux/memcontrol.h | 6 +-- include/linux/mmzone.h | 11 ++++-- mm/vmscan.c | 80 ++++++++++++-------------------------- 3 files changed, 36 insertions(+), 61 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 498cea07cbb1..d8ffcf60440c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -133,9 +133,6 @@ struct mem_cgroup_per_node { unsigned long usage_in_excess;/* Set to the value by which */ /* the soft limit is exceeded*/ bool on_tree; - bool congested; /* memcg has many dirty pages */ - /* backed by a congested BDI */ - struct mem_cgroup *memcg; /* Back pointer, we cannot */ /* use container_of */ }; @@ -412,6 +409,9 @@ static inline struct lruvec *mem_cgroup_lruvec(struct= mem_cgroup *memcg, goto out; } =20 + if (!memcg) + memcg =3D root_mem_cgroup; + mz =3D mem_cgroup_nodeinfo(memcg, pgdat->node_id); lruvec =3D &mz->lruvec; out: diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 449a44171026..c04b4c1f01fa 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -296,6 +296,12 @@ struct zone_reclaim_stat { unsigned long recent_scanned[2]; }; =20 +enum lruvec_flags { + LRUVEC_CONGESTED, /* lruvec has many dirty pages + * backed by a congested BDI + */ +}; + struct lruvec { struct list_head lists[NR_LRU_LISTS]; struct zone_reclaim_stat reclaim_stat; @@ -303,6 +309,8 @@ struct lruvec { atomic_long_t inactive_age; /* Refaults at the time of last reclaim cycle */ unsigned long refaults; + /* Various lruvec state flags (enum lruvec_flags) */ + unsigned long flags; #ifdef CONFIG_MEMCG struct pglist_data *pgdat; #endif @@ -572,9 +580,6 @@ struct zone { } ____cacheline_internodealigned_in_smp; =20 enum pgdat_flags { - PGDAT_CONGESTED, /* pgdat has many dirty pages backed by - * a congested BDI - */ PGDAT_DIRTY, /* reclaim scanning has recently found * many dirty file pages at the tail * of the LRU. diff --git a/mm/vmscan.c b/mm/vmscan.c index 65baa89740dd..3e21166d5198 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -267,29 +267,6 @@ static bool writeback_throttling_sane(struct scan_co= ntrol *sc) #endif return false; } - -static void set_memcg_congestion(pg_data_t *pgdat, - struct mem_cgroup *memcg, - bool congested) -{ - struct mem_cgroup_per_node *mn; - - if (!memcg) - return; - - mn =3D mem_cgroup_nodeinfo(memcg, pgdat->node_id); - WRITE_ONCE(mn->congested, congested); -} - -static bool memcg_congested(pg_data_t *pgdat, - struct mem_cgroup *memcg) -{ - struct mem_cgroup_per_node *mn; - - mn =3D mem_cgroup_nodeinfo(memcg, pgdat->node_id); - return READ_ONCE(mn->congested); - -} #else static int prealloc_memcg_shrinker(struct shrinker *shrinker) { @@ -309,18 +286,6 @@ static bool writeback_throttling_sane(struct scan_co= ntrol *sc) { return true; } - -static inline void set_memcg_congestion(struct pglist_data *pgdat, - struct mem_cgroup *memcg, bool congested) -{ -} - -static inline bool memcg_congested(struct pglist_data *pgdat, - struct mem_cgroup *memcg) -{ - return false; - -} #endif =20 /* @@ -2716,12 +2681,6 @@ static inline bool should_continue_reclaim(struct = pglist_data *pgdat, return inactive_lru_pages > pages_for_compaction; } =20 -static bool pgdat_memcg_congested(pg_data_t *pgdat, struct mem_cgroup *m= emcg) -{ - return test_bit(PGDAT_CONGESTED, &pgdat->flags) || - (memcg && memcg_congested(pgdat, memcg)); -} - static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc= ) { struct mem_cgroup *root =3D sc->target_mem_cgroup; @@ -2785,8 +2744,11 @@ static bool shrink_node(pg_data_t *pgdat, struct s= can_control *sc) struct reclaim_state *reclaim_state =3D current->reclaim_state; struct mem_cgroup *root =3D sc->target_mem_cgroup; unsigned long nr_reclaimed, nr_scanned; + struct lruvec *target_lruvec; bool reclaimable =3D false; =20 + target_lruvec =3D mem_cgroup_lruvec(sc->target_mem_cgroup, pgdat); + again: memset(&sc->nr, 0, sizeof(sc->nr)); =20 @@ -2829,14 +2791,6 @@ static bool shrink_node(pg_data_t *pgdat, struct s= can_control *sc) if (sc->nr.writeback && sc->nr.writeback =3D=3D sc->nr.taken) set_bit(PGDAT_WRITEBACK, &pgdat->flags); =20 - /* - * Tag a node as congested if all the dirty pages - * scanned were backed by a congested BDI and - * wait_iff_congested will stall. - */ - if (sc->nr.dirty && sc->nr.dirty =3D=3D sc->nr.congested) - set_bit(PGDAT_CONGESTED, &pgdat->flags); - /* Allow kswapd to start writing pages during reclaim.*/ if (sc->nr.unqueued_dirty =3D=3D sc->nr.file_taken) set_bit(PGDAT_DIRTY, &pgdat->flags); @@ -2852,12 +2806,17 @@ static bool shrink_node(pg_data_t *pgdat, struct = scan_control *sc) } =20 /* + * Tag a node/memcg as congested if all the dirty pages + * scanned were backed by a congested BDI and + * wait_iff_congested will stall. + * * Legacy memcg will stall in page writeback so avoid forcibly * stalling in wait_iff_congested(). */ - if (cgroup_reclaim(sc) && writeback_throttling_sane(sc) && + if ((current_is_kswapd() || + (cgroup_reclaim(sc) && writeback_throttling_sane(sc))) && sc->nr.dirty && sc->nr.dirty =3D=3D sc->nr.congested) - set_memcg_congestion(pgdat, root, true); + set_bit(LRUVEC_CONGESTED, &target_lruvec->flags); =20 /* * Stall direct reclaim for IO completions if underlying BDIs @@ -2865,8 +2824,9 @@ static bool shrink_node(pg_data_t *pgdat, struct sc= an_control *sc) * starts encountering unqueued dirty pages or cycling through * the LRU too quickly. */ - if (!sc->hibernation_mode && !current_is_kswapd() && - current_may_throttle() && pgdat_memcg_congested(pgdat, root)) + if (!current_is_kswapd() && current_may_throttle() && + !sc->hibernation_mode && + test_bit(LRUVEC_CONGESTED, &target_lruvec->flags)) wait_iff_congested(BLK_RW_ASYNC, HZ/10); =20 if (should_continue_reclaim(pgdat, sc->nr_reclaimed - nr_reclaimed, @@ -3080,8 +3040,16 @@ static unsigned long do_try_to_free_pages(struct z= onelist *zonelist, if (zone->zone_pgdat =3D=3D last_pgdat) continue; last_pgdat =3D zone->zone_pgdat; + snapshot_refaults(sc->target_mem_cgroup, zone->zone_pgdat); - set_memcg_congestion(last_pgdat, sc->target_mem_cgroup, false); + + if (cgroup_reclaim(sc)) { + struct lruvec *lruvec; + + lruvec =3D mem_cgroup_lruvec(sc->target_mem_cgroup, + zone->zone_pgdat); + clear_bit(LRUVEC_CONGESTED, &lruvec->flags); + } } =20 delayacct_freepages_end(); @@ -3461,7 +3429,9 @@ static bool pgdat_balanced(pg_data_t *pgdat, int or= der, int classzone_idx) /* Clear pgdat state for congested, dirty or under writeback. */ static void clear_pgdat_congested(pg_data_t *pgdat) { - clear_bit(PGDAT_CONGESTED, &pgdat->flags); + struct lruvec *lruvec =3D mem_cgroup_lruvec(NULL, pgdat); + + clear_bit(LRUVEC_CONGESTED, &lruvec->flags); clear_bit(PGDAT_DIRTY, &pgdat->flags); clear_bit(PGDAT_WRITEBACK, &pgdat->flags); } --=20 2.23.0