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

chao-p · bonzini · commit 96794e4ed4d7 · 2017-02-21T12:45:49.000+01:00
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: Chao Peng &lt;chao.p.peng@linux.intel.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -3905,7 +3905,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save)`
`3905`	`3905`	`}`
`3906`	`3906`
`3907`	`3907`	`vmcs_write16(sf->selector, var.selector);`
`3908`		`- vmcs_write32(sf->base, var.base);`
	`3908`	`+ vmcs_writel(sf->base, var.base);`
`3909`	`3909`	`vmcs_write32(sf->limit, var.limit);`
`3910`	`3910`	`vmcs_write32(sf->ar_bytes, vmx_segment_access_rights(&var));`
`3911`	`3911`	`}`
`@@ -8270,7 +8270,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm)`
`8270`	`8270`	`static void vmx_dump_sel(char *name, uint32_t sel)`
`8271`	`8271`	`{`
`8272`	`8272`	`pr_err("%s sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016lx\n",`
`8273`		`- name, vmcs_read32(sel),`
	`8273`	`+ name, vmcs_read16(sel),`
`8274`	`8274`	`vmcs_read32(sel + GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR),`
`8275`	`8275`	`vmcs_read32(sel + GUEST_ES_LIMIT - GUEST_ES_SELECTOR),`
`8276`	`8276`	`vmcs_readl(sel + GUEST_ES_BASE - GUEST_ES_SELECTOR));`