From patchwork Mon Dec 14 22:37:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 11973293 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 7F53FC2BB40 for ; Mon, 14 Dec 2020 22:37:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 318B020731 for ; Mon, 14 Dec 2020 22:37:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 318B020731 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 C83A86B006E; Mon, 14 Dec 2020 17:37:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BEB106B0070; Mon, 14 Dec 2020 17:37:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8BD86B0071; Mon, 14 Dec 2020 17:37:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0119.hostedemail.com [216.40.44.119]) by kanga.kvack.org (Postfix) with ESMTP id 907EF6B006E for ; Mon, 14 Dec 2020 17:37:51 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4F33B180ACEE9 for ; Mon, 14 Dec 2020 22:37:51 +0000 (UTC) X-FDA: 77593351542.03.oven97_1f1489d2741e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 2BEC128A4E8 for ; Mon, 14 Dec 2020 22:37:51 +0000 (UTC) X-HE-Tag: oven97_1f1489d2741e X-Filterd-Recvd-Size: 5600 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Mon, 14 Dec 2020 22:37:50 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id w5so12981937pgj.3 for ; Mon, 14 Dec 2020 14:37:50 -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=buF0Bc96au1TIy8Azp9h1XTsIalRZi79CS3NEeVVksI=; b=OaUcYrYVf/eeMpxa1NLV/j1JCTA3035IB9EUkfK3Pj1tDDE9eF3GHvc1LmiNegkWnH vZKB9fyYio5aTMn3q269OXiEB6rOIRy9cFsX3Ve5v8g9/cHgo8OSh9K+KhokHrHtNS4T HuR8/EwA3E9eyzcqZAOrmJ9iT0iZvl2SgPhk/fK3FuvkiJjvH7kamIhCNcF5cyrJD1Os GQN68PXwvsxq5aQR44ulyWqZ6s84fCyZmdJ0k/wxHnooGLkH69L6I/se5zmYCtglPmbm HxGN/G/Oq7BpsavM8km/yznT8JI7JISm7VYSEpRfFRfKj4peKfG6mKuY/gDBvNMcZ0/u g2/w== 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=buF0Bc96au1TIy8Azp9h1XTsIalRZi79CS3NEeVVksI=; b=PPyFu5IOijw2lOCmFoD+yxe3I8VFzoRoBUYFbalKkwqVS4TBx6tlIy5Zk1IGZjTJfl +kJZTLCP7DKcqZa4f4RJl5FOUZkV/mm5f7TUZK0u9Cs9B7jSh9cn6s65yd6NwddMucq8 fBatAfBd3cpOk5yUkrhrgrB8VEUm9Sjprf+WkiSkoUnFem8PuRiKAq1TuWHxVfLNTDwH ChVtVgz+2KvrnXoVRRDuhjKNAh525gCgArzSnsn4k/KBpNJejiQfjFXuvvJMoFQBMKpo rVlulJn/GJ6PUYj0j1gZQ4wMN3e1zYdLmfKDdF1denGhIu118HXEa50sC2lD7xIVk4H3 bx9w== X-Gm-Message-State: AOAM532ijk6nRgU+A/ljak0+q52eIad5IGe+Q7MXpZbaIynJ3KWGfUdH f5IPWYl405qDBe5qaz2rLR8= X-Google-Smtp-Source: ABdhPJwzng310WgdKPBA4Pp2tm1EIsAo8wEKWhFrdn5P24aXLStOtFuZeSLbkUX67IKRJTf9pkPdCQ== X-Received: by 2002:a63:5d59:: with SMTP id o25mr25614645pgm.218.1607985469792; Mon, 14 Dec 2020 14:37:49 -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 d4sm20610758pfo.127.2020.12.14.14.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 14:37:48 -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: [v2 PATCH 4/9] mm: vmscan: use a new flag to indicate shrinker is registered Date: Mon, 14 Dec 2020 14:37:17 -0800 Message-Id: <20201214223722.232537-5-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201214223722.232537-1-shy828301@gmail.com> References: <20201214223722.232537-1-shy828301@gmail.com> MIME-Version: 1.0 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_deferred. This approach is fine with nr_deferred at the shrinker level, but the following patches will move MEMCG_AWARE shrinkers' nr_deferred to memcg level, so their shrinker->nr_deferred would always be NULL. This would prevent the shrinkers from unregistering correctly. Introduce a new flag to indicate if shrinker is registered or not. 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. */ /* 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) 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 9b31b9c419ec..16c9d2aeeb26 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -378,6 +378,7 @@ void register_shrinker_prepared(struct shrinker *shrinker) if (shrinker->flags & SHRINKER_MEMCG_AWARE) idr_replace(&shrinker_idr, shrinker, shrinker->id); #endif + shrinker->flags |= SHRINKER_REGISTERED; up_write(&shrinker_rwsem); } @@ -397,13 +398,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 &= ~SHRINKER_REGISTERED; up_write(&shrinker_rwsem); + + if (shrinker->flags & SHRINKER_MEMCG_AWARE) + unregister_memcg_shrinker(shrinker); kfree(shrinker->nr_deferred); shrinker->nr_deferred = NULL; }