From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6045F3EB110; Tue, 30 Jun 2026 09:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782810588; cv=none; b=F6S9oIXIEoJbmJT6nUJfE0v9mMMyIbPFsioeOtBIrl1ogcGfHWpqRmh3H4Y5puNehAF3WmFcDE/7VB4NtHoihMsLGa2RygQpzJJ997ZIS0GHLMn3NR/GyUkuuPZRUH8PjIM6GTSGVbIvGMqYIRWb5xahtgoUomv1ZYWGeuUTvYo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782810588; c=relaxed/simple; bh=nnGtC/XJ+YpN4ptQ/FKPs61V5C6pZ/+rQJlCmlIjgYA=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=hbZUhKmmOQ8yFcvqq+NojrIW808qY7zDdFYPifkcB1m4nqaQdE34/T7Ddrq0NaZdD2SjFKiOxDzgHHJTCXzPYYtKUEbc0Ohc4WxnMsPdGxC63KbXZLVeNQM9EMQOKlvvoIKOUKLbenOn5Z+udaUBWwIagaDxJSIAzDEhvUmKLGc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=masDyXvS; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=lAi96TO3; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="masDyXvS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="lAi96TO3" Date: Tue, 30 Jun 2026 09:09:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1782810586; 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=SlmPQY8nCoarAsRmAA5WA0h3LieUZvYq33E4uEEC3xk=; b=masDyXvSze4sobVXXy0nBGgHVOuW+QRPM2WLmqlE3iyPrnBE9uNdzOBBQrKs6MEGXVZfYs dWN2CuL06LTfcBsng3sjcRLD8fnNGVDi1gNHLOFmWje3AUEQieigEsGLLjorQf3BrH0nb+ V5NGgm8nCuwEvDogWRa31+JcBYCjnMfjfLDTZfhOam+DHAzeG5n30+YSqN/yH9paxBFG21 1zTtlmCUpqOG70DQANCley2R4SNLKBfubTOPeiRVwy7tFluq99k6wKUqlVkH2JAnt8O0oW kybw0u6E8yy/O4icWNG3hJClUlZ1P3ZaPbHSKJ2LWt/5wY6Nyr6JLO3nqL5lUA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1782810586; 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=SlmPQY8nCoarAsRmAA5WA0h3LieUZvYq33E4uEEC3xk=; b=lAi96TO3KksWbWzuNcrRLvS3JwjbjY81qyT7lwY5PL7jW6LUOSAEgO2ji+OEJEt2SNy6fn 1fc9mzh6VaocpRDQ== From: "tip-bot2 for Zide Chen" 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: Keep PCI PMUs working when MMIO/MSR setup fails Cc: Zide Chen , "Peter Zijlstra (Intel)" , Ian Rogers , Dapeng Mi , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260611160033.66760-5-zide.chen@intel.com> References: <20260611160033.66760-5-zide.chen@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178281058466.3843924.11716100941720767301.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: 3012af7df3430788eddd30b3c6654d0a0a5f06c6 Gitweb: https://git.kernel.org/tip/3012af7df3430788eddd30b3c6654d0a0a5= f06c6 Author: Zide Chen AuthorDate: Thu, 11 Jun 2026 09:00:29 -07:00 Committer: Peter Zijlstra CommitterDate: Tue, 30 Jun 2026 10:57:04 +02:00 perf/x86/intel/uncore: Keep PCI PMUs working when MMIO/MSR setup fails uncore_event_cpu_online() returns -ENOMEM early when both the MSR and MMIO box allocations fail. This also aborts PCI uncore setup, even though PCI PMUs are independent of the MSR/MMIO paths. Remove the early return so PCI uncore setup always runs regardless of whether MSR or MMIO box allocation succeeds. Fixes: 3da04b8a00dd ("perf/x86/intel/uncore: Support MMIO type uncore blocks") Signed-off-by: Zide Chen Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Ian Rogers Reviewed-by: Dapeng Mi Link: https://patch.msgid.link/20260611160033.66760-5-zide.chen@intel.com --- arch/x86/events/intel/uncore.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 21c8ed1..eae335d 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1636,8 +1636,6 @@ static int uncore_event_cpu_online(unsigned int cpu) die =3D topology_logical_die_id(cpu); msr_ret =3D uncore_box_ref(uncore_msr_uncores, die, cpu); mmio_ret =3D uncore_box_ref(uncore_mmio_uncores, die, cpu); - if (msr_ret && mmio_ret) - return -ENOMEM; =20 /* * Check if there is an online cpu in the package