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

Commit 96794e4e authored by Chao Peng's avatar Chao Peng Committed by Paolo Bonzini
Browse files

KVM: VMX: use correct vmcs_read/write for guest segment selector/base 



Guest segment selector is 16 bit field and guest segment base is natural
width field. Fix two incorrect invocations accordingly.

Without this patch, build fails when aggressive inlining is used with ICC.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChao Peng <chao.p.peng@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b7ffc44d

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -3905,7 +3905,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save) 
	}



	vmcs_write16(sf->selector, var.selector);

	vmcs_write32(sf->base, var.base);

	vmcs_writel(sf->base, var.base);

	vmcs_write32(sf->limit, var.limit);

	vmcs_write32(sf->ar_bytes, vmx_segment_access_rights(&var));

}
@@ -8270,7 +8270,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm) 
static void vmx_dump_sel(char *name, uint32_t sel)

{

	pr_err("%s sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016lx\n",

	       name, vmcs_read32(sel),

	       name, vmcs_read16(sel),

	       vmcs_read32(sel + GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR),

	       vmcs_read32(sel + GUEST_ES_LIMIT - GUEST_ES_SELECTOR),

	       vmcs_readl(sel + GUEST_ES_BASE - GUEST_ES_SELECTOR));