Commit eeb69eab authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

KVM: x86: Mask off reserved bits in CPUID.80000006H 



KVM_GET_SUPPORTED_CPUID should only enumerate features that KVM
actually supports. CPUID.80000006H:EDX[17:16] are reserved bits and
should be masked off.

Fixes: 43d05de2 ("KVM: pass through CPUID(0x80000006)")
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Message-Id: <20220929225203.2234702-2-jmattson@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0469e56a

arch/x86/kvm/cpuid.c

+2 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
		cpuid_entry_override(entry, CPUID_8000_0001_ECX);

		break;

	case 0x80000006:

		/* L2 cache and TLB: pass through host info. */

		/* Drop reserved bits, pass host L2 cache and TLB info. */

		entry->edx &= ~GENMASK(17, 16);

		break;

	case 0x80000007: /* Advanced power management */

		/* invariant TSC is CPUID.80000007H:EDX[8] */