From patchwork Thu Nov 24 12:02:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 25473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3355196wrr; Thu, 24 Nov 2022 04:06:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf52wno2HWEEcZVwFiaD8Tz37Z+VhwcfBHvOP3cKX2uOSaYU9ZJDnxDiOgSGe5MEYAOTxF9S X-Received: by 2002:a17:907:d047:b0:7ba:530:223a with SMTP id vb7-20020a170907d04700b007ba0530223amr5681873ejc.215.1669291599890; Thu, 24 Nov 2022 04:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669291599; cv=none; d=google.com; s=arc-20160816; b=LJ7p8OVlm/x2hTEU0N//HDOs+ZkqIAmsrVWJv0+WTGAtshz2YhSB18jLRern6tSv5c sGY1bch7kzSmtcJ7tRfzynQ6Dowd9AnAnOS7DC7vDBAQp/Cd65Br6lXEI3jwjt9s2LMz HUDMBm/TbKX5c7ZF+gCbW4Ha08qmPeLMQDDJ6eRRoQMGp0z/dUM+VfcKurmd2xUVKnF+ N/l6DalxDhZzEOrYw5t8oa7zUrzAYq7OcX9ILj1Ioz/l6uJCl/uNRgqW6d3s9CcUeI4Z boe5BZbasvubfJXYVU4l1ZUKaI9uTleWO90rmKwm7X+mnGduHToedJbMaiuttqWh+Oym TUzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=nGS/hvRF10lu7QVgF9WyaRpiPH6jTeNQcYGRIQ/PSD0=; b=Fw9D5aodb8lJ2JeyCWDvM1n9haUP995M6fuzAnC7p5OdXieO5IvX6kwy3AZwaNpv62 Yy8Qu578wmD1tGtiajRYR5S7OwApjO3RFhqkDar10isMVYopmz9c7E1E+WexDOg+JR3H 43FerGRMFfALSN7TAuOx/URw0ZuM4TDqe6zx0eF1qTxzg5fDpiPk2+dHV6NgiXiwpxKy L4IWU6hUgAWA/Kmya+tRGbvMATrtIsBFrgiUIf9hNJR7nCV7A3F+8iGLI7gkfMOtJdeU LOpVyNmKxtzeUz8xJIfLx1His1VNs5TJSj6899AkugDUf+W2lVf0exWRMgpB0sHlcs5h Wwbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2PRxx0KT; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=FnMRinLZ; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs41-20020a1709072d2900b007b273d1f664si874896ejc.128.2022.11.24.04.06.16; Thu, 24 Nov 2022 04:06:39 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2PRxx0KT; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=FnMRinLZ; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230199AbiKXMC5 (ORCPT + 99 others); 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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750379108837797207?= X-GMAIL-MSGID: =?utf-8?q?1750379108837797207?= The following commit has been merged into the perf/core branch of tip: Commit-ID: 17b8d847b92d815d1638f0de154654081d66b281 Gitweb: https://git.kernel.org/tip/17b8d847b92d815d1638f0de154654081d66b281 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@huawei.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/uncore_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 &= ~BIT(0); @@ -1352,6 +1353,8 @@ static void __uncore_imc_init_box(struct intel_uncore_box *box, box->io_addr = 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); } static void tgl_uncore_imc_freerunning_init_box(struct intel_uncore_box *box)