Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp397726rwb; Wed, 16 Nov 2022 02:11:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf7/ROgmyNpLQwW5XGq+77yn+Hz3qilr0mswO+gaJwywkJmklNwp7PiqTM+mCepVEG1G0e5M X-Received: by 2002:a05:6a00:4c0b:b0:562:ebc8:6195 with SMTP id ea11-20020a056a004c0b00b00562ebc86195mr22580022pfb.38.1668593490962; Wed, 16 Nov 2022 02:11:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668593490; cv=none; d=google.com; s=arc-20160816; b=mURoeDqmkXitpf5FtUzVN0pzAFasBWcz+kK3vBoUU1soKet3DLyPvnzrh6O2uR2vef AgN8IYi4Po72IuTn9BDgcso9lNFCKEGKZPqxop5I8V9QDJnqBL2F/iaj5iAM67AwfjVe Cbw8aKv85G33HLDVkmW2p5HHvglzob5qvmLY9YJxZ3A4lx+G2AuRJnKzf0PbVwPPBP2K fnLNz1tkQ8eUzkBJygh/+lazZAcOLox9bgk/Nj7eUguMvgHtFZhx4W/uGSogk0VhlVi3 xEvyjmVdE1ykwbrHQyi0cVg6zlQvZTWKwKtQX9BPrzrftRHox6f+2FPEtazxknTXfmxf 4cCw== 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 :message-id:date:subject:cc:to:from; bh=xGUJUXzdX/TzFuPv7JEHfFu9l29gV2zuDpQvlaBIoZw=; b=wFxNsRaoj+Tl/bOTdIa7kcfFcNft3HLb/xj1M6hbppoRblNlHTAGWyhuiyOfXEfOF6 nVRSOF8L7osjv/rOmmvVLXPN6zfyCE0OW8rluKIOsiWDAycVx1Xpb6mkjFjwBP2W3C5s lYfjrMqiHEDVh4B5bYjWYOQ9wqhuqaHIfQRWjRiK3q2J7KQRJRq7fqfyifF+fMbbqSNj MvONT8sLzVLGSQz4y1mZpBtv0HRbA+7TXxxEBtY6sK5SBgvEpvJpVNiucTK1pxeubBC5 npt1zyFLcBVmsvyAbJebFjVlWKhcUufzHM72P5/JJuonjxtJfgDV+r6YkWXjLg64R24a 9syw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i33-20020a631321000000b00473c36e3b75si15407027pgl.608.2022.11.16.02.11.18; Wed, 16 Nov 2022 02:11:30 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233375AbiKPJwj (ORCPT + 91 others); Wed, 16 Nov 2022 04:52:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231821AbiKPJwg (ORCPT ); Wed, 16 Nov 2022 04:52:36 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CE59D6441; Wed, 16 Nov 2022 01:52:35 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A9BAB1477; Wed, 16 Nov 2022 01:52:41 -0800 (PST) Received: from cam-smtp0.cambridge.arm.com (pierre123.nice.arm.com [10.34.100.128]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CD94D3F663; Wed, 16 Nov 2022 01:52:33 -0800 (PST) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Rob.Herring@arm.com, sudeep.holla@arm.com, Greg Kroah-Hartman , "Rafael J . Wysocki" , Linux-Renesas , Marek Szyprowski , Geert Uytterhoeven , Pierre Gondois , Geert Uytterhoeven Subject: [PATCH -next v2] cacheinfo: Remove of_node_put() for fw_token Date: Wed, 16 Nov 2022 10:49:58 +0100 Message-Id: <20221116094958.2141072-1-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham 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 fw_token is used for DT/ACPI systems to identify CPUs sharing caches. For DT based systems, fw_token is set to a pointer to a DT node. commit 3da72e18371c ("cacheinfo: Decrement refcount in cache_setup_of_node()") doesn't increment the refcount of fw_token anymore in cache_setup_of_node(). fw_token is indeed used as a token and not as a (struct device_node*), so no reference to fw_token should be kept. However, [1] is triggered when hotplugging a CPU multiple times since cache_shared_cpu_map_remove() decrements the refcount to fw_token at each CPU unplugging, eventually reaching 0. Remove of_node_put() for fw_token in cache_shared_cpu_map_remove(). [1] ------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 4 PID: 32 at lib/refcount.c:22 refcount_warn_saturate (lib/refcount.c:22 (discriminator 3)) Modules linked in: CPU: 4 PID: 32 Comm: cpuhp/4 Tainted: G W 6.1.0-rc1-14091-g9fdf2ca7b9c8 #76 Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Oct 31 2022 pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : refcount_warn_saturate (lib/refcount.c:22 (discriminator 3)) lr : refcount_warn_saturate (lib/refcount.c:22 (discriminator 3)) [...] Call trace: [...] of_node_release (drivers/of/dynamic.c:335) kobject_put (lib/kobject.c:677 lib/kobject.c:704 ./include/linux/kref.h:65 lib/kobject.c:721) of_node_put (drivers/of/dynamic.c:49) free_cache_attributes.part.0 (drivers/base/cacheinfo.c:712) cacheinfo_cpu_pre_down (drivers/base/cacheinfo.c:718) cpuhp_invoke_callback (kernel/cpu.c:247 (discriminator 4)) cpuhp_thread_fun (kernel/cpu.c:785) smpboot_thread_fn (kernel/smpboot.c:164 (discriminator 3)) kthread (kernel/kthread.c:376) ret_from_fork (arch/arm64/kernel/entry.S:861) ---[ end trace 0000000000000000 ]--- Fixes: 3da72e18371c ("cacheinfo: Decrement refcount in cache_setup_of_node()") Reported-by: Geert Uytterhoeven Reported-by: Marek Szyprowski Tested-by: Geert Uytterhoeven Tested-by: Sudeep Holla Reviewed-by: Sudeep Holla Signed-off-by: Pierre Gondois --- Notes: v2: - Update commit message. [Sudeep] drivers/base/cacheinfo.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 04317cde800c..950b22cdb5f7 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -317,8 +317,6 @@ static void cache_shared_cpu_map_remove(unsigned int cpu) cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map); cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map); } - if (of_have_populated_dt()) - of_node_put(this_leaf->fw_token); } } -- 2.25.1