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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 6D447C433DB for ; Wed, 3 Feb 2021 17:21:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E1A4764DA5 for ; Wed, 3 Feb 2021 17:21:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1A4764DA5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 699AF6B0073; Wed, 3 Feb 2021 12:21:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F6A76B0074; Wed, 3 Feb 2021 12:21:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E81B6B0075; Wed, 3 Feb 2021 12:21:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0178.hostedemail.com [216.40.44.178]) by kanga.kvack.org (Postfix) with ESMTP id 38B046B0073 for ; Wed, 3 Feb 2021 12:21:19 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id EDEA0824999B for ; Wed, 3 Feb 2021 17:21:18 +0000 (UTC) X-FDA: 77777622636.25.pest66_4f0082d275d5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id C73671804E3A0 for ; Wed, 3 Feb 2021 17:21:18 +0000 (UTC) X-HE-Tag: pest66_4f0082d275d5 X-Filterd-Recvd-Size: 7255 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Wed, 3 Feb 2021 17:21:18 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id c132so194370pga.3 for ; Wed, 03 Feb 2021 09:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b8SjHseMw8krLA2MpYALwqlIDq/DWMFppkEMGt0xsr4=; b=QbZ8PU4NP3odPP1vupCLfUgpwl39qIZ5AuroWXUrRE8osaEdLyjG387k3x3rH+DbXP GTP0LI1osaMkATRAERt9MA6c4VdbwWUOI6E+AGksuil72cgzsrhw7fUGFaLsOhMgVHYQ 8iz0EJ/UMaFHhLepa6PF9wlVSfwscIxMUZOBoEkinY+di8/EvzfwKmdMx4amjEP9gaRt IRTuWCW4NbYgt9JsF/Ffxt8iCKnIIC7jwEVE1zjRvn7kAl0X5NSTbW29KNI6Lkpw7f+D k1KgVrcIsIdJfmRxb7Sdyg5zQRGryI6Sb9QRmOHzo7SvpKNXwW0ujbQav9RmpGxsrogb DcgQ== 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=b8SjHseMw8krLA2MpYALwqlIDq/DWMFppkEMGt0xsr4=; b=Fp+WiD76MvIQiMan+6lqOPxI7MHaHp8mzseiDYGabBl4mSFlg2pHBHfRnCEUfTrkdF DjFnu2F5Nysy/lliCLDoIGTSvlOrzrqLXph7mrPoFpNeYOP86/y07WZhgtleh3hX9DN+ FRUoMvShNzsuOz4kpCeBFI74tQU9rD5qGDQNqDn3DgQapEJQOlOzlEnHljaSbK9zU3NT dBpSLLO9YJiFwAdg67F/o+kW7NKe/sodj7rSzsV8SdnyAIu8qUSRy9P9aUrT6cv7gbqM wh8feY/N5NaLGOSdFI/BWcXizVINmQbCA+I+jxJdaXAik8NMCAQCHBV0Y2tMVAJp3JkS eMhQ== X-Gm-Message-State: AOAM5314Sg4VqwnInh70knIselfMrULi3f3+MzLnssSNOs/6drfIlz5q lyhlOHEmjxMU4yd34/qqYlQ= X-Google-Smtp-Source: ABdhPJyn+hb44RpH/HX9dquVyuyoP5juqu0UjxrgA0FVOZZ1q8tQfy9vwahs/USZbbQTwfk32MxwnQ== X-Received: by 2002:aa7:8a99:0:b029:1a6:c8b8:1414 with SMTP id a25-20020aa78a990000b02901a6c8b81414mr3867071pfc.66.1612372877527; Wed, 03 Feb 2021 09:21:17 -0800 (PST) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id x21sm2368636pfn.100.2021.02.03.09.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 09:21:16 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, vbabka@suse.cz, shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v6 PATCH 06/11] mm: vmscan: use a new flag to indicate shrinker is registered Date: Wed, 3 Feb 2021 09:20:37 -0800 Message-Id: <20210203172042.800474-7-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210203172042.800474-1-shy828301@gmail.com> References: <20210203172042.800474-1-shy828301@gmail.com> 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: Currently registered shrinker is indicated by non-NULL shrinker->nr_defer= red. This approach is fine with nr_deferred at the shrinker level, but the fol= lowing patches will move MEMCG_AWARE shrinkers' nr_deferred to memcg level, so t= heir shrinker->nr_deferred would always be NULL. This would prevent the shrin= kers from unregistering correctly. Remove SHRINKER_REGISTERING since we could check if shrinker is registere= d successfully by the new flag. Signed-off-by: Yang Shi --- include/linux/shrinker.h | 7 ++++--- mm/vmscan.c | 31 +++++++++---------------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 0f80123650e2..1eac79ce57d4 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -79,13 +79,14 @@ struct shrinker { #define DEFAULT_SEEKS 2 /* A good number if you don't know better. */ =20 /* Flags */ -#define SHRINKER_NUMA_AWARE (1 << 0) -#define SHRINKER_MEMCG_AWARE (1 << 1) +#define SHRINKER_REGISTERED (1 << 0) +#define SHRINKER_NUMA_AWARE (1 << 1) +#define SHRINKER_MEMCG_AWARE (1 << 2) /* * It just makes sense when the shrinker is also MEMCG_AWARE for now, * non-MEMCG_AWARE shrinker should not have this flag set. */ -#define SHRINKER_NONSLAB (1 << 2) +#define SHRINKER_NONSLAB (1 << 3) =20 extern int prealloc_shrinker(struct shrinker *shrinker); extern void register_shrinker_prepared(struct shrinker *shrinker); diff --git a/mm/vmscan.c b/mm/vmscan.c index 9436f9246d32..dc0d69e081b0 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -309,19 +309,6 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int = nid, int shrinker_id) } } =20 -/* - * We allow subsystems to populate their shrinker-related - * LRU lists before register_shrinker_prepared() is called - * for the shrinker, since we don't want to impose - * restrictions on their internal registration order. - * In this case shrink_slab_memcg() may find corresponding - * bit is set in the shrinkers map. - * - * This value is used by the function to detect registering - * shrinkers and to skip do_shrink_slab() calls for them. - */ -#define SHRINKER_REGISTERING ((struct shrinker *)~0UL) - static DEFINE_IDR(shrinker_idr); =20 static int prealloc_memcg_shrinker(struct shrinker *shrinker) @@ -330,7 +317,7 @@ static int prealloc_memcg_shrinker(struct shrinker *s= hrinker) =20 down_write(&shrinker_rwsem); /* This may call shrinker, so it must use down_read_trylock() */ - id =3D idr_alloc(&shrinker_idr, SHRINKER_REGISTERING, 0, 0, GFP_KERNEL)= ; + id =3D idr_alloc(&shrinker_idr, shrinker, 0, 0, GFP_KERNEL); if (id < 0) goto unlock; =20 @@ -493,10 +480,7 @@ void register_shrinker_prepared(struct shrinker *shr= inker) { down_write(&shrinker_rwsem); list_add_tail(&shrinker->list, &shrinker_list); -#ifdef CONFIG_MEMCG - if (shrinker->flags & SHRINKER_MEMCG_AWARE) - idr_replace(&shrinker_idr, shrinker, shrinker->id); -#endif + shrinker->flags |=3D SHRINKER_REGISTERED; up_write(&shrinker_rwsem); } =20 @@ -516,13 +500,16 @@ EXPORT_SYMBOL(register_shrinker); */ void unregister_shrinker(struct shrinker *shrinker) { - if (!shrinker->nr_deferred) + if (!(shrinker->flags & SHRINKER_REGISTERED)) return; - if (shrinker->flags & SHRINKER_MEMCG_AWARE) - unregister_memcg_shrinker(shrinker); + down_write(&shrinker_rwsem); list_del(&shrinker->list); + shrinker->flags &=3D ~SHRINKER_REGISTERED; up_write(&shrinker_rwsem); + + if (shrinker->flags & SHRINKER_MEMCG_AWARE) + unregister_memcg_shrinker(shrinker); kfree(shrinker->nr_deferred); shrinker->nr_deferred =3D NULL; } @@ -688,7 +675,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask= , int nid, struct shrinker *shrinker; =20 shrinker =3D idr_find(&shrinker_idr, i); - if (unlikely(!shrinker || shrinker =3D=3D SHRINKER_REGISTERING)) { + if (unlikely(!shrinker || !(shrinker->flags & SHRINKER_REGISTERED))) { if (!shrinker) clear_bit(i, info->map); continue; --=20 2.26.2