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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66373C76196 for ; Tue, 28 Mar 2023 23:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbjC1XYJ (ORCPT ); Tue, 28 Mar 2023 19:24:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229934AbjC1XWt (ORCPT ); Tue, 28 Mar 2023 19:22:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0994B3ABB for ; Tue, 28 Mar 2023 16:22:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9BDAB619FA for ; Tue, 28 Mar 2023 23:22:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00AAFC433EF; Tue, 28 Mar 2023 23:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1680045741; bh=dv1S8Ii7fE52T3aV+CWabN9YBWP0xO49euQPpFdBgoM=; h=Date:To:From:Subject:From; b=p6IB1N9vFEoMWmit1A6HDzjTg7biQ9zcMzjWskfwzWIKV9sfYXwVUczImP6LkLUfD hoI28vPkdp4hlpj8rXxp/+7UJeNMD5An+NZMv9XpPZWkWH4n6LxN4wqcBmuqg/HuwQ /eSBLMgLQpbBGt7Go13TpGYrugfgzVlJeFJJc9b8= Date: Tue, 28 Mar 2023 16:22:20 -0700 To: mm-commits@vger.kernel.org, vbabka@suse.cz, tkhai@ya.ru, sultan@kerneltoast.com, shy828301@gmail.com, shakeelb@google.com, roman.gushchin@linux.dev, penguin-kernel@i-love.sakura.ne.jp, paulmck@kernel.org, muchun.song@linux.dev, mhocko@kernel.org, hannes@cmpxchg.org, david@redhat.com, dave@stgolabs.net, christian.koenig@amd.com, zhengqi.arch@bytedance.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-vmscan-hold-write-lock-to-reparent-shrinker-nr_deferred.patch removed from -mm tree Message-Id: <20230328232221.00AAFC433EF@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm: vmscan: hold write lock to reparent shrinker nr_deferred has been removed from the -mm tree. Its filename was mm-vmscan-hold-write-lock-to-reparent-shrinker-nr_deferred.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Qi Zheng Subject: mm: vmscan: hold write lock to reparent shrinker nr_deferred Date: Mon, 13 Mar 2023 19:28:17 +0800 For now, reparent_shrinker_deferred() is the only holder of read lock of shrinker_rwsem. And it already holds the global cgroup_mutex, so it will not be called in parallel. Therefore, in order to convert shrinker_rwsem to shrinker_mutex later, here we change to hold the write lock of shrinker_rwsem to reparent. Link: https://lkml.kernel.org/r/20230313112819.38938-7-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng Acked-by: Vlastimil Babka Acked-by: Kirill Tkhai Acked-by: Roman Gushchin Cc: Christian König Cc: David Hildenbrand Cc: Davidlohr Bueso Cc: Johannes Weiner Cc: Michal Hocko Cc: Muchun Song Cc: Paul E. McKenney Cc: Shakeel Butt Cc: Sultan Alsawaf Cc: Tetsuo Handa Cc: Yang Shi Signed-off-by: Andrew Morton --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/vmscan.c~mm-vmscan-hold-write-lock-to-reparent-shrinker-nr_deferred +++ a/mm/vmscan.c @@ -445,7 +445,7 @@ void reparent_shrinker_deferred(struct m parent = root_mem_cgroup; /* Prevent from concurrent shrinker_info expand */ - down_read(&shrinker_rwsem); + down_write(&shrinker_rwsem); 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 m atomic_long_add(nr, &parent_info->nr_deferred[i]); } } - up_read(&shrinker_rwsem); + up_write(&shrinker_rwsem); } static bool cgroup_reclaim(struct scan_control *sc) _ Patches currently in -mm which might be from zhengqi.arch@bytedance.com are