From nobody Sun Apr 19 12:16:09 2026 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 5056CC433FE for ; Thu, 24 Nov 2022 12:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230215AbiKXMC5 (ORCPT ); Thu, 24 Nov 2022 07:02:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbiKXMCv (ORCPT ); Thu, 24 Nov 2022 07:02:51 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24A8F2127F; Thu, 24 Nov 2022 04:02:49 -0800 (PST) Date: Thu, 24 Nov 2022 12:02:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669291367; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nGS/hvRF10lu7QVgF9WyaRpiPH6jTeNQcYGRIQ/PSD0=; b=2PRxx0KTmmbrDeiiRaQTYrdbjEmdZVymmDfJVsB2fmb+UErKb81U8XEYDS4NHtsxw7tG/y Vg7r7qk5+6jfEQQ5tpDapIaDNAd0KIfaCNGGQKmPN6wdvzFb1RskY5GUKCXQH/3x/26btc lzQ0zFKM2Nf0StGCTm7vCgV3li/gtbXIPSskVDGGPQgYCgpQb4oSOyH/JWbfYAmY8xLZkF 3nifYyou5gJi4l7NfujL5PnxAC4cqo2vc4DZpatBrsHC8MGgABEb2If5CZC+xsHoPF813o cHvtKAE7i0+50eGREG341/yMiqltp8SzwG4Cf4nxdTH9lUnr1P0Mchk/D/RPLQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669291367; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nGS/hvRF10lu7QVgF9WyaRpiPH6jTeNQcYGRIQ/PSD0=; b=FnMRinLZm3K23ft2Ei43dAvQy9fz8pUb+ljub8zebOHVbn9tzzuqDgI8Pb1TswZAlG6PG8 ZP7AKHh2nu8b/OCQ== From: "tip-bot2 for Xiongfeng Wang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/x86/intel/uncore: Fix reference count leak in __uncore_imc_init_box() Cc: Xiongfeng Wang , "Peter Zijlstra (Intel)" , Kan Liang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221118063137.121512-5-wangxiongfeng2@huawei.com> References: <20221118063137.121512-5-wangxiongfeng2@huawei.com> MIME-Version: 1.0 Message-ID: <166929136561.4906.7024014348195784248.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 17b8d847b92d815d1638f0de154654081d66b281 Gitweb: https://git.kernel.org/tip/17b8d847b92d815d1638f0de154654081= d66b281 Author: Xiongfeng Wang AuthorDate: Fri, 18 Nov 2022 14:31:37 +08:00 Committer: Peter Zijlstra CommitterDate: Thu, 24 Nov 2022 11:09:26 +01:00 perf/x86/intel/uncore: Fix reference count leak in __uncore_imc_init_box() pci_get_device() will increase the reference count for the returned pci_dev, so tgl_uncore_get_mc_dev() will return a pci_dev with its reference count increased. We need to call pci_dev_put() to decrease the reference count before exiting from __uncore_imc_init_box(). Add pci_dev_put() for both normal and error path. Fixes: fdb64822443e ("perf/x86: Add Intel Tiger Lake uncore support") Signed-off-by: Xiongfeng Wang Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kan Liang Link: https://lore.kernel.org/r/20221118063137.121512-5-wangxiongfeng2@huaw= ei.com --- arch/x86/events/intel/uncore_snb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/unc= ore_snb.c index 1ef4f78..1f48692 100644 --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -1338,6 +1338,7 @@ static void __uncore_imc_init_box(struct intel_uncore= _box *box, /* MCHBAR is disabled */ if (!(mch_bar & BIT(0))) { pr_warn("perf uncore: MCHBAR is disabled. Failed to map IMC free-running= counters.\n"); + pci_dev_put(pdev); return; } mch_bar &=3D ~BIT(0); @@ -1352,6 +1353,8 @@ static void __uncore_imc_init_box(struct intel_uncore= _box *box, box->io_addr =3D ioremap(addr, type->mmio_map_size); if (!box->io_addr) pr_warn("perf uncore: Failed to ioremap for %s.\n", type->name); + + pci_dev_put(pdev); } =20 static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *b= ox)