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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31DE9C64ED6 for ; Sun, 26 Feb 2023 14:49:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C517F6B0080; Sun, 26 Feb 2023 09:48:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C01BC6B0081; Sun, 26 Feb 2023 09:48:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF2EF6B0082; Sun, 26 Feb 2023 09:48:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9F0A26B0080 for ; Sun, 26 Feb 2023 09:48:59 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6E3261A01B9 for ; Sun, 26 Feb 2023 14:48:59 +0000 (UTC) X-FDA: 80509725198.06.8FE3218 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf22.hostedemail.com (Postfix) with ESMTP id 9ECE9C000A for ; Sun, 26 Feb 2023 14:48:57 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=DU9ImCfz; spf=pass (imf22.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677422937; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f5xm65H9BLTSDcpU/nYsAyAok8lJrBUsJgeNL2FDrMI=; b=lFW1dqedn6nuYvv7nBJf8enpbsGC2KNFsa/W8NaOUWDe2QyS3qK6kOtcGZlYEHzdbW6XA9 68ypTDkTeXXfrC2fazWJPJ7jJbHtDqCST4wD15CoaL4+UKCteIzJk9OUYikJuTodn8Vt9n PXdnKqa0HnZ18h9rgc8QNy/baPw6aFo= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=DU9ImCfz; spf=pass (imf22.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677422937; a=rsa-sha256; cv=none; b=UavgSBFkploGFAeMcE60ub7iwWPxrfEkvXVa5GnHCLXg1hMuXvDegbr/aXPHkqeC8WN+Bq D2ApbH6KTn5hFqh2HvEdToGOrb/d9WNfIJlfOIGErRepKHnBUP37TsqnAPBrUqt2DPOq+3 tUNjw5xfoQU3gWjINmJMwzaUzBjWseQ= Received: by mail-pj1-f44.google.com with SMTP id nw10-20020a17090b254a00b00233d7314c1cso7524967pjb.5 for ; Sun, 26 Feb 2023 06:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f5xm65H9BLTSDcpU/nYsAyAok8lJrBUsJgeNL2FDrMI=; b=DU9ImCfzPDt6r5qsdIJgFlMqPyv1XNzrFdxX1MYevySp7rV/vBy4oHtHlXM0ehu+/q e7Sjxf8qsqyQGdUSKu80ZuyH8gv9rpDyqCA+6sYlagLU/RVK4FI8pl7xZiXV+Ojb41zx ezPpwq3uJvNV5TVTXIF7WKeiEmB772qpgZU/rJEebve9b47zOunZTUMe/f+gk7PISSjc Ehcf7cS8nj1sKVkD/JveUqUJzsUCxQfCPh/rzpzR2amvQmZsujUa/Epz4Eonu2OG9utb VbC/USw9zVaaeY/TFpc3MuKTAHI4ssQxadvh9v+878R2uidsPviikdk/mxseIFk0IHSC +N3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f5xm65H9BLTSDcpU/nYsAyAok8lJrBUsJgeNL2FDrMI=; b=a43bkBQHW8yfcBzHHxnb1YqklU6eWW4yG7sx7yVrCZzdhPCyAWm2OQ6GG0vfl6q6zv cEuJXSQECxInHXJ0KuM1vYrQfiWX2G4Em2eTn47erO6BamoBclhK9xyzXdFafdlzM1mj zfxA3YVo+0BUito59oiszno7CiN0HXQsCrgnVOYxidq88mwwZ2XSslzz2rOvIvFRrBcZ jOOXpvI82F4dG1rDY+beLYBrCpLiGa7Tt6EJMS1yH2WouBe4+Dk0o0WDHjKNkesR9mdn jEtPn12fuX9W78t20qXFV4u/17Nf3u1+WDAnEyPZ7QKQJPQnZrEGzTQb+drHE1vvUClG WdeQ== X-Gm-Message-State: AO0yUKUxZuj6a5hr9PyiiTiMNsu8qiovMRy42ZRM3yMacVJWexuXu7yo MIPdBhzjav/dAfda82Jpv+HQjw== X-Google-Smtp-Source: AK7set9OLUlQVvloHLhW8LBiRt1OW+15leJOMZQHQ9/zIbOmm9Z4KelXtK4HEXm+zbHSQlGGRoJ3MA== X-Received: by 2002:a17:902:d4c8:b0:19a:7217:32af with SMTP id o8-20020a170902d4c800b0019a721732afmr23250125plg.5.1677422936561; Sun, 26 Feb 2023 06:48:56 -0800 (PST) Received: from localhost.localdomain ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id y20-20020a170902ed5400b0019c2cf12d15sm2755589plb.116.2023.02.26.06.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Feb 2023 06:48:56 -0800 (PST) From: Qi Zheng To: akpm@linux-foundation.org, tkhai@ya.ru, hannes@cmpxchg.org, shakeelb@google.com, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, david@redhat.com, shy828301@gmail.com Cc: sultan@kerneltoast.com, dave@stgolabs.net, penguin-kernel@I-love.SAKURA.ne.jp, paulmck@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v3 8/8] mm: shrinkers: convert shrinker_rwsem to mutex Date: Sun, 26 Feb 2023 22:46:55 +0800 Message-Id: <20230226144655.79778-9-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230226144655.79778-1-zhengqi.arch@bytedance.com> References: <20230226144655.79778-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9ECE9C000A X-Stat-Signature: ndf64fu4noso7pbpji3yzk6x8bw13igm X-Rspam-User: X-HE-Tag: 1677422937-12708 X-HE-Meta: U2FsdGVkX18ZFPAq80UjTx5C6+iac2IIlwFJ1URX3gw4jGIgVsLVTZrBrfel+ccUlVMzFZ/dzCGNDpnxIXfb8y1lN6eU96lf/EDhA8JxKcyhT6eMEFerzPretvQmtFzH9fmpT8vDHyzQFk6GZk1sYGY/WNt0mpwvdRRHyHdRICaDvPnzZJVINHeobTpVru1vCDiKre3VT05KSG7xIILxBSiq9AeeQaIoUTHSMGRHtgjMj+s94xgSjmJ+GN1S7OO4SAY8WYBYuGhrLohLFmsfZoJpjMzpEXrJVZG9tVMEwW9AJHr9TZezIVn6LSZfsMfdSsiYjs1uAW1j1kBIUjOmVU5S1NpJ0teuHGFzs52TXToQwyqjYQ7EwDqnmnL3RizgDd314TBRh6+3PvalfIonDRQZe2fcNY58lwTzpG+8xuRCtQAeyL7uugkLnBpTSpIKns45dxWgsDzeQ0LIavANVBT5oub6iFQIgWVauN0m5Auf40c67G1RRQS2pwYnchZovuNUECrmS6YnB9qvecRlkirpYzT28VoqnTR3Kp3uX0h2tXJa2JlME2ngCAH3E3y6nw4CXo8Y/e+YVY8VStPUDA+btGFt1b9RtO/KgRn10oCmtUusAOG4NjNexvv2pj0ljbw61IcSu5N4yPSmrbbGycE+QWoSs60/CzueCylJbNFHsUOqkmvoyGtEQWOKTO3yVZVXNQ3d5TFBs9v7q6JopgYtZM7uqwwv+ufQkeAwM1ddpJxGLmgqSifDuqHM6A3fv4ZGhx8MGFrDhVpZV6PPhhdujISvBFeAX+L5Cdssgp6KA8/WDSFTyoVfEc5oZpRJP5AG4V7cC3uFFezzow3AlB9wqcPOCyUqZ+KSK/sIjKl2pyoCKy5P1bkDFqd/2v6YWKHzSD8hk/G9wJYnaYt1i/kuXGxpOnSVSHBvE7kEUMkBo0li1L+1VWaS3XI6C7cA4DxOSYG8Tu0NurU1NuN lFUyQIdK 3BNT09H/f0ZnXLpGYe/DLd+ttTSUUXgEyLOz0XQCmmEuJaQG+fXVaZ+30W75DccIRhp2N4lEa4bZZ8tQYF1S1UFJRvmw0iEbhhzRSgtpGvaLIcQ5D0qbRFI7e3J2+C2IjFDK7OsBc8biR6lh6dB1myJduZ9DSVPH8WBhYscQjDhL3Ze9U2AjMbIV3FZ4pNq7UEYx4Y6hfnijSaD1T/PxYCDM6kH5FIMaxVG78kfQz7PkavNXbdPYyIOC/ngUrP4zOMDnqZj3k/jLa91aNy2+AmkMB8ERDPtAmfgCyOayXx2vsoxE73ootaNMKiVxBbGT+hc3BnwxeSRdvWK7tSmAJpDwv6y2XslSAUsCsDH9qN5dtWB0PZ2RvEsk7VuoFWraDXwdEDZYDwlkfxv4T4qt0etdNqm8sqe93ml1Zi2dpgUOr43luyARajdOzn9pMIDgaQYpx33PAx7yS8IuH8XHa2yekStKkQAqpgWpl 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: Now there are no readers of shrinker_rwsem, so we can simply replace it with mutex lock. Signed-off-by: Qi Zheng --- drivers/md/dm-cache-metadata.c | 2 +- drivers/md/dm-thin-metadata.c | 2 +- fs/super.c | 2 +- mm/shrinker_debug.c | 14 +++++++------- mm/vmscan.c | 34 +++++++++++++++++----------------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c index acffed750e3e..9e0c69958587 100644 --- a/drivers/md/dm-cache-metadata.c +++ b/drivers/md/dm-cache-metadata.c @@ -1828,7 +1828,7 @@ int dm_cache_metadata_abort(struct dm_cache_metadata *cmd) * Replacement block manager (new_bm) is created and old_bm destroyed outside of * cmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of * shrinker associated with the block manager's bufio client vs cmd root_lock). - * - must take shrinker_rwsem without holding cmd->root_lock + * - must take shrinker_mutex without holding cmd->root_lock */ new_bm = dm_block_manager_create(cmd->bdev, DM_CACHE_METADATA_BLOCK_SIZE << SECTOR_SHIFT, CACHE_MAX_CONCURRENT_LOCKS); diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c index fd464fb024c3..9f5cb52c5763 100644 --- a/drivers/md/dm-thin-metadata.c +++ b/drivers/md/dm-thin-metadata.c @@ -1887,7 +1887,7 @@ int dm_pool_abort_metadata(struct dm_pool_metadata *pmd) * Replacement block manager (new_bm) is created and old_bm destroyed outside of * pmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of * shrinker associated with the block manager's bufio client vs pmd root_lock). - * - must take shrinker_rwsem without holding pmd->root_lock + * - must take shrinker_mutex without holding pmd->root_lock */ new_bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT, THIN_MAX_CONCURRENT_LOCKS); diff --git a/fs/super.c b/fs/super.c index 84332d5cb817..91a4037b1d95 100644 --- a/fs/super.c +++ b/fs/super.c @@ -54,7 +54,7 @@ static char *sb_writers_name[SB_FREEZE_LEVELS] = { * One thing we have to be careful of with a per-sb shrinker is that we don't * drop the last active reference to the superblock from within the shrinker. * If that happens we could trigger unregistering the shrinker from within the - * shrinker path and that leads to deadlock on the shrinker_rwsem. Hence we + * shrinker path and that leads to deadlock on the shrinker_mutex. Hence we * take a passive reference to the superblock to avoid this from occurring. */ static unsigned long super_cache_scan(struct shrinker *shrink, diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c index 6aa7a7ec69da..b0f6aff372df 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -7,7 +7,7 @@ #include /* defined in vmscan.c */ -extern struct rw_semaphore shrinker_rwsem; +extern struct mutex shrinker_mutex; extern struct list_head shrinker_list; extern struct srcu_struct shrinker_srcu; @@ -167,7 +167,7 @@ int shrinker_debugfs_add(struct shrinker *shrinker) char buf[128]; int id; - lockdep_assert_held(&shrinker_rwsem); + lockdep_assert_held(&shrinker_mutex); /* debugfs isn't initialized yet, add debugfs entries later. */ if (!shrinker_debugfs_root) @@ -210,7 +210,7 @@ int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) if (!new) return -ENOMEM; - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); old = shrinker->name; shrinker->name = new; @@ -228,7 +228,7 @@ int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) shrinker->debugfs_entry = entry; } - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); kfree_const(old); @@ -240,7 +240,7 @@ struct dentry *shrinker_debugfs_remove(struct shrinker *shrinker) { struct dentry *entry = shrinker->debugfs_entry; - lockdep_assert_held(&shrinker_rwsem); + lockdep_assert_held(&shrinker_mutex); kfree_const(shrinker->name); shrinker->name = NULL; @@ -265,14 +265,14 @@ static int __init shrinker_debugfs_init(void) shrinker_debugfs_root = dentry; /* Create debugfs entries for shrinkers registered at boot */ - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); list_for_each_entry(shrinker, &shrinker_list, list) if (!shrinker->debugfs_entry) { ret = shrinker_debugfs_add(shrinker); if (ret) break; } - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); return ret; } diff --git a/mm/vmscan.c b/mm/vmscan.c index 2d71fd565c78..6c5d21ba0c9a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -202,7 +202,7 @@ static void set_task_reclaim_state(struct task_struct *task, } LIST_HEAD(shrinker_list); -DECLARE_RWSEM(shrinker_rwsem); +DEFINE_MUTEX(shrinker_mutex); DEFINE_SRCU(shrinker_srcu); static atomic_t shrinker_srcu_generation = ATOMIC_INIT(0); @@ -225,7 +225,7 @@ static struct shrinker_info *shrinker_info_protected(struct mem_cgroup *memcg, { return srcu_dereference_check(memcg->nodeinfo[nid]->shrinker_info, &shrinker_srcu, - lockdep_is_held(&shrinker_rwsem)); + lockdep_is_held(&shrinker_mutex)); } static struct shrinker_info *shrinker_info_srcu(struct mem_cgroup *memcg, @@ -310,7 +310,7 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) int nid, size, ret = 0; int map_size, defer_size = 0; - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); map_size = shrinker_map_size(shrinker_nr_max); defer_size = shrinker_defer_size(shrinker_nr_max); size = map_size + defer_size; @@ -326,7 +326,7 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) info->map_nr_max = shrinker_nr_max; rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); } - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); return ret; } @@ -342,7 +342,7 @@ static int expand_shrinker_info(int new_id) if (!root_mem_cgroup) goto out; - lockdep_assert_held(&shrinker_rwsem); + lockdep_assert_held(&shrinker_mutex); map_size = shrinker_map_size(new_nr_max); defer_size = shrinker_defer_size(new_nr_max); @@ -392,7 +392,7 @@ static int prealloc_memcg_shrinker(struct shrinker *shrinker) if (mem_cgroup_disabled()) return -ENOSYS; - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); id = idr_alloc(&shrinker_idr, shrinker, 0, 0, GFP_KERNEL); if (id < 0) goto unlock; @@ -406,7 +406,7 @@ static int prealloc_memcg_shrinker(struct shrinker *shrinker) shrinker->id = id; ret = 0; unlock: - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); return ret; } @@ -416,7 +416,7 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) BUG_ON(id < 0); - lockdep_assert_held(&shrinker_rwsem); + lockdep_assert_held(&shrinker_mutex); idr_remove(&shrinker_idr, id); } @@ -451,7 +451,7 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) parent = root_mem_cgroup; /* Prevent from concurrent shrinker_info expand */ - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); for_each_node(nid) { child_info = shrinker_info_protected(memcg, nid); parent_info = shrinker_info_protected(parent, nid); @@ -460,7 +460,7 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) atomic_long_add(nr, &parent_info->nr_deferred[i]); } } - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); } static bool cgroup_reclaim(struct scan_control *sc) @@ -709,9 +709,9 @@ void free_prealloced_shrinker(struct shrinker *shrinker) shrinker->name = NULL; #endif if (shrinker->flags & SHRINKER_MEMCG_AWARE) { - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); unregister_memcg_shrinker(shrinker); - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); return; } @@ -721,11 +721,11 @@ void free_prealloced_shrinker(struct shrinker *shrinker) void register_shrinker_prepared(struct shrinker *shrinker) { - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); list_add_tail_rcu(&shrinker->list, &shrinker_list); shrinker->flags |= SHRINKER_REGISTERED; shrinker_debugfs_add(shrinker); - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); } static int __register_shrinker(struct shrinker *shrinker) @@ -775,13 +775,13 @@ void unregister_shrinker(struct shrinker *shrinker) if (!(shrinker->flags & SHRINKER_REGISTERED)) return; - down_write(&shrinker_rwsem); + mutex_lock(&shrinker_mutex); list_del_rcu(&shrinker->list); shrinker->flags &= ~SHRINKER_REGISTERED; if (shrinker->flags & SHRINKER_MEMCG_AWARE) unregister_memcg_shrinker(shrinker); debugfs_entry = shrinker_debugfs_remove(shrinker); - up_write(&shrinker_rwsem); + mutex_unlock(&shrinker_mutex); atomic_inc(&shrinker_srcu_generation); synchronize_srcu(&shrinker_srcu); -- 2.20.1