[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v4 13/17] x86/hvm: remove HVMIO_dispatched I/O state
By removing the HVMIO_dispatched state and making all pending emulations (i.e. all those not handled by the hypervisor) use HVMIO_awating_completion, various code-paths can be simplified. Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx> Cc: Keir Fraser <keir@xxxxxxx> Cc: Jan Beulich <jbeulich@xxxxxxxx> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- xen/arch/x86/hvm/emulate.c | 12 +++--------- xen/arch/x86/hvm/hvm.c | 12 +++--------- xen/arch/x86/hvm/io.c | 12 ++++-------- xen/arch/x86/hvm/vmx/realmode.c | 2 +- xen/include/asm-x86/hvm/vcpu.h | 8 +++++++- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 111987c..c10adad 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -138,20 +138,14 @@ static int hvmemul_do_io( if ( data_is_addr || dir == IOREQ_WRITE ) return X86EMUL_UNHANDLEABLE; goto finish_access; - case HVMIO_dispatched: - /* May have to wait for previous cycle of a multi-write to complete. */ - if ( is_mmio && !data_is_addr && (dir == IOREQ_WRITE) && - (addr == (vio->mmio_large_write_pa + - vio->mmio_large_write_bytes)) ) - return X86EMUL_RETRY; - /* fallthrough */ default: return X86EMUL_UNHANDLEABLE; } - vio->io_state = (data_is_addr || dir == IOREQ_WRITE) ? - HVMIO_dispatched : HVMIO_awaiting_completion; + vio->io_state = HVMIO_awaiting_completion; vio->io_size = size; + vio->io_dir = dir; + vio->io_data_is_addr = data_is_addr; if ( dir == IOREQ_WRITE ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 39f40ad..4458fa4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -416,22 +416,16 @@ static void hvm_io_assist(ioreq_t *p) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; - enum hvm_io_state io_state; p->state = STATE_IOREQ_NONE; - io_state = vio->io_state; - vio->io_state = HVMIO_none; - - switch ( io_state ) + if ( HVMIO_NEED_COMPLETION(vio) ) { - case HVMIO_awaiting_completion: vio->io_state = HVMIO_completed; vio->io_data = p->data; - break; - default: - break; } + else + vio->io_state = HVMIO_none; msix_write_completion(curr); vcpu_end_shutdown_deferral(curr); diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 27150e9..12fc923 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -90,9 +90,7 @@ int handle_mmio(void) rc = hvm_emulate_one(&ctxt); - if ( rc != X86EMUL_RETRY ) - vio->io_state = HVMIO_none; - if ( vio->io_state == HVMIO_awaiting_completion || vio->mmio_retry ) + if ( HVMIO_NEED_COMPLETION(vio) || vio->mmio_retry ) vio->io_completion = HVMIO_mmio_completion; else vio->mmio_access = (struct npfec){}; @@ -142,6 +140,9 @@ int handle_pio(uint16_t port, unsigned int size, int dir) rc = hvmemul_do_pio_buffer(port, size, dir, &data); + if ( HVMIO_NEED_COMPLETION(vio) ) + vio->io_completion = HVMIO_pio_completion; + switch ( rc ) { case X86EMUL_OKAY: @@ -154,11 +155,6 @@ int handle_pio(uint16_t port, unsigned int size, int dir) } break; case X86EMUL_RETRY: - if ( vio->io_state != HVMIO_awaiting_completion ) - return 0; - /* Completion in hvm_io_assist() with no re-emulation required. */ - ASSERT(dir == IOREQ_READ); - vio->io_completion = HVMIO_pio_completion; break; default: gdprintk(XENLOG_ERR, "Weird HVM ioemulation status %d.\n", rc); diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c index 76ff9a5..5e56a1f 100644 --- a/xen/arch/x86/hvm/vmx/realmode.c +++ b/xen/arch/x86/hvm/vmx/realmode.c @@ -111,7 +111,7 @@ void vmx_realmode_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt) rc = hvm_emulate_one(hvmemul_ctxt); - if ( vio->io_state == HVMIO_awaiting_completion || vio->mmio_retry ) + if ( HVMIO_NEED_COMPLETION(vio) || vio->mmio_retry ) vio->io_completion = HVMIO_realmode_completion; if ( rc == X86EMUL_UNHANDLEABLE ) diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index c4d96a8..2830057 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -32,7 +32,6 @@ enum hvm_io_state { HVMIO_none = 0, - HVMIO_dispatched, HVMIO_awaiting_completion, HVMIO_completed }; @@ -55,6 +54,13 @@ struct hvm_vcpu_io { unsigned long io_data; int io_size; enum hvm_io_completion io_completion; + uint8_t io_dir; + uint8_t io_data_is_addr; + +#define HVMIO_NEED_COMPLETION(_vio) \ + ( ((_vio)->io_state == HVMIO_awaiting_completion) && \ + !(_vio)->io_data_is_addr && \ + ((_vio)->io_dir == IOREQ_READ) ) /* * HVM emulation: -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |