|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 04/16] hypervisor part of add vmware_port to xl.cfg
Limited support of VMware's hyper-call. This is both a more complete support then in currently provided by QEMU and/or KVM and less. The missing part requires QEMU changes and has been left out until the QEMU patches are accepted upstream. VMware's hyper-call is also known as VMware Backdoor I/O Port. Note: this support does not depend on vmware_hw being non-zero. Summary is that VMware treats "IN EAX, DX" (or "OUT DX, EAX"; or "inl %dx, %eax" in AT&T syntax ) to port 0x5658 specially. Note: since many operations return data in EAX, "OUT DX, EAX" does not work for them on VMware nor with this code. Also this instruction is allowed to be used from ring 3. To support this the vmexit for GP needs to be enabled. I have not fully tested that nested HVM is doing the right thing for this. An open source example of using this is: http://open-vm-tools.sourceforge.net/ Which only uses "IN EAX, DX". Also http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 Lists just "inl (%%dx)" (I assume this is AT&T syntax and is the same as "inl %dx, %eax"). The support included is enough to allow VMware tools to install in a HVM domU. For a debug=y build there is a new command line option vmport_debug=. It enabled output to the console of various stages of handling the "IN EAX, DX" instruction. Signed-off-by: Don Slutz <dslutz@xxxxxxxxxxx> --- xen/arch/x86/hvm/hvm.c | 27 +++ xen/arch/x86/hvm/svm/emulate.c | 26 ++- xen/arch/x86/hvm/svm/svm.c | 39 ++++- xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/arch/x86/hvm/vmware/Makefile | 1 + xen/arch/x86/hvm/vmware/vmport.c | 311 ++++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/vmx/vmcs.c | 1 + xen/arch/x86/hvm/vmx/vmx.c | 60 +++++++ xen/arch/x86/hvm/vmx/vvmx.c | 14 ++ xen/include/asm-x86/hvm/io.h | 2 +- xen/include/asm-x86/hvm/svm/emulate.h | 13 +- xen/include/asm-x86/hvm/vmport.h | 61 +++++++ xen/include/public/hvm/params.h | 3 +- 13 files changed, 547 insertions(+), 12 deletions(-) create mode 100644 xen/arch/x86/hvm/vmware/vmport.c create mode 100644 xen/include/asm-x86/hvm/vmport.h diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 365331a..67ad37f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -58,6 +58,7 @@ #include <asm/hvm/trace.h> #include <asm/hvm/nestedhvm.h> #include <asm/hvm/vmware.h> +#include <asm/hvm/vmport.h> #include <asm/mtrr.h> #include <asm/apic.h> #include <public/sched.h> @@ -5714,6 +5715,32 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) break; } break; + case HVM_PARAM_VMWARE_PORT: + /* + * This should only ever be set non-zero one time by + * the tools and is read only by the guest. + */ + if ( d == current->domain ) + { + rc = -EPERM; + break; + } + if ( a.value > 1 ) + { + rc = -EINVAL; + break; + } + if ( a.value ) + { + if ( !d->arch.hvm_domain.params[HVM_PARAM_VMWARE_PORT] ) + vmport_register(d); + } + else if ( d->arch.hvm_domain.params[HVM_PARAM_VMWARE_PORT] ) + { + rc = -EEXIST; + break; + } + break; } if ( rc == 0 ) diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c index 37a1ece..2446eb7 100644 --- a/xen/arch/x86/hvm/svm/emulate.c +++ b/xen/arch/x86/hvm/svm/emulate.c @@ -50,7 +50,7 @@ static unsigned int is_prefix(u8 opc) return 0; } -static unsigned long svm_rip2pointer(struct vcpu *v) +unsigned long svm_rip2pointer(struct vcpu *v) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; unsigned long p = vmcb->cs.base + guest_cpu_user_regs()->eip; @@ -78,6 +78,7 @@ static unsigned long svm_nextrip_insn_length(struct vcpu *v) /* ...and the rest of the #VMEXITs */ case VMEXIT_CR0_SEL_WRITE: case VMEXIT_EXCEPTION_BP: + case VMEXIT_EXCEPTION_GP: break; default: BUG(); @@ -95,6 +96,10 @@ MAKE_INSTR(CPUID, 2, 0x0f, 0xa2); MAKE_INSTR(RDMSR, 2, 0x0f, 0x32); MAKE_INSTR(WRMSR, 2, 0x0f, 0x30); MAKE_INSTR(VMCALL, 3, 0x0f, 0x01, 0xd9); +MAKE_INSTR(INB_DX, 1, 0xec); +MAKE_INSTR(INL_DX, 1, 0xed); +MAKE_INSTR(OUTB_DX,1, 0xee); +MAKE_INSTR(OUTL_DX,1, 0xef); MAKE_INSTR(HLT, 1, 0xf4); MAKE_INSTR(INT3, 1, 0xcc); MAKE_INSTR(RDTSC, 2, 0x0f, 0x31); @@ -115,6 +120,10 @@ static const u8 *const opc_bytes[INSTR_MAX_COUNT] = [INSTR_RDMSR] = OPCODE_RDMSR, [INSTR_WRMSR] = OPCODE_WRMSR, [INSTR_VMCALL] = OPCODE_VMCALL, + [INSTR_INB_DX] = OPCODE_INB_DX, + [INSTR_INL_DX] = OPCODE_INL_DX, + [INSTR_OUTB_DX] = OPCODE_OUTB_DX, + [INSTR_OUTL_DX] = OPCODE_OUTL_DX, [INSTR_HLT] = OPCODE_HLT, [INSTR_INT3] = OPCODE_INT3, [INSTR_RDTSC] = OPCODE_RDTSC, @@ -152,7 +161,9 @@ static int fetch(struct vcpu *v, u8 *buf, unsigned long addr, int len) } int __get_instruction_length_from_list(struct vcpu *v, - const enum instruction_index *list, unsigned int list_count) + const enum instruction_index *list, + unsigned int list_count, + bool_t err_rpt) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; unsigned int i, j, inst_len = 0; @@ -211,10 +222,13 @@ int __get_instruction_length_from_list(struct vcpu *v, mismatch: ; } - gdprintk(XENLOG_WARNING, - "%s: Mismatch between expected and actual instruction bytes: " - "eip = %lx\n", __func__, (unsigned long)vmcb->rip); - hvm_inject_hw_exception(TRAP_gp_fault, 0); + if ( err_rpt ) + { + gdprintk(XENLOG_WARNING, + "%s: Mismatch between expected and actual instruction bytes: " + "eip = %lx\n", __func__, (unsigned long)vmcb->rip); + hvm_inject_hw_exception(TRAP_gp_fault, 0); + } return 0; done: diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b5188e6..12079be 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -59,6 +59,7 @@ #include <public/sched.h> #include <asm/hvm/vpt.h> #include <asm/hvm/trace.h> +#include <asm/hvm/vmport.h> #include <asm/hap.h> #include <asm/apic.h> #include <asm/debugger.h> @@ -2065,6 +2066,38 @@ svm_vmexit_do_vmsave(struct vmcb_struct *vmcb, return; } +static void svm_vmexit_gp_intercept(struct cpu_user_regs *regs, + struct vcpu *v) +{ + struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; + unsigned long inst_len; + unsigned long inst_addr = svm_rip2pointer(v); + int rc; + static const enum instruction_index list[] = { + INSTR_INL_DX, INSTR_INB_DX, INSTR_OUTL_DX, INSTR_OUTB_DX + }; + + regs->error_code = vmcb->exitinfo1; + inst_len = __get_instruction_length_from_list( + v, list, ARRAY_SIZE(list), 0); + + rc = vmport_gp_check(regs, v, inst_len, inst_addr, vmcb->exitinfo2); + if ( !rc ) + __update_guest_eip(regs, inst_len); + else + { + VMPORT_DBG_LOG(VMPORT_LOG_GP_UNKNOWN, + "gp: rc=%d e2=%lx ec=%lx ip=%"PRIx64" (%ld) ax=%"PRIx64 + " bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64" si=%"PRIx64 + " di=%"PRIx64, rc, + (unsigned long)vmcb->exitinfo2, + (unsigned long)regs->error_code, + regs->rip, inst_len, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + hvm_inject_hw_exception(TRAP_gp_fault, regs->error_code); + } +} + static void svm_vmexit_ud_intercept(struct cpu_user_regs *regs) { struct hvm_emulate_ctxt ctxt; @@ -2140,7 +2173,7 @@ static void svm_vmexit_do_invalidate_cache(struct cpu_user_regs *regs) int inst_len; inst_len = __get_instruction_length_from_list( - current, list, ARRAY_SIZE(list)); + current, list, ARRAY_SIZE(list), 1); if ( inst_len == 0 ) return; @@ -2412,6 +2445,10 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; } + case VMEXIT_EXCEPTION_GP: + svm_vmexit_gp_intercept(regs, v); + break; + case VMEXIT_EXCEPTION_UD: svm_vmexit_ud_intercept(regs); break; diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 21292bb..791c045 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -193,6 +193,7 @@ static int construct_vmcb(struct vcpu *v) vmcb->_exception_intercepts = HVM_TRAP_MASK + | (1U << TRAP_gp_fault) | (1U << TRAP_no_device); if ( paging_mode_hap(v->domain) ) diff --git a/xen/arch/x86/hvm/vmware/Makefile b/xen/arch/x86/hvm/vmware/Makefile index 3fb2e0b..cd8815b 100644 --- a/xen/arch/x86/hvm/vmware/Makefile +++ b/xen/arch/x86/hvm/vmware/Makefile @@ -1 +1,2 @@ obj-y += cpuid.o +obj-y += vmport.o diff --git a/xen/arch/x86/hvm/vmware/vmport.c b/xen/arch/x86/hvm/vmware/vmport.c new file mode 100644 index 0000000..a6fd95c --- /dev/null +++ b/xen/arch/x86/hvm/vmware/vmport.c @@ -0,0 +1,311 @@ +/* + * HVM VMPORT emulation + * + * Copyright (C) 2012 Verizon Corporation + * + * This file is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License Version 2 (GPLv2) + * as published by the Free Software Foundation. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. <http://www.gnu.org/licenses/>. + */ + +#include <xen/config.h> +#include <xen/lib.h> +#include <asm/hvm/hvm.h> +#include <asm/hvm/support.h> +#include <asm/hvm/vmport.h> + +#include "backdoor_def.h" +#include "guest_msg_def.h" + +#ifndef NDEBUG +unsigned int opt_vmport_debug __read_mostly; +integer_param("vmport_debug", opt_vmport_debug); +#endif + +/* More VMware defines */ + +#define VMWARE_GUI_AUTO_GRAB 0x001 +#define VMWARE_GUI_AUTO_UNGRAB 0x002 +#define VMWARE_GUI_AUTO_SCROLL 0x004 +#define VMWARE_GUI_AUTO_RAISE 0x008 +#define VMWARE_GUI_EXCHANGE_SELECTIONS 0x010 +#define VMWARE_GUI_WARP_CURSOR_ON_UNGRAB 0x020 +#define VMWARE_GUI_FULL_SCREEN 0x040 + +#define VMWARE_GUI_TO_FULL_SCREEN 0x080 +#define VMWARE_GUI_TO_WINDOW 0x100 + +#define VMWARE_GUI_AUTO_RAISE_DISABLED 0x200 + +#define VMWARE_GUI_SYNC_TIME 0x400 + +/* When set, toolboxes should not show the cursor options page. */ +#define VMWARE_DISABLE_CURSOR_OPTIONS 0x800 + +inline uint16_t get_low_bits(uint32_t bits) +{ + return bits & 0xffff; +} + +void vmport_register(struct domain *d) +{ + register_portio_handler(d, BDOOR_PORT, 4, vmport_ioport); +} + +int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val) +{ + struct cpu_user_regs *regs = guest_cpu_user_regs(); + uint32_t cmd = get_low_bits(regs->rcx); + uint32_t magic = regs->rax; + int rc = X86EMUL_OKAY; + + if ( magic == BDOOR_MAGIC ) + { + uint64_t saved_rax = regs->rax; + uint64_t value; + + VMPORT_DBG_LOG(VMPORT_LOG_TRACE, + "VMware trace dir=%d bytes=%u ip=%"PRIx64" cmd=%d ax=%" + PRIx64" bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64" si=%" + PRIx64" di=%"PRIx64"\n", dir, bytes, + regs->rip, cmd, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + switch ( cmd ) + { + case BDOOR_CMD_GETMHZ: + /* ... */ + regs->rbx = BDOOR_MAGIC; + regs->rax = current->domain->arch.tsc_khz / 1000; + break; + case BDOOR_CMD_GETVERSION: + /* ... */ + regs->rbx = BDOOR_MAGIC; + /* VERSION_MAGIC */ + regs->rax = 6; + /* Claim we are an ESX. VMX_TYPE_SCALABLE_SERVER */ + regs->rcx = 2; + break; + case BDOOR_CMD_GETHWVERSION: + /* ... */ + regs->rbx = BDOOR_MAGIC; + /* vmware_hw */ + regs->rax = 0; + if ( is_hvm_vcpu(current) ) + { + struct hvm_domain *hd = ¤t->domain->arch.hvm_domain; + + regs->rax = hd->params[HVM_PARAM_VMWARE_HW]; + } + if ( !regs->rax ) + regs->rax = 4; /* Act like version 4 */ + break; + case BDOOR_CMD_GETHZ: + value = current->domain->arch.tsc_khz * 1000; + /* apic-frequency (bus speed) */ + regs->rcx = (uint32_t)(1000000000ULL / APIC_BUS_CYCLE_NS); + /* High part of tsc-frequency */ + regs->rbx = (uint32_t)(value >> 32); + /* Low part of tsc-frequency */ + regs->rax = value; + break; + case BDOOR_CMD_GETTIME: + value = get_localtime_us(current->domain); + /* hostUsecs */ + regs->rbx = (uint32_t)(value % 1000000UL); + /* hostSecs */ + regs->rax = value / 1000000ULL; + /* maxTimeLag */ + regs->rcx = 0; + break; + case BDOOR_CMD_GETTIMEFULL: + value = get_localtime_us(current->domain); + /* ... */ + regs->rax = BDOOR_MAGIC; + /* hostUsecs */ + regs->rbx = (uint32_t)(value % 1000000UL); + /* High part of hostSecs */ + regs->rsi = (uint32_t)((value / 1000000ULL) >> 32); + /* Low part of hostSecs */ + regs->rdx = (uint32_t)(value / 1000000ULL); + /* maxTimeLag */ + regs->rcx = 0; + break; + case BDOOR_CMD_GETGUIOPTIONS: + regs->rax = VMWARE_GUI_AUTO_GRAB | VMWARE_GUI_AUTO_UNGRAB | + VMWARE_GUI_AUTO_RAISE_DISABLED | VMWARE_GUI_SYNC_TIME | + VMWARE_DISABLE_CURSOR_OPTIONS; + break; + case BDOOR_CMD_SETGUIOPTIONS: + regs->rax = 0x0; + break; + default: + VMPORT_DBG_LOG(VMPORT_LOG_ERROR, + "VMware bytes=%d dir=%d cmd=%d", + bytes, dir, cmd); + break; + } + VMPORT_DBG_LOG(VMPORT_LOG_VMWARE_AFTER, + "VMware after ip=%"PRIx64" cmd=%d ax=%"PRIx64" bx=%" + PRIx64" cx=%"PRIx64" dx=%"PRIx64" si=%"PRIx64" di=%" + PRIx64"\n", + regs->rip, cmd, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + if ( dir == IOREQ_READ ) + { + switch ( bytes ) + { + case 1: + regs->rax = (saved_rax & 0xffffff00) | (regs->rax & 0xff); + break; + case 2: + regs->rax = (saved_rax & 0xffff0000) | get_low_bits(regs->rax); + break; + case 4: + regs->rax = (uint32_t)regs->rax; + break; + } + *val = regs->rax; + } + else + regs->rax = saved_rax; + } + else + { + rc = X86EMUL_UNHANDLEABLE; + VMPORT_DBG_LOG(VMPORT_LOG_ERROR, + "Not VMware %x vs %x; ip=%"PRIx64" ax=%"PRIx64 + " bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64" si=%"PRIx64 + " di=%"PRIx64"", + magic, BDOOR_MAGIC, regs->rip, regs->rax, regs->rbx, + regs->rcx, regs->rdx, regs->rsi, regs->rdi); + } + + return rc; +} + +int vmport_gp_check(struct cpu_user_regs *regs, struct vcpu *v, + unsigned long inst_len, unsigned long inst_addr, + unsigned long ei) +{ + if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_VMWARE_PORT] ) + return 10; + + if ( inst_len && inst_len <= 2 && get_low_bits(regs->rdx) == BDOOR_PORT && + ei == 0 && regs->error_code == 0 && + (uint32_t)regs->rax == BDOOR_MAGIC ) + { + int i = 0; + uint32_t val; + uint32_t byte_cnt = 4; + unsigned char bytes[2]; + unsigned int fetch_len; + int frc; + int rc; + + /* + * Fetch up to the next page break; we'll fetch from the + * next page later if we have to. + */ + fetch_len = min_t(unsigned int, inst_len, + PAGE_SIZE - (inst_addr & ~PAGE_MASK)); + frc = hvm_fetch_from_guest_virt_nofault(bytes, inst_addr, fetch_len, + PFEC_page_present); + if ( frc != HVMCOPY_okay ) + { + gdprintk(XENLOG_WARNING, + "Bad instruction fetch at %#lx (frc=%d il=%lu fl=%u)\n", + (unsigned long) inst_addr, frc, inst_len, fetch_len); + return 11; + } + if ( bytes[0] == 0x66 ) /* operand size prefix */ + { + byte_cnt = 2; + i = 1; + if ( fetch_len != inst_len ) + { + frc = hvm_fetch_from_guest_virt_nofault(&bytes[1], + inst_addr + 1, 1, + PFEC_page_present); + if ( frc != HVMCOPY_okay ) + { + gdprintk(XENLOG_WARNING, + "Bad instruction fetch at %#lx + 1 (frc=%d)\n", + (unsigned long) inst_addr, frc); + return 12; + } + } + } + if ( bytes[i] == 0xed ) /* in (%dx),%eax or in (%dx),%ax */ + { + rc = vmport_ioport(IOREQ_READ, BDOOR_PORT, byte_cnt, &val); + VMPORT_DBG_LOG(VMPORT_LOG_VMWARE_AFTER, + "gp: VMwareIn rc=%d ip=%"PRIx64" byte_cnt=%d ax=%" + PRIx64" bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, rc, + inst_addr, byte_cnt, regs->rax, regs->rbx, + regs->rcx, regs->rdx, regs->rsi, regs->rdi); + return rc; + } + else if ( bytes[i] == 0xec ) /* in (%dx),%al */ + { + rc = vmport_ioport(IOREQ_READ, BDOOR_PORT, 1, &val); + VMPORT_DBG_LOG(VMPORT_LOG_VMWARE_AFTER, + "gp: VMwareIn rc=%d ip=%"PRIx64" byte_cnt=1 ax=%" + PRIx64" bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, rc, + inst_addr, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + return rc; + } + else if ( bytes[i] == 0xef ) /* out %eax,(%dx) or out %ax,(%dx) */ + { + rc = vmport_ioport(IOREQ_WRITE, BDOOR_PORT, byte_cnt, &val); + VMPORT_DBG_LOG(VMPORT_LOG_VMWARE_AFTER, + "gp: VMwareOut rc=%d ip=%"PRIx64" byte_cnt=%d ax=%" + PRIx64" bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, rc, + inst_addr, byte_cnt, regs->rax, regs->rbx, + regs->rcx, regs->rdx, regs->rsi, regs->rdi); + return rc; + } + else if ( bytes[i] == 0xee ) /* out %al,(%dx) */ + { + rc = vmport_ioport(IOREQ_WRITE, BDOOR_PORT, 1, &val); + VMPORT_DBG_LOG(VMPORT_LOG_VMWARE_AFTER, + "gp: VMwareOut rc=%d ip=%"PRIx64" byte_cnt=1 ax=%" + PRIx64" bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, rc, + inst_addr, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + return rc; + } + else + { + VMPORT_DBG_LOG(VMPORT_LOG_GP_FAIL_RD_INST, + "gp: VMware? lip=%"PRIx64"[%d]=>0x%x(%ld) ax=%" + PRIx64" bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, + inst_addr, i, bytes[i], inst_len, regs->rax, + regs->rbx, regs->rcx, regs->rdx, regs->rsi, + regs->rdi); + return 13; + } + } + return 14; +} + + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4a4f4e1..fa1f69a 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1077,6 +1077,7 @@ static int construct_vmcs(struct vcpu *v) v->arch.hvm_vmx.exception_bitmap = HVM_TRAP_MASK | (paging_mode_hap(d) ? 0 : (1U << TRAP_page_fault)) + | (1U << TRAP_gp_fault) | (1U << TRAP_no_device); vmx_update_exception_bitmap(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 26b1ad5..eaa6df2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -44,6 +44,7 @@ #include <asm/hvm/support.h> #include <asm/hvm/vmx/vmx.h> #include <asm/hvm/vmx/vmcs.h> +#include <asm/hvm/vmport.h> #include <public/sched.h> #include <public/hvm/ioreq.h> #include <asm/hvm/vpic.h> @@ -1279,6 +1280,7 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) v->arch.hvm_vmx.exception_bitmap = HVM_TRAP_MASK | (paging_mode_hap(v->domain) ? 0 : (1U << TRAP_page_fault)) + | (1U << TRAP_gp_fault) | (1U << TRAP_no_device); vmx_update_exception_bitmap(v); vmx_update_debug_state(v); @@ -2565,6 +2567,50 @@ static void vmx_idtv_reinject(unsigned long idtv_info) } } +static unsigned long vmx_rip2pointer(struct cpu_user_regs *regs, + struct vcpu *v) +{ + struct segment_register cs; + unsigned long p; + + vmx_get_segment_register(v, x86_seg_cs, &cs); + p = cs.base + regs->rip; + if ( !(cs.attr.fields.l && hvm_long_mode_enabled(v)) ) + return (uint32_t)p; /* mask to 32 bits */ + return p; +} + +static void vmx_vmexit_gp_intercept(struct cpu_user_regs *regs, + struct vcpu *v) +{ + unsigned long exit_qualification; + unsigned long inst_len; + unsigned long inst_addr = vmx_rip2pointer(regs, v); + unsigned long ecode; + int rc; + + __vmread(EXIT_QUALIFICATION, &exit_qualification); + __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len); + __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); + regs->error_code = ecode; + + rc = vmport_gp_check(regs, v, inst_len, inst_addr, exit_qualification); + if ( !rc ) + update_guest_eip(); + else + { + VMPORT_DBG_LOG(VMPORT_LOG_GP_UNKNOWN, + "gp: rc=%d e2=%lx ec=%lx ip=%"PRIx64" (%ld) ax=%"PRIx64 + " bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64" si=%"PRIx64 + " di=%"PRIx64, rc, + (unsigned long)exit_qualification, + (unsigned long)regs->error_code, + regs->rip, inst_len, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + hvm_inject_hw_exception(TRAP_gp_fault, regs->error_code); + } +} + static int vmx_handle_apic_write(void) { unsigned long exit_qualification; @@ -2675,6 +2721,17 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) && vector != TRAP_nmi && vector != TRAP_machine_check ) { +#ifndef NDEBUG + if ( vector == TRAP_gp_fault ) + { + VMPORT_DBG_LOG(VMPORT_LOG_REALMODE_GP, + "realmode gp: ip=%"PRIx64" ax=%"PRIx64 + " bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, + regs->rip, regs->rax, regs->rbx, regs->rcx, + regs->rdx, regs->rsi, regs->rdi); + } +#endif perfc_incr(realmode_exits); v->arch.hvm_vmx.vmx_emulate = 1; HVMTRACE_0D(REALMODE_EMULATE); @@ -2790,6 +2847,9 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) HVMTRACE_1D(TRAP, vector); vmx_fpu_dirty_intercept(); break; + case TRAP_gp_fault: + vmx_vmexit_gp_intercept(regs, v); + break; case TRAP_page_fault: __vmread(EXIT_QUALIFICATION, &exit_qualification); __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 9ccc03f..51d2336 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -24,6 +24,7 @@ #include <asm/types.h> #include <asm/mtrr.h> #include <asm/p2m.h> +#include <asm/hvm/vmport.h> #include <asm/hvm/vmx/vmx.h> #include <asm/hvm/vmx/vvmx.h> #include <asm/hvm/nestedhvm.h> @@ -2182,6 +2183,19 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, if ( v->fpu_dirtied ) nvcpu->nv_vmexit_pending = 1; } + else if ( vector == TRAP_gp_fault ) + { +#ifndef NDEBUG + struct cpu_user_regs *ur = guest_cpu_user_regs(); + VMPORT_DBG_LOG(VMPORT_LOG_VGP_UNKNOWN, + "Unexpected gp: ip=%"PRIx64" ax=%"PRIx64 + " bx=%"PRIx64" cx=%"PRIx64" dx=%"PRIx64 + " si=%"PRIx64" di=%"PRIx64, + ur->rip, ur->rax, ur->rbx, ur->rcx, ur->rdx, + ur->rsi, ur->rdi); +#endif + nvcpu->nv_vmexit_pending = 1; + } else if ( (intr_info & valid_mask) == valid_mask ) { exec_bitmap =__get_vvmcs(nvcpu->nv_vvmcx, EXCEPTION_BITMAP); diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 886a9d6..d257161 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -25,7 +25,7 @@ #include <public/hvm/ioreq.h> #include <public/event_channel.h> -#define MAX_IO_HANDLER 16 +#define MAX_IO_HANDLER 17 #define HVM_PORTIO 0 #define HVM_BUFFERED_IO 2 diff --git a/xen/include/asm-x86/hvm/svm/emulate.h b/xen/include/asm-x86/hvm/svm/emulate.h index ccc2d3c..542b6b8 100644 --- a/xen/include/asm-x86/hvm/svm/emulate.h +++ b/xen/include/asm-x86/hvm/svm/emulate.h @@ -39,18 +39,25 @@ enum instruction_index { INSTR_STGI, INSTR_CLGI, INSTR_INVLPGA, + INSTR_INL_DX, + INSTR_INB_DX, + INSTR_OUTL_DX, + INSTR_OUTB_DX, INSTR_MAX_COUNT /* Must be last - Number of instructions supported */ }; struct vcpu; -int __get_instruction_length_from_list( - struct vcpu *, const enum instruction_index *, unsigned int list_count); +unsigned long svm_rip2pointer(struct vcpu *v); +int __get_instruction_length_from_list(struct vcpu *, + const enum instruction_index *, + unsigned int list_count, + bool_t err_rpt); static inline int __get_instruction_length( struct vcpu *v, enum instruction_index instr) { - return __get_instruction_length_from_list(v, &instr, 1); + return __get_instruction_length_from_list(v, &instr, 1, 1); } #endif /* __ASM_X86_HVM_SVM_EMULATE_H__ */ diff --git a/xen/include/asm-x86/hvm/vmport.h b/xen/include/asm-x86/hvm/vmport.h new file mode 100644 index 0000000..9d72b37 --- /dev/null +++ b/xen/include/asm-x86/hvm/vmport.h @@ -0,0 +1,61 @@ +/* + * asm/hvm/vmport.h: HVM VMPORT emulation + * + * + * Copyright (C) 2012 Verizon Corporation + * + * This file is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License Version 2 (GPLv2) + * as published by the Free Software Foundation. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. <http://www.gnu.org/licenses/>. + */ + +#ifndef ASM_X86_HVM_VMPORT_H__ +#define ASM_X86_HVM_VMPORT_H__ + +#ifndef NDEBUG + +#define VMPORT_LOG_GP_VMWARE_AFTER (1 << 0) +#define VMPORT_LOG_GP_FAIL_RD_INST (1 << 1) +#define VMPORT_LOG_VGP_UNKNOWN (1 << 2) +#define VMPORT_LOG_REALMODE_GP (1 << 3) + +#define VMPORT_LOG_GP_UNKNOWN (1 << 8) +#define VMPORT_LOG_GP_NOT_VMWARE (1 << 9) + +#define VMPORT_LOG_TRACE (1 << 16) +#define VMPORT_LOG_ERROR (1 << 17) +#define VMPORT_LOG_VMWARE_AFTER (1 << 18) + +extern unsigned int opt_vmport_debug; +#define VMPORT_DBG_LOG(level, _f, _a...) \ + do { \ + if ( unlikely((level) & opt_vmport_debug) ) \ + printk("[HVM:%d.%d] <%s> " _f "\n", \ + current->domain->domain_id, current->vcpu_id, __func__, \ + ## _a); \ + } while ( 0 ) +#else +#define VMPORT_DBG_LOG(level, _f, _a...) do {} while ( 0 ) +#endif + +void vmport_register(struct domain *d); +int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val); +int vmport_gp_check(struct cpu_user_regs *regs, struct vcpu *v, + unsigned long inst_len, unsigned long inst_addr, + unsigned long ei); + +#endif /* ASM_X86_HVM_VMPORT_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index dee6d68..77ff539 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -153,7 +153,8 @@ /* Params for VMware */ #define HVM_PARAM_VMWARE_HW 35 +#define HVM_PARAM_VMWARE_PORT 36 -#define HVM_NR_PARAMS 36 +#define HVM_NR_PARAMS 37 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */ -- 1.8.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |