83 lines
2.9 KiB
Diff
83 lines
2.9 KiB
Diff
|
# Commit 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c
|
||
|
|
# Date 2013-11-05 14:51:53 +0100
|
||
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
x86/HVM: 32-bit IN result must be zero-extended to 64 bits
|
||
|
|
|
||
|
|
Just like for all other operations with 32-bit operand size.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
||
|
|
|
||
|
|
# Commit 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41
|
||
|
|
# Date 2013-11-15 11:01:49 +0100
|
||
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2)
|
||
|
|
|
||
|
|
Just spotted a counterpart of what commit 9d89100b (same title) dealt
|
||
|
|
with.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/hvm/io.c
|
||
|
|
+++ b/xen/arch/x86/hvm/io.c
|
||
|
|
@@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigne
|
||
|
|
return handle_mmio();
|
||
|
|
}
|
||
|
|
|
||
|
|
-int handle_pio(uint16_t port, int size, int dir)
|
||
|
|
+int handle_pio(uint16_t port, unsigned int size, int dir)
|
||
|
|
{
|
||
|
|
struct vcpu *curr = current;
|
||
|
|
struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io;
|
||
|
|
unsigned long data, reps = 1;
|
||
|
|
int rc;
|
||
|
|
|
||
|
|
+ ASSERT((size - 1) < 4 && size != 3);
|
||
|
|
+
|
||
|
|
if ( dir == IOREQ_WRITE )
|
||
|
|
data = guest_cpu_user_regs()->eax;
|
||
|
|
|
||
|
|
@@ -237,7 +239,12 @@ int handle_pio(uint16_t port, int size,
|
||
|
|
{
|
||
|
|
case X86EMUL_OKAY:
|
||
|
|
if ( dir == IOREQ_READ )
|
||
|
|
- memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size);
|
||
|
|
+ {
|
||
|
|
+ if ( size == 4 ) /* Needs zero extension. */
|
||
|
|
+ guest_cpu_user_regs()->rax = (uint32_t)data;
|
||
|
|
+ else
|
||
|
|
+ memcpy(&guest_cpu_user_regs()->rax, &data, size);
|
||
|
|
+ }
|
||
|
|
break;
|
||
|
|
case X86EMUL_RETRY:
|
||
|
|
if ( vio->io_state != HVMIO_awaiting_completion )
|
||
|
|
@@ -281,8 +288,10 @@ void hvm_io_assist(void)
|
||
|
|
(void)handle_mmio();
|
||
|
|
break;
|
||
|
|
case HVMIO_handle_pio_awaiting_completion:
|
||
|
|
- memcpy(&guest_cpu_user_regs()->eax,
|
||
|
|
- &p->data, vio->io_size);
|
||
|
|
+ if ( vio->io_size == 4 ) /* Needs zero extension. */
|
||
|
|
+ guest_cpu_user_regs()->rax = (uint32_t)p->data;
|
||
|
|
+ else
|
||
|
|
+ memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size);
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
break;
|
||
|
|
--- a/xen/include/asm-x86/hvm/io.h
|
||
|
|
+++ b/xen/include/asm-x86/hvm/io.h
|
||
|
|
@@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long t
|
||
|
|
void send_invalidate_req(void);
|
||
|
|
int handle_mmio(void);
|
||
|
|
int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn);
|
||
|
|
-int handle_pio(uint16_t port, int size, int dir);
|
||
|
|
+int handle_pio(uint16_t port, unsigned int size, int dir);
|
||
|
|
void hvm_interrupt_post(struct vcpu *v, int vector, int type);
|
||
|
|
void hvm_io_assist(void);
|
||
|
|
void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq,
|