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 D2CA3C61DA4 for ; Mon, 13 Mar 2023 11:30:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7503E6B0071; Mon, 13 Mar 2023 07:30:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D87F6B0080; Mon, 13 Mar 2023 07:30:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52B3C6B0081; Mon, 13 Mar 2023 07:30:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4030C6B0071 for ; Mon, 13 Mar 2023 07:30:31 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0CAE0160389 for ; Mon, 13 Mar 2023 11:30:31 +0000 (UTC) X-FDA: 80563657062.16.708C8F1 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by imf13.hostedemail.com (Postfix) with ESMTP id 1B49B2001E for ; Mon, 13 Mar 2023 11:30:28 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="SVZ/kd4y"; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.171 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678707029; 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=veHvRh5W1aQDA0P3DcAtGH917iTj6D7LjZJelB9m0SE=; b=0ou6CSSyfFsjR76iSZEH1uQhXSF84g+qYdad1CQOrCW+/F08/MurLpxNuHq9jY+m3Knah7 UFvIr6u8UODm1Z1DPuAubfR4+iEcwq7Q+gWrzIiNYNhhrF7TnUDjoWGHiY9Bc1SfGTO7Gu WcKfa0quvQtGyk1MRpgV2ACCyz37Zn4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="SVZ/kd4y"; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.171 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678707029; a=rsa-sha256; cv=none; b=AH5S6QZkoCUCevLVSduuuhrNAlv60d82ULnc3Q8qEEckJ5OB6E3qG7i3c5dUKHyB0UzGbx PkV9iULfW+cmJTTRg+iZn6Gy2+dt7oz5EKg3iBnWTGK6gEcvs3DdaccXfnq/f7Qw9ueNse xViAFoasXg/pJFLD+t8X9zbwelJXHTA= Received: by mail-pg1-f171.google.com with SMTP id s17so6681708pgv.4 for ; Mon, 13 Mar 2023 04:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1678707028; 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=veHvRh5W1aQDA0P3DcAtGH917iTj6D7LjZJelB9m0SE=; b=SVZ/kd4yVajGRKXhMfnj08cBdN48skJmJEGIspTu2+CDNIdJP4iVJq7QNuWbryFTFQ 5WArVBLbgGw6BT+81/ZTiH5DRhGi3JDvekIZehLu2+/q199ZQJ1MzMGsH3B6ep70Nh2j O9CDfWe6oBvsg9PWBDzLHKCNF/NITz+vSqLJI6Zvlx3SIOWybhEFZsRLhi+R8hbquZII EF5ApH6pEdxse23guW/P/4ktZI7CDraqOYOVYGnfra1lYuYfsl2CmxifRbGwgg74BxXU wCwmiL2GpNFoGQ1kXBpQ/7VvFCZVNNvKkhzQxx4qZOb24QFhzFh+GYU9RthjQ0RmrpAP KQEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707028; 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=veHvRh5W1aQDA0P3DcAtGH917iTj6D7LjZJelB9m0SE=; b=D5mG73c25R6UHcUBqiFaJevAyi6eyYV7SKC9ABM4GANZ/62TYIaBMyRbIvzfw2GTFq mMuzDRR31I6LJEZmobEjqgPvSCC7Crfy5paDWEeXlGUIQ+dSHzeRuCFjasN0VQuGeuTo PneZaSXNcJlj7dpaHnc/2QNbMgAW71uGAyACCZ0F0DJ1k2U20BBVLZk+BrVu1dbdirFo sKhnhazp64tlx3t7ZfZSYQ8vDhg97TVdjuf8cLLkdi2OXYospC6KRfQfCueYHEnjYCuz zX2fgyrDolb1Jdr0hunk24/SfVFSzon3zqiEbrGb/dGmdSpsfmfMBYlIvcYC1Zg9IDB9 ZgUQ== X-Gm-Message-State: AO0yUKWQdVutI86dYhSmy/r/44Cp7rnwOS/PAOcoHxspFsKBn6xCLE0o 8AOWARiSF6WELtcupkrLNlim7g== X-Google-Smtp-Source: AK7set8i2b/48hUTIPTL5nz8DyCQ8zcW2aEytP3igjsldvVyv3Zw/RxUP33QJvrhhgkOlxsg3YqeKQ== X-Received: by 2002:a62:8784:0:b0:623:77a8:8f65 with SMTP id i126-20020a628784000000b0062377a88f65mr4740537pfe.3.1678707027920; Mon, 13 Mar 2023 04:30:27 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.229]) by smtp.gmail.com with ESMTPSA id n2-20020a654882000000b0050300a7c8c2sm4390827pgs.89.2023.03.13.04.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:30:27 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, tkhai@ya.ru, vbabka@suse.cz, christian.koenig@amd.com, 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 v5 8/8] mm: shrinkers: convert shrinker_rwsem to mutex Date: Mon, 13 Mar 2023 19:28:19 +0800 Message-Id: <20230313112819.38938-9-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230313112819.38938-1-zhengqi.arch@bytedance.com> References: <20230313112819.38938-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1B49B2001E X-Stat-Signature: cwr336dexkxqjyr7cmpjq6djfthtzg4a X-HE-Tag: 1678707028-928833 X-HE-Meta: U2FsdGVkX1/qZj2Cr1Yz4esWdGWlsGd9vmh4J5NzxcI4QBtHAYG08VFjyM90mh8hW0hCTrduSS+WfBp2rim6bKcxhmrC8gJqra7ulvYgO834LzGC/AU/XibkYDp0IABExidsOGdTGMdYHj7rg4nm6DHoCbeU2lfb5YtrwifYNQqUYPbC8ugY232Nf9/53dBX3SViSucwZCY87RiW0a3iWKKqf8z7fbibfOAjQedh+9Hdky4/dQC2pUCIA5zu4AJj4ywayRWmTnCXliKENeKy9Pm2G10rXZe8I7IaBZQjhg0agKwVPmDS0oQfp2gre8ERuafia+Rfacn4OmYGmQjj1hMjVulpSPlGYIQIrrmwXPAvjxwKzjZRfKO+7xu6cWttoDhSawJ4InBpI3x6O+XHMZBV8LdZHpAVHTIMaU/r/yj/poQtJMSffdGP4hO7FzorWStkwP/1+SHtJtqrRy5ZwglClNOygTJbJhq7ODZaSfbY4fiBlqFTa+lHUVu8ovldCEtIaJKBgYIirfsIaXlYpeCtA07GWtPNPp6qvj+OCT8D3FzJ7JDbR7q3QsGJJz6mtZqNpwVisRBQMKR7YcPKsKA8Pfzo/qgVKUkDki5y9eIc2YM8BVbm7X5kyL9c+BjXMTc7wELJzAhZWjBIywrDD6lg+iJrPMBSTLdd1xKwvE/sE4kIwbUThjNP02IMX/jZ0WDxpUbYQZXBdc0Xl2fI/ZtwOdL8etPAPLfU6QGLylJHOnDBh+Sf68XcVOCSKkFjLzr8oZluBszbfj9JGxW7rc8C95BBsasBnMQxlLdjWHuTImtGtmuBvohGnSpCFpE1s4DayLXUVaILe+xS7BEfizWpnP+Zt5wZiU5kI2vl4Ll0kuBSxkneAf0zqguCHfIGxMX4pxGIgRg8KqPV/Jbqb+B30ZA5SqqrjAIy3WPhBeaVXIL8ydjrl460qCNdAiw1DQ3lbBHw1vu8iOLhF64 KmWmR6he fqJbATtj7zSR6vz4K9S8MOzCEbNK9aEcarsSWHi9vX2XCHxPs7SZuZn1SrdaPPnWpHq77w7IiqeQwSH1LnQHeM1EwYbeRGvjZqNeDICt7/H0uRNAH8LB+QH4h2YN82uHaHi8v/tUqqCLODIa89A8o4flfU5IFr0xVj/pwTUBD5yfl0Gx2DmPovJjGNr2ZtFF0Fisk1LR80INbRnHmSELDOdTo0AhaMPBstvmnYCwcQThTG8Tou7vL3f1xCzyKHKHjNth4gLR9FiyaNXxlMkRfbM7aQsLZXW4U4fOPDOgndy4XhIsqnDDc2sFx+wgiaXDpTYmXdPV4upyBUkUp3jBmXvcOQDJvu6OHX6ak5zT81Ne5RylHMYRtJN/vN39ZF7lLu+x8kMDxAf2sejwsv3z/MblRMCAxEXW2nY2LXrDcAY132G670zh44bOodCx4UQvmlaF7kVTA2Ky5lVF3FPumzbDEau2nWbkmKpZ0V0OQ9IHZU96Fm5Qq6IsTjlGJLU7LhfcbwZSvK/u8EdXUcgnG4D2aFQ== 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 Acked-by: Vlastimil Babka Acked-by: Kirill Tkhai --- 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 37d54d037495..fdd155fd35ed 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -8,7 +8,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; @@ -168,7 +168,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) @@ -211,7 +211,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; @@ -229,7 +229,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); @@ -241,7 +241,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; @@ -266,14 +266,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 2b22a42d83c4..8faac4310cb5 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, @@ -304,7 +304,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; @@ -320,7 +320,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; } @@ -336,7 +336,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); @@ -386,7 +386,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; @@ -400,7 +400,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; } @@ -410,7 +410,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); } @@ -445,7 +445,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); @@ -454,7 +454,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) @@ -703,9 +703,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; } @@ -715,11 +715,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) @@ -769,13 +769,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