From patchwork Mon Jun 5 19:03:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 103442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2897427vqr; Mon, 5 Jun 2023 12:08:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6DQ32e4ToO7Mi/DNppZnpfs2Sbgy+VTlSz/MGuAq+bT6zQqLgAOEOjsvHLnd/AoW8PTZsl X-Received: by 2002:a05:6a00:1595:b0:64f:7c9d:9c09 with SMTP id u21-20020a056a00159500b0064f7c9d9c09mr682814pfk.32.1685992130339; Mon, 05 Jun 2023 12:08:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685992130; cv=none; d=google.com; s=arc-20160816; b=Jq1Q6pNKpnnP1P1bO5qbDYoVwhns+gbkHbDl5o6UAYxfKtpn8p5enNA5yXnCOmSs1f Rx9F8ph5X8/O9kKwo00Iav76kcoWTREllFXUqsDNq0673BJ3PWFucXkqw0CFMerrnS5a nBw91GCuSDIyjaRR6SQB1tKX+Mnhok4ktZXCE0ev+k5mlv6vYqqoQRf3uehAJ19m3JtE VmD+ZkI7/vv4gKVeg92ZZAAd6JWGr9pqi7nddPRukbUodX6QfsYiaufrUeY8ZNI6nLAP wxr0pF2eAQr/QIBNGLJj7nZVDoTfxyuOR2mXejZttMnOVGG9X902MFRjrKQWsBo+KVBM IKdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=W1Bi1QeA3RV6fDYh5nFGYXyCEkJP+gzRRvK3oGgjt0Y=; b=J9XiortahrdZnMHQ98BkioopgmasqKr0P89WZInQeYP/IYuyJ3p2vUZzkbC1qjoRX4 8Fy3lyrbxSIdecOsNatLX89WC3jK0chDUJlVIL3xqgaNzmkCRX93Y4W6KnV+md/9cXq6 XI3xwEDjqJp0OCELwz1lB18Yz5RQyy673VSIBIpAqFzHBjsTziZb7uAALMwR3aa984Mu 9gtf/01VJOzjHIPW1TYiLPvkxdsHEyfYtuXM/jW3KOgOYMLL3Bfa/IJSNvZNtge8ddhM MhUQlXx8NsvDBfNNrnZXxeVvXtyMwKrvr1Vq32WrEl9Cj3Gv18otauh/d1bwDGwYTXFr Cx0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ya.ru header.s=mail header.b=fv3xvnuj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ya.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l12-20020a63700c000000b0053eee275ae2si5788990pgc.32.2023.06.05.12.08.38; Mon, 05 Jun 2023 12:08:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ya.ru header.s=mail header.b=fv3xvnuj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ya.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbjFETDQ (ORCPT + 99 others); Mon, 5 Jun 2023 15:03:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbjFETDP (ORCPT ); Mon, 5 Jun 2023 15:03:15 -0400 Received: from forward102b.mail.yandex.net (forward102b.mail.yandex.net [178.154.239.149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C2A110B for ; Mon, 5 Jun 2023 12:03:13 -0700 (PDT) Received: from mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net [IPv6:2a02:6b8:c08:2e14:0:640:2cd1:0]) by forward102b.mail.yandex.net (Yandex) with ESMTP id 71C1B60042; Mon, 5 Jun 2023 22:03:08 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id 23YUOG7DgKo0-B7EanhI6; Mon, 05 Jun 2023 22:03:07 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ya.ru; s=mail; t=1685991787; bh=W1Bi1QeA3RV6fDYh5nFGYXyCEkJP+gzRRvK3oGgjt0Y=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From; b=fv3xvnujLxOzwiwx7oy8Fmj7DhRGkL1HQjX6HTZuI0ksIExohWUw/ppxsFP26wrQG ABBRGtJf4o4VNLVlTLGPG1t6h7tqg5icrp4ezWXm+YNnpCz010eUgXfzsA+M8cGqAe PTxMdU9REozFF2iPapv6z6sRp0YkcM1+kv/mCFMA= Authentication-Results: mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net; dkim=pass header.i=@ya.ru From: Kirill Tkhai To: akpm@linux-foundation.org, tkhai@ya.ru, roman.gushchin@linux.dev, vbabka@suse.cz, viro@zeniv.linux.org.uk, brauner@kernel.org, djwong@kernel.org, hughd@google.com, paulmck@kernel.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, zhengqi.arch@bytedance.com, david@fromorbit.com Subject: [PATCH v2 1/3] mm: vmscan: move shrinker_debugfs_remove() before synchronize_srcu() Date: Mon, 5 Jun 2023 22:03:02 +0300 Message-Id: <168599178203.70911.18350742045278218790.stgit@pro.pro> X-Mailer: git-send-email 2.40.1 In-Reply-To: <168599103578.70911.9402374667983518835.stgit@pro.pro> References: <168599103578.70911.9402374667983518835.stgit@pro.pro> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767890883957672878?= X-GMAIL-MSGID: =?utf-8?q?1767890883957672878?= From: Qi Zheng The debugfs_remove_recursive() will wait for debugfs_file_put() to return, so there is no need to put it after synchronize_srcu() to wait for the rcu read-side critical section to exit. Just move it before synchronize_srcu(), which is also convenient to put the heavy synchronize_srcu() in the delayed work later. Signed-off-by: Qi Zheng Acked-by: Roman Gushchin --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index eeca83e28c9b..a773e97e152e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -818,11 +818,11 @@ void unregister_shrinker(struct shrinker *shrinker) debugfs_entry = shrinker_debugfs_detach(shrinker, &debugfs_id); mutex_unlock(&shrinker_mutex); + shrinker_debugfs_remove(debugfs_entry, debugfs_id); + atomic_inc(&shrinker_srcu_generation); synchronize_srcu(&shrinker_srcu); - shrinker_debugfs_remove(debugfs_entry, debugfs_id); - kfree(shrinker->nr_deferred); shrinker->nr_deferred = NULL; }