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 599AAC433E6 for ; Tue, 5 Jan 2021 22:58:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E9D5122EBF for ; Tue, 5 Jan 2021 22:58:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9D5122EBF 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 7107A8D00BE; Tue, 5 Jan 2021 17:58:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 64A918D006E; Tue, 5 Jan 2021 17:58:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4EC488D00BE; Tue, 5 Jan 2021 17:58:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0175.hostedemail.com [216.40.44.175]) by kanga.kvack.org (Postfix) with ESMTP id 34B618D006E for ; Tue, 5 Jan 2021 17:58:57 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F2475181AC1E9 for ; Tue, 5 Jan 2021 22:58:56 +0000 (UTC) X-FDA: 77673238272.27.home67_0d1147c274dc Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id C172B3D663 for ; Tue, 5 Jan 2021 22:58:56 +0000 (UTC) X-HE-Tag: home67_0d1147c274dc X-Filterd-Recvd-Size: 5533 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 22:58:56 +0000 (UTC) Received: by mail-pf1-f175.google.com with SMTP id c79so613942pfc.2 for ; Tue, 05 Jan 2021 14:58:56 -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=qpu1i4q0ijAqTRSCt6SNBy+m3wFuqzhxFrW2P//1NQA=; b=DijFY48hNMYK6anOj/dwQEh7dVjSFg7bIP4tomaqjA34Hb3q9vOJToWJriIR4OFHEk KJh9f3fU4XWcl5TTFHyThszZVA2z/lpMuAksFrMV/e0+lna8pyXuBoe4xPy1Eunxo02D DUQP/yj8NBv8EPgJWPxEf1+wqePFZI9Q0Mmtbcg1Z4f1NvcIRsaQcWCsDvfmD7pmYq4A gKIxgHz2dCWhOgDoSFgmWiwDqpY/JcurWUQsmKlZesVYWNAL+orW8TTkBdzXKpMUslTR YHShCcxnLn3LA6s1Ob7bMD8RsLwn/5emyAlZPHE9455CHYQ+qDqCgICOdccEAPNZgTU0 Gsnw== 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=qpu1i4q0ijAqTRSCt6SNBy+m3wFuqzhxFrW2P//1NQA=; b=gvhxNCcIxCxtNhVNOGQNomC3WdK66tPjZvInl8kXsIFq3OnVrEYIn7VqMQK+EGGaor BD+Byzj8LxM5TZyTMdkag8eU89rvCIwUncRXLsOmAQALnkoqwDp5iILjWr3TQ85cVUNC 5QC6DxiN28KQBWWL0BiElxfNJrOSQMay9TTp1uZz/wDdhwOkRUYzB7Lz8ucYxsfUjbbG NHuGBAkeBOZveMqXSRxS8+SlOPHkXnmdN9f0KYZ8GyC+Dj4JEx8yGCGtZ1W9iZRtvs0T TdllCWszKNweR/jEwNkg3UkfGGdBQNhEOUmPwXOi5diQb3oYTLSXmbA/QWrk09cKHUTY DUFg== X-Gm-Message-State: AOAM530X7h4e5zN6IPLLeYqqyMM7m5Raf2agsti17TfsQNx4I2OZwaCX UGSFLGPijhT90Nl9wwH2Fhg= X-Google-Smtp-Source: ABdhPJw4z9EqUFEodw9IFzrIRRXt5KZzuqKFATmgY9X8Mqa/VzTgZf43k0DZQ8+rY1H8MLW/I+o15A== X-Received: by 2002:a63:65c5:: with SMTP id z188mr1386110pgb.332.1609887535455; Tue, 05 Jan 2021 14:58:55 -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 fw12sm244233pjb.43.2021.01.05.14.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 14:58:54 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, 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: [v3 PATCH 05/11] mm: vmscan: use a new flag to indicate shrinker is registered Date: Tue, 5 Jan 2021 14:58:11 -0800 Message-Id: <20210105225817.1036378-6-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210105225817.1036378-1-shy828301@gmail.com> References: <20210105225817.1036378-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. Signed-off-by: Yang Shi --- include/linux/shrinker.h | 7 ++++--- mm/vmscan.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 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 8da765a85569..9761c7c27412 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -494,6 +494,7 @@ void register_shrinker_prepared(struct shrinker *shri= nker) if (shrinker->flags & SHRINKER_MEMCG_AWARE) idr_replace(&shrinker_idr, shrinker, shrinker->id); #endif + shrinker->flags |=3D SHRINKER_REGISTERED; up_write(&shrinker_rwsem); } =20 @@ -513,13 +514,17 @@ EXPORT_SYMBOL(register_shrinker); */ void unregister_shrinker(struct shrinker *shrinker) { - if (!shrinker->nr_deferred) - return; - if (shrinker->flags & SHRINKER_MEMCG_AWARE) - unregister_memcg_shrinker(shrinker); down_write(&shrinker_rwsem); + if (!(shrinker->flags & SHRINKER_REGISTERED)) { + up_write(&shrinker_rwsem); + return; + } 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; } --=20 2.26.2