From patchwork Wed May 31 09:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 101315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2767396vqr; Wed, 31 May 2023 03:17:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7dTYbC2SMIuRvaRfiOwyTD+oiMV4WGZ/oehDNCzOf5cmWzL6SbBJiWjoTDTmBLUi6RB+0l X-Received: by 2002:a17:90a:ca96:b0:24e:d06:6912 with SMTP id y22-20020a17090aca9600b0024e0d066912mr5598338pjt.18.1685528221912; Wed, 31 May 2023 03:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685528221; cv=none; d=google.com; s=arc-20160816; b=bAaYE7Z8GhFc7o3aywcz7LM1mZKXGI6GpsAxAni3bb4YgphK1rIDt/bNpiGKE0yoTF MGyOHGcbOD4PEw3mCyJJkCrK/GrAwq7y6qqI/AgJ23uUbNRXAHcXpxfW/VaEc6FGbq9g Sd9XdjbiP0KHk6pfIZXDQ/qt0mNMVeKhPYwh8yE6Je+k/NTHzVpKItRFZ+w4hngZcQgr DpLcVpOVf+P18L4mZxdocZU4pw9UOS7t7aQujhXAq4n3R6yvvSXOYiG7lkPxJDC3x6zV 8dkfffy/q09Q8P1n8AMr0zuax7tDqX6m3xm6ki1o2KI58DvnDP4JbRBrJyW8gAmVd7Tw QmjQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lnzxWyBrjsXVofp7h2XNt51t4g+fsU+gJXs/ea1cFR8=; b=vfamujn6S6Z/js9a9wqrEWaFetZ8ZKli/CCTTk/MMwB+1qFihQsz4bIOwgQu2kLOsI /tNqt/jN9nTD35ALHKCqg+I5PYDMTSZY0GiWmBNyxKvOMromLG5lvp5X+2NejdsqDEm+ 9AA87qG5FN0SGwvGlF/vYjUbMsVzed+mQzPXu3+n2MF1U4H+/erOFNyJNSXnC3t38Sap 4BBvwzOOTnHX5DP828AikKnmiDpIE3rvG7UIzP3AsO0ux+FKgYYHl36pPw1yqQHBgvoz fNA7fCW6w9GbRzrYsq7fQSV1emYEX9sENwOkcbMS9Gbl+BAue7N+hKfe08o04toIZsdM KfEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=sxRHWVlL; 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=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b1-20020a17090a800100b0024e47fae466si664960pjn.180.2023.05.31.03.16.49; Wed, 31 May 2023 03:17:01 -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=@linux.dev header.s=key1 header.b=sxRHWVlL; 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=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235698AbjEaJ6y (ORCPT + 99 others); Wed, 31 May 2023 05:58:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232884AbjEaJ6q (ORCPT ); Wed, 31 May 2023 05:58:46 -0400 Received: from out-2.mta0.migadu.com (out-2.mta0.migadu.com [IPv6:2001:41d0:1004:224b::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 391FD12B for ; Wed, 31 May 2023 02:58:24 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1685527099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lnzxWyBrjsXVofp7h2XNt51t4g+fsU+gJXs/ea1cFR8=; b=sxRHWVlLu+rreVBFxwIJMsPglUs7BP6JtCkUt3t8Jj4/N9ua1Q2/SjbYdZXtKFG7R9C7pt 2t9WN+oDIJxf1PqTSf920IDKgkWQRBFGYeyKYjIsrWLrD8tL2dxfTRirVmdU/LhybNhnyd QK69UVOEAmxZHnZIIPi+vT1ngAY56cU= From: Qi Zheng 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 Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 1/8] mm: vmscan: move shrinker_debugfs_remove() before synchronize_srcu() Date: Wed, 31 May 2023 09:57:35 +0000 Message-Id: <20230531095742.2480623-2-qi.zheng@linux.dev> In-Reply-To: <20230531095742.2480623-1-qi.zheng@linux.dev> References: <20230531095742.2480623-1-qi.zheng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1767404440934625188?= X-GMAIL-MSGID: =?utf-8?q?1767404440934625188?= 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 --- 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; }