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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 1A064C433E0 for ; Thu, 21 Jan 2021 17:22:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 747B623A59 for ; Thu, 21 Jan 2021 17:22:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 747B623A59 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D49CB6B0008; Thu, 21 Jan 2021 12:22:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CCCC06B000D; Thu, 21 Jan 2021 12:22:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B56696B0007; Thu, 21 Jan 2021 12:22:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0132.hostedemail.com [216.40.44.132]) by kanga.kvack.org (Postfix) with ESMTP id 95CA56B0007 for ; Thu, 21 Jan 2021 12:22:07 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3F9D9364C for ; Thu, 21 Jan 2021 17:22:07 +0000 (UTC) X-FDA: 77730450294.17.spoon04_490bf2027564 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id E1C04180D0186 for ; Thu, 21 Jan 2021 17:22:06 +0000 (UTC) X-HE-Tag: spoon04_490bf2027564 X-Filterd-Recvd-Size: 5670 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Thu, 21 Jan 2021 17:22:06 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 054CCAAAE; Thu, 21 Jan 2021 17:22:05 +0000 (UTC) From: Vlastimil Babka To: vbabka@suse.cz Cc: akpm@linux-foundation.org, bigeasy@linutronix.de, cl@linux.com, guro@fb.com, hannes@cmpxchg.org, iamjoonsoo.kim@lge.com, jannh@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhocko@kernel.org, minchan@kernel.org, penberg@kernel.org, rientjes@google.com, shakeelb@google.com, surenb@google.com, tglx@linutronix.de Subject: [RFC 1/2] mm, vmscan: add priority field to struct shrink_control Date: Thu, 21 Jan 2021 18:21:53 +0100 Message-Id: <20210121172154.27580-1-vbabka@suse.cz> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: 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: Slab reclaim works with reclaim priority, which influences how much to re= claim, but is not directly passed to individual shrinkers. The next patch introd= uces a slab shrinker that uses the priority, so add it to shrink_control and initialize appropriately. We can then also remove the parameter from shrink_slab() and trace_mm_shrink_slab_start(). Signed-off-by: Vlastimil Babka --- include/linux/shrinker.h | 3 +++ include/trace/events/vmscan.h | 8 +++----- mm/vmscan.c | 14 ++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 0f80123650e2..1066f052be4f 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -29,6 +29,9 @@ struct shrink_control { */ unsigned long nr_scanned; =20 + /* current reclaim priority */ + int priority; + /* current memcg being shrunk (for memcg aware shrinkers) */ struct mem_cgroup *memcg; }; diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.= h index 2070df64958e..d42e480977c6 100644 --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -185,11 +185,9 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, = mm_vmscan_memcg_softlimit_re TRACE_EVENT(mm_shrink_slab_start, TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long cache_items, - unsigned long long delta, unsigned long total_scan, - int priority), + unsigned long long delta, unsigned long total_scan), =20 - TP_ARGS(shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, - priority), + TP_ARGS(shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan), =20 TP_STRUCT__entry( __field(struct shrinker *, shr) @@ -212,7 +210,7 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->cache_items =3D cache_items; __entry->delta =3D delta; __entry->total_scan =3D total_scan; - __entry->priority =3D priority; + __entry->priority =3D sc->priority; ), =20 TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache ite= ms %ld delta %lld total_scan %ld priority %d", diff --git a/mm/vmscan.c b/mm/vmscan.c index 469016222cdb..bc5157625cec 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -410,7 +410,7 @@ EXPORT_SYMBOL(unregister_shrinker); #define SHRINK_BATCH 128 =20 static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, - struct shrinker *shrinker, int priority) + struct shrinker *shrinker) { unsigned long freed =3D 0; unsigned long long delta; @@ -439,7 +439,7 @@ static unsigned long do_shrink_slab(struct shrink_con= trol *shrinkctl, =20 total_scan =3D nr; if (shrinker->seeks) { - delta =3D freeable >> priority; + delta =3D freeable >> shrinkctl->priority; delta *=3D 4; do_div(delta, shrinker->seeks); } else { @@ -484,7 +484,7 @@ static unsigned long do_shrink_slab(struct shrink_con= trol *shrinkctl, total_scan =3D freeable * 2; =20 trace_mm_shrink_slab_start(shrinker, shrinkctl, nr, - freeable, delta, total_scan, priority); + freeable, delta, total_scan); =20 /* * Normally, we should not scan less than batch_size objects in one @@ -562,6 +562,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask= , int nid, struct shrink_control sc =3D { .gfp_mask =3D gfp_mask, .nid =3D nid, + .priority =3D priority, .memcg =3D memcg, }; struct shrinker *shrinker; @@ -578,7 +579,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask= , int nid, !(shrinker->flags & SHRINKER_NONSLAB)) continue; =20 - ret =3D do_shrink_slab(&sc, shrinker, priority); + ret =3D do_shrink_slab(&sc, shrinker); if (ret =3D=3D SHRINK_EMPTY) { clear_bit(i, map->map); /* @@ -597,7 +598,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask= , int nid, * set_bit() do_shrink_slab() */ smp_mb__after_atomic(); - ret =3D do_shrink_slab(&sc, shrinker, priority); + ret =3D do_shrink_slab(&sc, shrinker); if (ret =3D=3D SHRINK_EMPTY) ret =3D 0; else @@ -666,10 +667,11 @@ static unsigned long shrink_slab(gfp_t gfp_mask, in= t nid, struct shrink_control sc =3D { .gfp_mask =3D gfp_mask, .nid =3D nid, + .priority =3D priority, .memcg =3D memcg, }; =20 - ret =3D do_shrink_slab(&sc, shrinker, priority); + ret =3D do_shrink_slab(&sc, shrinker); if (ret =3D=3D SHRINK_EMPTY) ret =3D 0; freed +=3D ret; --=20 2.30.0