From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17C98C433F5 for ; Wed, 6 Oct 2021 11:13:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 059F861100 for ; Wed, 6 Oct 2021 11:13:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238636AbhJFLP2 (ORCPT ); Wed, 6 Oct 2021 07:15:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:38500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238488AbhJFLOs (ORCPT ); Wed, 6 Oct 2021 07:14:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C24F611C0; Wed, 6 Oct 2021 11:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633518776; bh=8coLEvTXL4KXNpwhCxiSBgpeX6FK61LziPauTfQSalU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RVjO2h7ihgvGOPs+XM54UkWnXyb++kD2Y2iQhB631zwcq16YD6lCMeBKzJzNjIe0D 7IhMuDFSwAUbpKzzWI0ldte9A3MBZz37e37mrNVObAaW96tKmZp+oCjsMmsyhBS+br gBxSx61qlzG2aUVUqKWoJdW5j/DhDN96x9aD2bd5vsYnXPNrMMxG+qF4Jv5lQpVlnh n38IVEN8IhafXeGUniTqDgcWEwXehTzyb9BWEu6yDkLH2k2POdrV9hhkn0nzk3PvuO EsASQTZNgbFuCW54pRIKhaxmx6CyXxxHrYAtHBU5Jqgsz+g8q+ruLQZKMsAb+kFFbQ Ip1wBavrEV1iw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fares Mehanna , Paolo Bonzini , Sasha Levin , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, kvm@vger.kernel.org Subject: [PATCH MANUALSEL 5.4 3/4] kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[] Date: Wed, 6 Oct 2021 07:12:49 -0400 Message-Id: <20211006111250.264294-3-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211006111250.264294-1-sashal@kernel.org> References: <20211006111250.264294-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Fares Mehanna [ Upstream commit e1fc1553cd78292ab3521c94c9dd6e3e70e606a1 ] Intel PMU MSRs is in msrs_to_save_all[], so add AMD PMU MSRs to have a consistent behavior between Intel and AMD when using KVM_GET_MSRS, KVM_SET_MSRS or KVM_GET_MSR_INDEX_LIST. We have to add legacy and new MSRs to handle guests running without X86_FEATURE_PERFCTR_CORE. Signed-off-by: Fares Mehanna Message-Id: <20210915133951.22389-1-faresx@amazon.de> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/x86.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 69e286edb2c9..4948bf36bd0a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1239,6 +1239,13 @@ static const u32 msrs_to_save_all[] = { MSR_ARCH_PERFMON_EVENTSEL0 + 12, MSR_ARCH_PERFMON_EVENTSEL0 + 13, MSR_ARCH_PERFMON_EVENTSEL0 + 14, MSR_ARCH_PERFMON_EVENTSEL0 + 15, MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17, + + MSR_K7_EVNTSEL0, MSR_K7_EVNTSEL1, MSR_K7_EVNTSEL2, MSR_K7_EVNTSEL3, + MSR_K7_PERFCTR0, MSR_K7_PERFCTR1, MSR_K7_PERFCTR2, MSR_K7_PERFCTR3, + MSR_F15H_PERF_CTL0, MSR_F15H_PERF_CTL1, MSR_F15H_PERF_CTL2, + MSR_F15H_PERF_CTL3, MSR_F15H_PERF_CTL4, MSR_F15H_PERF_CTL5, + MSR_F15H_PERF_CTR0, MSR_F15H_PERF_CTR1, MSR_F15H_PERF_CTR2, + MSR_F15H_PERF_CTR3, MSR_F15H_PERF_CTR4, MSR_F15H_PERF_CTR5, }; static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)]; -- 2.33.0