From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Subject: Re: [PATCH 3/3] x86/kvm: Handle all MCA banks Date: Fri, 22 Jun 2018 20:16:04 +0200 Message-ID: <20180622181603.GB5549@flask> References: <20180622095101.32587-1-bp@alien8.de> <20180622095101.32587-4-bp@alien8.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: KVM , Joerg Roedel , Tom Lendacky , Tony Luck , Yazen Ghannam , LKML To: Borislav Petkov Return-path: Content-Disposition: inline In-Reply-To: <20180622095101.32587-4-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org 2018-06-22 11:51+0200, Borislav Petkov: > From: Borislav Petkov > > Extend the range of MCA banks which get passed to set/get_msr_mce() to > include all the MSRs of the last bank too. > > Signed-off-by: Borislav Petkov > --- > arch/x86/kvm/x86.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 80452b0f0e8c..a7d344823356 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -2466,7 +2466,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > > case MSR_IA32_MCG_CTL: > case MSR_IA32_MCG_STATUS: > - case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_CTL(KVM_MAX_MCE_BANKS) - 1: > + case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_MISC(KVM_MAX_MCE_BANKS) - 1: It was correct before. We have 32 banks (KVM_MAX_MCE_BANKS), so the last useable has index 31 and the "- 1" is going to roll over from first MSR of bank 32 to the last MSR of the last bank. Another way of writing it would be: case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_MISC(KVM_MAX_MCE_BANKS - 1): > return set_msr_mce(vcpu, msr_info); > > case MSR_K7_PERFCTR0 ... MSR_K7_PERFCTR3: > @@ -2588,9 +2588,10 @@ static int get_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) > case MSR_IA32_MCG_STATUS: > data = vcpu->arch.mcg_status; > break; > + > default: > if (msr >= MSR_IA32_MC0_CTL && > - msr < MSR_IA32_MCx_CTL(bank_num)) { > + msr < MSR_IA32_MCx_MISC(bank_num)) { Similar logic here. I think it would be best just to keep the current code, thanks.