Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2604453lqp; Mon, 25 Mar 2024 04:16:35 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCU46uwV7qclrmqC/Ta7ECOV8a73N0hI4oZZSK5jRCxDU0iEgNmslG3ShbsfHmP0hWmDA9gwiegdbaNFAPJxP4q3oSQgw5HWGrX6qg+0Yg== X-Google-Smtp-Source: AGHT+IFcJzHBucm3E2zCcmhW/NYjKKbDQ2Ip+wYuDRHDh87EzY3+3NmkdjhVhR3gth+1bEs9nw8H X-Received: by 2002:a17:907:98c:b0:a47:53be:5e6c with SMTP id bf12-20020a170907098c00b00a4753be5e6cmr2752093ejc.34.1711365394900; Mon, 25 Mar 2024 04:16:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711365394; cv=pass; d=google.com; s=arc-20160816; b=bcditufMQe2nX15YN+3BCDrDEp0Y3N2rsPOWU8XGGIS5lBq9s8DtaSJ1SBZ+BbnAXo 5t/tJAvdE7yKoPWJlc3C9ycVjv0zPiIPAJSqYW3pFf9ah0NuTayAVR2UEXYkBSm0aVWs v1zh4D22vBLUA3m202vGVGsQ9xiytsNgzetDYfcnXtQX4U+qUhfgyhNELR2dt+0e1s1F 0DZEGerUEFSoNjCsOeY1kax5WdG9FPpco+OyI22zdTEpp6Hv7e4iQTNAZ4BwquhNRX5v E1H1koUM6IOrtLsrwMfz84dNq7WNcokN450LEEwywc+IxYntlXkZ73kemWbCF3+TNXrP Nwsw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=7kX9jF5t2YZGK4ALN5X/khojKSw/q+mt6YP6igzmUHo=; fh=wx5ZU2OMbgz9/o/gcfz5eLEh8K5hLqQWUDyGrZJgqRg=; b=YHT/BTzv+0lYMTNQuMU0wCPUMaRmLEGPa/0xRw7I2xQgCJ/2PgrqbVcYF6NfP1fyZK +F9QBdijW5bzPFvTqfs+F6HVIzM7KuzeLIYYvR4hbDTYCeteICuDYtg55i5EXxEHZlvn tuq1kbSAOk1TOHU60lZrOVUT/X2esgYN4px0p9ByEzISqiqLXHIX/WCDi55zHKbfxqug SlaEX6L2cr5itK7gJBV1uMhDCXMBL+u1t0KGSjHVch9V1iGf9Dk2JVhtQZsBjxko3ZUp An4rMNJDMiiPML7UGqhUj4rYQcWeIl53kLRQZxqwdlei6ZRVkxWiHqBo/xjlDm9qEIq3 aNzg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="jZFcGVc/"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115544-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115544-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id g18-20020a170906539200b00a46939478fcsi2434240ejo.799.2024.03.25.04.16.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 04:16:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115544-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="jZFcGVc/"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115544-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115544-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 63F341F36430 for ; Mon, 25 Mar 2024 11:16:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8E12F249F39; Mon, 25 Mar 2024 02:43:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jZFcGVc/" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7161212C7F7; Sun, 24 Mar 2024 22:57:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321044; cv=none; b=BGkG+biV/JKtVFnsqwGNugrY49KTFRzLFxQO7P2j+ssbUQiE4v7+SmiDTiCBzLqekzO5buMbAqqzdgUeagjYcl0pNMN0Bc1PsazPqYYRBEmSmqCs5ZqaA4CjRQFTYUz7z+QSPoazfIPegez9Fdk46QLwNTPwolxJiJfgW+o9d9Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321044; c=relaxed/simple; bh=4BADOKphyuUfmCRX7mXKv8O7VvmswaFVZ+psMdvd1xI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wr8rDJsNNJB3ORiXF5EZSURcdgL2blxFpzgilLNhwH2nZvN1w2EN8OObhfr0hzB45357FqgqouwWvqaRhy9JqV7IXcnVw6SIwzsob4ZB2q6smihPjijiDVZqeyAnTfuFIOvTFJrn2rIgItit5ltsjLsDhR7uxn/eN86FGJ57xMY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jZFcGVc/; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D660C43390; Sun, 24 Mar 2024 22:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321044; bh=4BADOKphyuUfmCRX7mXKv8O7VvmswaFVZ+psMdvd1xI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZFcGVc/AWVQZqfAgRCJvLuLjtqn38/h8CcfdprOgHO7aPZNg3R6F93ij2Kbvldul MW3idzpZUCviq671/fT0VUZIS3HtsHavcq60o/Cd/1b7PiX3YYb24FxvQtHruTLtbr oTbrT+RDeKnT8kUEevmSK4an9vC86zzvG2WIW7CUU9VeCWw9PpDeXZch780pHGBE1w T5IktDXTsLtWuRFsFg/8QCVL68yM8EC/IX7QdsJxIDK/9DEFdV9ozf/hy5+p0K6XEw IjI+vQp3rd6VYHM7NV0RyeYkN7PvrhUl4cuLJCZS8XrkW4kT6OUb/DZg9x/5Rv42+A 1qa3OxKRTkIXA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sandipan Das , Mario Limonciello , Ingo Molnar , Peter Zijlstra , Sasha Levin Subject: [PATCH 6.7 607/713] perf/x86/amd/core: Avoid register reset when CPU is dead Date: Sun, 24 Mar 2024 18:45:33 -0400 Message-ID: <20240324224720.1345309-608-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Sandipan Das [ Upstream commit ad8c91282c95f801c37812d59d2d9eba6899b384 ] When bringing a CPU online, some of the PMC and LBR related registers are reset. The same is done when a CPU is taken offline although that is unnecessary. This currently happens in the "cpu_dead" callback which is also incorrect as the callback runs on a control CPU instead of the one that is being taken offline. This also affects hibernation and suspend to RAM on some platforms as reported in the link below. Fixes: 21d59e3e2c40 ("perf/x86/amd/core: Detect PerfMonV2 support") Reported-by: Mario Limonciello Signed-off-by: Sandipan Das Signed-off-by: Ingo Molnar Cc: Peter Zijlstra Link: https://lore.kernel.org/r/550a026764342cf7e5812680e3e2b91fe662b5ac.1706526029.git.sandipan.das@amd.com Signed-off-by: Sasha Levin --- arch/x86/events/amd/core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c index e24976593a298..5365d6acbf090 100644 --- a/arch/x86/events/amd/core.c +++ b/arch/x86/events/amd/core.c @@ -604,7 +604,6 @@ static void amd_pmu_cpu_dead(int cpu) kfree(cpuhw->lbr_sel); cpuhw->lbr_sel = NULL; - amd_pmu_cpu_reset(cpu); if (!x86_pmu.amd_nb_constraints) return; -- 2.43.0