Commit 4a627b0b authored by Sean Christopherson's avatar Sean Christopherson
Browse files

Merge branch 'kvm-5.20-msr-eperm' 

Merge a bug fix and cleanups for {g,s}et_msr_mce() using a base that
predates commit 281b5278 ("KVM: x86: Add emulation for
MSR_IA32_MCx_CTL2 MSRs."), which was written with the intention that it
be applied _after_ the bug fix and cleanups.  The bug fix in particular
needs to be sent to stable trees; give them a stable hash to use.
parents b9b71f43 54ad60ba

arch/x86/kvm/x86.c

+3 −3
Original line number Diff line number Diff line
@@ -3259,8 +3259,8 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		 * issue on AMD K8s, allow bit 10 to be clear when setting all

		 * other bits in order to avoid an uncaught #GP in the guest.

		 *

			 * UNIXWARE clears bit 0 of MC1_CTL to ignore

			 * correctable, single-bit ECC data errors.

		 * UNIXWARE clears bit 0 of MC1_CTL to ignore correctable,

		 * single-bit ECC data errors.

		 */

		if (is_mci_control_msr(msr) &&

		    data != 0 && (data | (1 << 10) | 1) != ~(u64)0)