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 C1943C678DB for ; Tue, 7 Mar 2023 06:57:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 643B16B0075; Tue, 7 Mar 2023 01:57:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F2546B0082; Tue, 7 Mar 2023 01:57:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 493CE280001; Tue, 7 Mar 2023 01:57:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 394C96B0075 for ; Tue, 7 Mar 2023 01:57:24 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0F3CC1C4BD9 for ; Tue, 7 Mar 2023 06:57:24 +0000 (UTC) X-FDA: 80541196008.06.9A530DD Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by imf24.hostedemail.com (Postfix) with ESMTP id 437B918000A for ; Tue, 7 Mar 2023 06:57:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Rz+OlQxX; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.181 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=1678172242; 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=JEwsIZrv65iqCvc8ubXlIP3Z3XNAqh1J9iA+XAih3cE=; b=V/mXHrMYW0wC9da1OmQdlNNbDI3a5XQydY8EZFw5Dzplb9QO/Ygk5IL+gI6AUH1Mpkk69b mKNxJZM7DwPkDs7I5s1CbOaf4ICtIf5O8nOlS5VJ9rkF4PXD7r0XM0d53N+hHD+L79/zBY VEmBosTamRN0xi9oySyBAMsYD4gyW30= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Rz+OlQxX; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.181 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=1678172242; a=rsa-sha256; cv=none; b=k/QLj4VA+Zx7vXOPqqxhi6KB5OBndk84E/R7Tos35zc+SvJHHSMOjuBJpelc/DJW/OxTAz 3RNnHYvO+YSloryVCQ54KDIFNhSPpTkrB0Gr399i/Nn/XpSfaICr4z2bizf855e2X3Xckf pz4KA/1FdY82m3UJTB1psQIOO4LRxYc= Received: by mail-pg1-f181.google.com with SMTP id d10so6997494pgt.12 for ; Mon, 06 Mar 2023 22:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1678172241; 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=JEwsIZrv65iqCvc8ubXlIP3Z3XNAqh1J9iA+XAih3cE=; b=Rz+OlQxXJ+H/lFVEkuWxvVRfLx2yy/2tPDqB+C/WLB56VLSKXLTwwrE98jNSXgcCeH Wp6ocsD+lSOvkeaVrQZW5FS2yg4o9s1dz1qiHMRxFASBIpc2JVftANvxB++8sPANbxME twinknB2RKFoFIRTXehrwocBnnddLU0nmhVWDA0ZICfv6A2YIPyUIpqw70fmmMDpC9LO go9gjPkLef7kHYIg+lwI+6Lb//VWhFFJMJNWrvhgTYNSkuf3AGI3BRtPFYG9oGd6YtoV hEYb4BtRHKy7EJ9lOblKA1RqHDTg9Y++t4SZN/OXDN6aiH/uovJaGTEGR8hEEHJgMKni koTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678172241; 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=JEwsIZrv65iqCvc8ubXlIP3Z3XNAqh1J9iA+XAih3cE=; b=LKkdhIWKqOyq6FycvvvEjTR7Ent30NMlMHQyNHrxnguwnuaKkiooyVJgwJEjECWxBJ TbthVTvjbxlmC8E+EHMMPmV6MXr7kC6ldwKn8Kqg3Jkk9lqwHk+xqtgP70GRF30ht7Px /1YLuPBpapUh20RZkwf2evST08vdENot1I4k/cYZhV2P0k/l0GSIjqhZrUJ65jrh4zDL QDHbGt8mRlra0mwF9UcFgy/MfJHbKhIUsUiwIgUfWRzF/VxNV4qwCK63od9Wcb19Bd2I jmRaHuCvUeldasUlspuYrxCs2eNjAdbY4nf9+9NCPwNQdTcCsJWrhye3FhHlSU6E22Sz 6mZw== X-Gm-Message-State: AO0yUKVVGYnU8PbT4Cja3msbQawWQpfBaVIDriBNJ1BdaXrjJpNEL3BU 3SlxC0MPzyctFr6vzXwXpzZZEQ== X-Google-Smtp-Source: AK7set/4ILAb+soAd7SXbXVfua+6ZlNnI8iHb30j7PkgDES5mxQFn1us7VDLALBB1adEQpVhd+mogw== X-Received: by 2002:a05:6a00:1d8c:b0:61a:50f:cad1 with SMTP id z12-20020a056a001d8c00b0061a050fcad1mr9376180pfw.3.1678172241246; Mon, 06 Mar 2023 22:57:21 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id e5-20020a62ee05000000b00608dae58695sm7230854pfi.209.2023.03.06.22.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 22:57:20 -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, rppt@kernel.org 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 v4 8/8] mm: shrinkers: convert shrinker_rwsem to mutex Date: Tue, 7 Mar 2023 14:56:05 +0800 Message-Id: <20230307065605.58209-9-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230307065605.58209-1-zhengqi.arch@bytedance.com> References: <20230307065605.58209-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 437B918000A X-Stat-Signature: tygqw5cedhwwhwegdtd48iikiwcehwwo X-Rspam-User: X-HE-Tag: 1678172242-306017 X-HE-Meta: U2FsdGVkX18bFwvREVUr7xyN3LQn27JE9wpH5F9jLqVFTG6DfXn+bWAdkYQnyd9wuGagzt7Yp3CPmTrvVCziX16IRM3PHooWNukUZw+VoAD4Z4B6oo4JqXdGUyE5V1qihQ9SNzSzx2B/EV5EG1VwqGmUCcDpqUSXnHLRpc7ict850ucuh9k20qrWsizhampUrIjgJ+bm5PSBOVx1CZl6KKh9F6PotiPKs3wWU8fxsXBz6ynySH5r9Z8SQVjZmsscE+pM3S31GcoFPMQjrOUisGDqR1xpf66lH3tB7Jl99V7hZmfsOZUpRj3JsIQ2Uzpp+h7RrfG5DiqLooYvHFZBo+vnyFNpkt/1HYAdx0a2FHVKjPi3QOiaUG9oqQzvX88zdx9222YJ9O8BmaRX/Blb5SQXo8mWJX1RNbQkUApoUIEZ4IRY/4jjisOvz8eIVDva6++7ijSr8MZdjJ9vigpF80QePLzy6ZxA8B08QDL8DyfWOJ0WGcKxqLzahBZNavu/ieV8dGtA7s/ZiZ+CsqsBm+LMTc6OuG4uLLnCne3VOn/L9T1KSDUg+e9IjJLJnh7Qd8noP22wRR20e0wneqwp1aGvyTStEEI/goC6X5ojZTDISsgrQuiTz8XdV4ci1O3IB45g7FtCy/01BY9nipbMzWiKvqLUjNLYAHitbH0lCsCSx+SWzHsGSgTBYrLW9umBzJri2ScgCvNC6EMhD5ThaZiA9Dibqcq1wpUWToLkI18kLU59fpWTib54Yh1elU6zAEM+qrAuExj1FwLrr2lX+c59y585Uj0gZ7NdZrjzP9SkeSVAJ4zeQDdw/lar6HBm9Xt1jI5VSgbYvjq8F+SYI3P0ykBGepDFKU/ogWLb0tITusBSbyKBjcZCPaaPJmHWDL1pKJjDH8jI+cHWqV/qz/Hiq3/WtgAcvjKAhVUaWmA+MsDhXZdaNJEhJlQYq1+8aJ8h2T5Tk/Ra/GWs0w+ mygqm+Vu D8NMMI1NwgIxaE7Z8WDblmF1Kl8L3xCm2nNbQ7QZ8apFUHcJ2QVnWeWd/ioNjJhXL+BiEeX2DxjOOB/MSjJAaAbuFu6VgSHXM6z+M1uKUputSZ5qMjAWhF8t53fGg7uQ/iOsXikyxeyswzCPXw4snWUq0MsmG2smvPaDwABVBVn6J8MDjig7/DdsZtD8tznYf1SpVjbsTnIRsPQqZ2er05N3IYqK5rFqDv/PN2Lxmbo7br98Yo0I2b73bbCnWLFuhD3jYF07BeUGdj25dAvJbhPwborF/YyDBBfZftqspshYSOV3TScywHFzjA1JbZ+WFHJBandj36vLw+jqTQTrY3jdNO3bkcy77mRyIcN541g71St5vX8XtCiZ+s0UYZqmN3fvMRuLAdQgfhmvAICEXyxBM/pqDCzIWuCUQuzQSHKme6B+iNqeiFpFZzRltOYL5FY2j5GSn8WHPPIT4LPPVt7WStJzwyYZknzDI 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 ac7ab4aa344f..c00302fabc3d 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