Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fe63979 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: VMX: Move private memory slot position 



PCI device assignment would map guest MMIO spaces as separate slot, so it is
possible that the device has more than 2 MMIO spaces and overwrite current
private memslot.

The patch move private memory slot to the top of userspace visible memory slots.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 291f26bc

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -2513,7 +2513,7 @@ static int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr) 
{

	int ret;

	struct kvm_userspace_memory_region tss_mem = {

		.slot = 8,

		.slot = TSS_PRIVATE_MEMSLOT,

		.guest_phys_addr = addr,

		.memory_size = PAGE_SIZE * 3,

		.flags = 0,

arch/x86/kvm/vmx.h

+3 −2
Original line number Diff line number Diff line
@@ -338,8 +338,9 @@ enum vmcs_field { 


#define AR_RESERVD_MASK 0xfffe0f00



#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT	9

#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT	10

#define TSS_PRIVATE_MEMSLOT			(KVM_MEMORY_SLOTS + 0)

#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT	(KVM_MEMORY_SLOTS + 1)

#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT	(KVM_MEMORY_SLOTS + 2)



#define VMX_NR_VPIDS				(1 << 16)

#define VMX_VPID_EXTENT_SINGLE_CONTEXT		1