From patchwork Mon Jul 24 09:43:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 124772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1702477vqg; Mon, 24 Jul 2023 03:25:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlF06SkCav4N3iYWbOBi/TGMJOZwJWSvjFdT7FlUZf/HyZz7br+k0jKHjqKAboUqYp5OlNXq X-Received: by 2002:a05:6512:542:b0:4fb:a0f5:d88d with SMTP id h2-20020a056512054200b004fba0f5d88dmr4907828lfl.42.1690194309141; Mon, 24 Jul 2023 03:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690194309; cv=none; d=google.com; s=arc-20160816; b=yDFDJJ6mTh930DO4G1IMgchEZHMisEWyjQx79Uxt+7XwKBb4EAWweB9O1DOZulpjUp jYSKOyEgTq6T5KEweFr4XRjnZW1R4lYHo/Wk50gL4o8x/1nbeUHE90BggBv0lT9Dclh5 FXixaMhw+8g8HljL6R9wXoV6AbzWz6r8dEr6IN5la9pfRCCX1AM1VhX6SS/1uhJ0PVhE hCtJk9+FyuH5A+W25uyiqC32ghaIJXRTC13SpoAKjLXR7eJHC+gBLBlIMLyGjdMpYXL0 i9WHYjyfEV+IEhr9P/1NbQ5rnZdUK7DVFhkQ3tg7W+G5IPERK1ETTWl4XOQIvKV1zES1 YVag== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CMESg6KcZ1f/x8j8WNeV/0Ezds9kYbd4Innm/bU0Ooo=; fh=3lDHiAuENCYj3gWFb2bYij2cH/UC7c23rwbOpuSBNc8=; b=QuqGBb4+R878CUGilHN+7pLtTaDlJoIzAysh0sazqXSZwVshoaL4+t3/mQgiiDVWI/ RdTWSwm58jcufoFhlMeE/FhmZLVgrZ0dlJg3SViY0mUN+19MppIpF5isvD9HNfdwrW1I DAZy5WCJjygYTlgOEVH3oh5cdpllmPYVGkjmaLEx2InsIx1laCjr2+s6kiIiTfoESDYG w/RXoipb72Y7WKI/Ogn6RF8KP+kVHiO3PhitJ44hj3JW6eMhljOJlaRxV8PAICi6Q4t7 WnGNY0I2aRh4K1VcWlZZKzAm6r4gIEQZPoESvU0CGCO+x+o36wxRPlgvTUmiHx0K7nzg 0BAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=dwKlx1oQ; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d1-20020aa7d5c1000000b0052231fbd962si858106eds.417.2023.07.24.03.24.45; Mon, 24 Jul 2023 03:25:09 -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=@bytedance.com header.s=google header.b=dwKlx1oQ; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233037AbjGXKEZ (ORCPT + 99 others); Mon, 24 Jul 2023 06:04:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233587AbjGXKD6 (ORCPT ); Mon, 24 Jul 2023 06:03:58 -0400 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33B2155BC for ; Mon, 24 Jul 2023 02:56:08 -0700 (PDT) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b7dfb95761so5887635ad.1 for ; Mon, 24 Jul 2023 02:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690192457; x=1690797257; 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=CMESg6KcZ1f/x8j8WNeV/0Ezds9kYbd4Innm/bU0Ooo=; b=dwKlx1oQ8gC3FGBisAur+bDXIIsIsnjGtPcpy7zH7OHDzky5UKxSTJ05GXNV3ifxFh uFNY+8ub7jUvRzU2N0mzwWkyUcySnlCtwLD3JQfZApULo5o50SUYvFf7wmqQeUGg+K3w AqzVxAjjzV5PNtSqJauuHxoQULcgDnOjWhlM27zpLCCDDjhxzzb13/oecO1ube7S7m7P 1safwLAq/c10jFTLUU1Xqd0TB13zkKzwSGxlgMOCVqCgGIAn0g9Om1mA4z6ti880Mese Evcqc6hGgzGiGoOdWdO80KWYfeQwXeXM+h1Vq8tuq+SebTbp5eEFtPf8XLS7hjdlVp+9 zxcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690192457; x=1690797257; 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=CMESg6KcZ1f/x8j8WNeV/0Ezds9kYbd4Innm/bU0Ooo=; b=I5P77xcSdMfRKwr2PRzyBr5u1IXSq/OyPbbiMzZ07gG2lB5CniwKSCnkbkP+f6nGA+ eAog8fPcu0HaphVR3sM55rps4zEUfdJ5j0Cv+s3HHdF3vcgce/WuNE4oSfMDccA0yWor RUGilRqfl46VctdkgyDNMzxyah9MQe4rq422f1mry8XXzL2m0aGDElIKy2y3k596N3Us Jgqfx8AkxiAjXQqD7Y+RVrHiF/SAFb6JFtJwSosst17IZGsJLiHcmN7gIoncxwW+FZrG ZjheFpi3/9pUe/FvFjf9lCOeDRvR64Ebb0+DE6SrFsunzXO+FA55nAKMJKdrDNvJM6Sq qy3w== X-Gm-Message-State: ABy/qLZDnN8Pf2FOlo2mlvMrhvOEy72XqUIUVF0Gvly72fKN7HnUzeIF lXLiv/zwU6bwoCpohRU9WF2hwg== X-Received: by 2002:a17:902:dacf:b0:1b8:9215:9163 with SMTP id q15-20020a170902dacf00b001b892159163mr12209813plx.6.1690192456927; Mon, 24 Jul 2023 02:54:16 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id d5-20020a170902c18500b001bb20380bf2sm8467233pld.13.2023.07.24.02.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 02:54:16 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH v2 46/47] mm: shrinker: hold write lock to reparent shrinker nr_deferred Date: Mon, 24 Jul 2023 17:43:53 +0800 Message-Id: <20230724094354.90817-47-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230724094354.90817-1-zhengqi.arch@bytedance.com> References: <20230724094354.90817-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: INBOX X-GMAIL-THRID: 1772297187503364552 X-GMAIL-MSGID: 1772297187503364552 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. Signed-off-by: Qi Zheng --- mm/shrinker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/shrinker.c b/mm/shrinker.c index 744361afd520..90c045620fe3 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -303,7 +303,7 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) 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); @@ -316,7 +316,7 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) } } } - up_read(&shrinker_rwsem); + up_write(&shrinker_rwsem); } #else static int shrinker_memcg_alloc(struct shrinker *shrinker)