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,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 DC7BAC433E6 for ; Tue, 9 Feb 2021 17:47:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6CCA364EB6 for ; Tue, 9 Feb 2021 17:47:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CCA364EB6 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 EEAE36B0071; Tue, 9 Feb 2021 12:47:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E766F6B0072; Tue, 9 Feb 2021 12:47:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE2326B0073; Tue, 9 Feb 2021 12:47:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7D8F36B0071 for ; Tue, 9 Feb 2021 12:47:27 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3645D10F1A for ; Tue, 9 Feb 2021 17:47:21 +0000 (UTC) X-FDA: 77799461082.25.spoon02_5102b3627609 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id D476A1802E8AD for ; Tue, 9 Feb 2021 17:47:20 +0000 (UTC) X-HE-Tag: spoon02_5102b3627609 X-Filterd-Recvd-Size: 7304 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 17:47:20 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id k22so5782055pll.6 for ; Tue, 09 Feb 2021 09:47:20 -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=NF6HThwQUpqhcxPrBlYzwJ+cqS/FPyEXXyhktWrJklc=; b=T25wb3ff0wno0w5hs/bushE7ZWa46bofCJTkQrTEctOaXfljMeIg4rk08r/Gf82LnK Oq6pBXT1NBenLp59ywUUlnHMQeD8wEnqUPeIsS2fD4ukwJpUFO+YFjlHQrsP+l8eNHE1 tjq5FS0ZAGfDK3mAgLsgUdrq/pcJMicB716nhoXTMufgMop3hVZis+ASnY93sI6qTdcr cSG7qRwkYmDGSf/fSWTmXXEB7i5FtYxSR+Qku19/pMaT8nS5HQs9KNkVWcuQE0MR210O iYwXE7yKlYIumUI0NpL/Z0k5wtdO89W0//D6EQcOBbmjnMMsgqnuhVKImYrIdC9DMFex +oQw== 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=NF6HThwQUpqhcxPrBlYzwJ+cqS/FPyEXXyhktWrJklc=; b=qtflz9hErokcimawPVqUutrs2NO/+Y0PLtL7nEU1LyHirnvA7HvnnAqxKVFISUh8fj ZpPhUchBkMY6HtmcbWHJNv8XFROEuxDpcKl9e7sSIENlj7iFsGnRupwtP52+FxUFSrQC ksMolc5rBC+nsPZdNys2XO6QNrLeCDIOU8ejd6IyBrDafH7MsC1skN6jS1C3TSXGi3Pa mJ79EY+S/o7JbxuuBYf75LkuOVi+Agqe3BfIKtVgfCACjuoFTUFeM+ECb38qRrqcFCr8 LOQ9TZ5zJTJlCoyCr6rT5LCEvfIq90dDN9LIoFesRXmpfLWyg3uhs6Xp4uuyzFTICg7j IEnA== X-Gm-Message-State: AOAM531FUX+78ao7mOh9nsrhSAdz2EVZhpK4yh1mGB3HGeBJ04LEzM9F YS7t8u17mqNt1klIND7xrog= X-Google-Smtp-Source: ABdhPJye6RRH94+CGlvBo7IaC/UfHgjz9ba5WHxA0haMxMB24SUnJVINCvkrXRLTHgG+sGs23jEyVw== X-Received: by 2002:a17:902:ee44:b029:e2:bb4a:9ffb with SMTP id 4-20020a170902ee44b02900e2bb4a9ffbmr18582560plo.39.1612892839666; Tue, 09 Feb 2021 09:47:19 -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 j1sm22260929pfr.78.2021.02.09.09.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 09:47:18 -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: [v7 PATCH 07/12] mm: vmscan: use a new flag to indicate shrinker is registered Date: Tue, 9 Feb 2021 09:46:41 -0800 Message-Id: <20210209174646.1310591-8-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210209174646.1310591-1-shy828301@gmail.com> References: <20210209174646.1310591-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. Acked-by: Kirill Tkhai 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 273efbf4d53c..a047980536cf 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -315,19 +315,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) @@ -336,7 +323,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 @@ -499,10 +486,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 @@ -522,13 +506,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; } @@ -693,7 +680,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