From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v2 05/17] x86/hvm: unify stdvga mmio intercept with standard mmio intercept Date: Thu, 11 Jun 2015 16:42:49 +0100 Message-ID: <1434037381-10917-6-git-send-email-paul.durrant@citrix.com> References: <1434037381-10917-1-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z34dK-0006Kk-9H for xen-devel@lists.xenproject.org; Thu, 11 Jun 2015 15:43:10 +0000 In-Reply-To: <1434037381-10917-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Paul Durrant , Keir Fraser , Jan Beulich List-Id: xen-devel@lists.xenproject.org It's clear from the following check in hvmemul_rep_movs: if ( sp2mt == p2m_mmio_direct || dp2mt == p2m_mmio_direct || (sp2mt == p2m_mmio_dm && dp2mt == p2m_mmio_dm) ) return X86EMUL_UNHANDLEABLE; that mmio <-> mmio copy is not handled. This means the code in the stdvga mmio intercept that explicitly handles mmio <-> mmio copy when hvm_copy_to/from_guest_phys() fails is never going to be executed. This patch therefore adds a check in hvmemul_do_io_addr() to make sure mmio <-> mmio is disallowed and then registers standard mmio intercept ops in stdvga_init(). With this patch all mmio and portio handled within Xen now goes through process_io_intercept(). Signed-off-by: Paul Durrant Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/hvm/emulate.c | 9 +++ xen/arch/x86/hvm/intercept.c | 7 -- xen/arch/x86/hvm/stdvga.c | 170 ++++++++---------------------------------- xen/include/asm-x86/hvm/io.h | 1 - 4 files changed, 42 insertions(+), 145 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 7da2d68..4af70b0 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -273,6 +273,15 @@ static int hvmemul_acquire_page(unsigned long gmfn, struct page_info **page) return X86EMUL_RETRY; } + /* This code should not be reached if the gmfn is not RAM */ + if ( p2m_is_mmio(p2mt) ) + { + domain_crash(d); + + put_page(*page); + return X86EMUL_UNHANDLEABLE; + } + return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index b5e7879..b8bcd0b 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -329,13 +329,6 @@ int hvm_io_intercept(ioreq_t *p) struct vcpu *v = current; struct hvm_io_handler *handler; - if ( p->type == IOREQ_TYPE_COPY ) - { - int rc = stdvga_intercept_mmio(p); - if ( (rc == X86EMUL_OKAY) || (rc == X86EMUL_RETRY) ) - return rc; - } - handler = hvm_find_io_handler(v, p); if ( handler == NULL ) diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index 34cdd90..4999def 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -275,7 +275,8 @@ static uint8_t stdvga_mem_readb(uint64_t addr) return ret; } -static uint64_t stdvga_mem_read(uint64_t addr, uint64_t size) +static int stdvga_mem_read(struct vcpu *v, unsigned long addr, + unsigned long size, unsigned long *p_data) { uint64_t data = 0; @@ -313,7 +314,9 @@ static uint64_t stdvga_mem_read(uint64_t addr, uint64_t size) break; } - return data; + *p_data = data; + + return X86EMUL_OKAY; } static void stdvga_mem_writeb(uint64_t addr, uint32_t val) @@ -424,8 +427,17 @@ static void stdvga_mem_writeb(uint64_t addr, uint32_t val) } } -static void stdvga_mem_write(uint64_t addr, uint64_t data, uint64_t size) +static int stdvga_mem_write(struct vcpu *v, unsigned long addr, + unsigned long size, unsigned long data) { + ioreq_t p = { .type = IOREQ_TYPE_COPY, + .addr = addr, + .size = size, + .count = 1, + .dir = IOREQ_WRITE, + .data = data, + }; + /* Intercept mmio write */ switch ( size ) { @@ -460,153 +472,35 @@ static void stdvga_mem_write(uint64_t addr, uint64_t data, uint64_t size) gdprintk(XENLOG_WARNING, "invalid io size: %"PRId64"\n", size); break; } -} - -static uint32_t read_data; - -static int mmio_move(struct hvm_hw_stdvga *s, ioreq_t *p) -{ - int i; - uint64_t addr = p->addr; - p2m_type_t p2mt; - struct domain *d = current->domain; - int step = p->df ? -p->size : p->size; - if ( p->data_is_ptr ) - { - uint64_t data = p->data, tmp; - - if ( p->dir == IOREQ_READ ) - { - for ( i = 0; i < p->count; i++ ) - { - tmp = stdvga_mem_read(addr, p->size); - if ( hvm_copy_to_guest_phys(data, &tmp, p->size) != - HVMCOPY_okay ) - { - struct page_info *dp = get_page_from_gfn( - d, data >> PAGE_SHIFT, &p2mt, P2M_ALLOC); - /* - * The only case we handle is vga_mem <-> vga_mem. - * Anything else disables caching and leaves it to qemu-dm. - */ - if ( (p2mt != p2m_mmio_dm) || (data < VGA_MEM_BASE) || - ((data + p->size) > (VGA_MEM_BASE + VGA_MEM_SIZE)) ) - { - if ( dp ) - put_page(dp); - return 0; - } - ASSERT(!dp); - stdvga_mem_write(data, tmp, p->size); - } - data += step; - addr += step; - } - } - else - { - for ( i = 0; i < p->count; i++ ) - { - if ( hvm_copy_from_guest_phys(&tmp, data, p->size) != - HVMCOPY_okay ) - { - struct page_info *dp = get_page_from_gfn( - d, data >> PAGE_SHIFT, &p2mt, P2M_ALLOC); - if ( (p2mt != p2m_mmio_dm) || (data < VGA_MEM_BASE) || - ((data + p->size) > (VGA_MEM_BASE + VGA_MEM_SIZE)) ) - { - if ( dp ) - put_page(dp); - return 0; - } - ASSERT(!dp); - tmp = stdvga_mem_read(data, p->size); - } - stdvga_mem_write(addr, tmp, p->size); - data += step; - addr += step; - } - } - } - else if ( p->dir == IOREQ_WRITE ) - { - for ( i = 0; i < p->count; i++ ) - { - stdvga_mem_write(addr, p->data, p->size); - addr += step; - } - } - else - { - ASSERT(p->count == 1); - p->data = stdvga_mem_read(addr, p->size); - } + if (!hvm_buffered_io_send(&p)) + return X86EMUL_UNHANDLEABLE; - read_data = p->data; - return 1; + return X86EMUL_OKAY; } -int stdvga_intercept_mmio(ioreq_t *p) +static int stdvga_mem_check(struct vcpu *v, unsigned long addr) { - struct domain *d = current->domain; - struct hvm_hw_stdvga *s = &d->arch.hvm_domain.stdvga; - uint64_t start, end; - int buf = 0, rc; - - if ( p->df ) - { - start = (p->addr - (p->count - 1) * p->size); - end = p->addr + p->size; - } - else - { - start = p->addr; - end = p->addr + p->count * p->size; - } - - if ( (start < VGA_MEM_BASE) || (end > (VGA_MEM_BASE + VGA_MEM_SIZE)) ) - return X86EMUL_UNHANDLEABLE; - - if ( p->size > 8 ) - { - gdprintk(XENLOG_WARNING, "invalid mmio size %d\n", (int)p->size); - return X86EMUL_UNHANDLEABLE; - } + struct hvm_hw_stdvga *s = &v->domain->arch.hvm_domain.stdvga; + int rc; spin_lock(&s->lock); - if ( s->stdvga && s->cache ) - { - switch ( p->type ) - { - case IOREQ_TYPE_COPY: - buf = mmio_move(s, p); - if ( !buf ) - s->cache = 0; - break; - default: - gdprintk(XENLOG_WARNING, "unsupported mmio request type:%d " - "addr:0x%04x data:0x%04x size:%d count:%d state:%d " - "isptr:%d dir:%d df:%d\n", - p->type, (int)p->addr, (int)p->data, (int)p->size, - (int)p->count, p->state, - p->data_is_ptr, p->dir, p->df); - s->cache = 0; - } - } - else - { - buf = (p->dir == IOREQ_WRITE); - } - - rc = (buf && hvm_buffered_io_send(p)); + rc = s->stdvga && s->cache && + (addr >= VGA_MEM_BASE) && + (addr < (VGA_MEM_BASE + VGA_MEM_SIZE)); spin_unlock(&s->lock); - return rc ? X86EMUL_OKAY : X86EMUL_UNHANDLEABLE; + return rc; } +const struct hvm_mmio_ops stdvga_mem_ops = { + .check = stdvga_mem_check, + .read = stdvga_mem_read, + .write = stdvga_mem_write +}; + void stdvga_init(struct domain *d) { struct hvm_hw_stdvga *s = &d->arch.hvm_domain.stdvga; @@ -634,6 +528,8 @@ void stdvga_init(struct domain *d) register_portio_handler(d, 0x3c4, 2, stdvga_intercept_pio); /* Graphics registers. */ register_portio_handler(d, 0x3ce, 2, stdvga_intercept_pio); + /* VGA memory */ + register_mmio_handler(d, &stdvga_mem_ops); } } diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 7b8db78..50965f1 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -132,7 +132,6 @@ struct hvm_hw_stdvga { }; void stdvga_init(struct domain *d); -int stdvga_intercept_mmio(ioreq_t *p); void stdvga_deinit(struct domain *d); extern void hvm_dpci_msi_eoi(struct domain *d, int vector); -- 1.7.10.4