From patchwork Thu Jun 1 13:27:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 101941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp341934vqr; Thu, 1 Jun 2023 06:47:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lBulhOu99X6n/7MKJUWhk7uR3yNSHbDs1SxQMNrnuTj5TnhRp9Gga6XCpjtToXnb+m0L+ X-Received: by 2002:a05:6358:2929:b0:123:99a:1778 with SMTP id y41-20020a056358292900b00123099a1778mr4068711rwb.10.1685627256424; Thu, 01 Jun 2023 06:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685627256; cv=none; d=google.com; s=arc-20160816; b=CRsACLZpvM342USqEe1MWBFPaCN/y9rL2XmnxHmZ38/oL+dwUROSLAYPku/iN30PwN T9cKa2KrAEtbUZ4q6ma0qo2mmSL51hmv50OHG0b+vyNOFCATZTI7dEZCB9tVCnQsdKDy Sn5bTA8s2IIvdaPSPEzPToGZSBVeqSfeda0774aHqngRMa6OtUQNHL99HgTSoK1BlKGu OL7DwcPw+K+4OWcQVQ9tyBdc5SX8vhN4p9HJhINUH7OuwIRnHN8itJMJM/AmVL6RUUkh oQWE52RhRrI64lj15tY8o8N05BPJ+rsUW9AyqiUddBi9SgEcKkbcZt36HVwlBrTtiPf7 +qbw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=PXhO3otjBtuh+Ck91TNKKziYmrluCv2b48DIjrztc9w=; b=ZJ2SQyawIehIhy4WVLmjFj4KViTgsRckGWwt882GtaMtbyhXLOt9XYBn1LwwsKa+E5 TTkfzOjEFYIJ0NvNK6Gwk/A56jvLZljTCN6RfsKYPBsOnM1VkcTMw6MUvauaornY/dpr acX/jKG6sPj7XC+3pm2zIAbE31EDaR7BncOPjkCvAMkKzvb+e1HJ2lqJ8mfr0HzGXeCv vqlJW5WwAGoAFO/DWOhV3EenLyqOxv2CIpSpT2yDG1s1yKv0dHXAc8xt83UZNca/T2Cm vW7M3rZELRZdNBAKqJ44UzFrM4WH4U7aAow/LmYTTfr6eDgOmTbkueuhy9Ks+DsP8f8P bhKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=nROl794S; 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 m23-20020a638c17000000b00534913980acsi2769669pgd.854.2023.06.01.06.47.23; Thu, 01 Jun 2023 06:47:36 -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=nROl794S; 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 S233927AbjFAN2S (ORCPT + 99 others); Thu, 1 Jun 2023 09:28:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233925AbjFAN2E (ORCPT ); Thu, 1 Jun 2023 09:28:04 -0400 Received: from out-11.mta0.migadu.com (out-11.mta0.migadu.com [91.218.175.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 881B6E53 for ; Thu, 1 Jun 2023 06:27:42 -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=1685626058; 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; bh=PXhO3otjBtuh+Ck91TNKKziYmrluCv2b48DIjrztc9w=; b=nROl794SQspeHQtioYrDX4qM6UQfGameVH8C+yWUZLeMtwi5yDU/j2qDEtD0MSBHq5NfMt tP0VEQaXLg4nJgqvjifARX+/DDfx5wTACWKXU8aF85yB+uaxLinKfzh1TZRee5G092gVHU tFHOmVv59+wob5wVJILMtR5F+ohCZxw= From: Qi Zheng To: akpm@linux-foundation.org, roman.gushchin@linux.dev Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH RESEND] mm: vmscan: move shrinker_debugfs_remove() before synchronize_srcu() Date: Thu, 1 Jun 2023 13:27:14 +0000 Message-Id: <20230601132714.2540707-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 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?1767508285935687502?= X-GMAIL-MSGID: =?utf-8?q?1767508285935687502?= 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 --- Resend as an independent patch. 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; }