Xen project Mailing List

[Xen-changelog] Merge hvm_store_cpu_guest_regs() and hvm_store_cpu_guest_ctrl_regs()

From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>

Date: Thu, 23 Mar 2006 18:30:10 +0000

Delivery-date: Thu, 23 Mar 2006 18:31:45 +0000

List-id: BK change log <xen-changelog.lists.xensource.com>

# HG changeset patch # User kaf24@xxxxxxxxxxxxxxxxxxxx # Node ID c947b278a349d4b73d481136cace41714417bc11 # Parent bd108ccc38a021ba40462b1bb01e50ce80f0631f Merge hvm_store_cpu_guest_regs() and hvm_store_cpu_guest_ctrl_regs() into a single function. On VMX, make the function work even when the passed VCPU is not the currently-executing VCPU. This allows gdbserver-xen to get correct cpu register context for VMX guests. Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx> Signed-off-by: Nitin A Kamble <nitin.a.kamble@xxxxxxxxx> diff -r bd108ccc38a0 -r c947b278a349 xen/arch/x86/dom0_ops.c --- a/xen/arch/x86/dom0_ops.c Thu Mar 23 14:30:00 2006 +++ b/xen/arch/x86/dom0_ops.c Thu Mar 23 14:53:52 2006 @@ -460,8 +460,7 @@ if ( hvm_guest(v) ) { - hvm_store_cpu_guest_regs(v, &c->user_regs); - hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg); + hvm_store_cpu_guest_regs(v, &c->user_regs, c->ctrlreg); } else { diff -r bd108ccc38a0 -r c947b278a349 xen/arch/x86/hvm/platform.c --- a/xen/arch/x86/hvm/platform.c Thu Mar 23 14:30:00 2006 +++ b/xen/arch/x86/hvm/platform.c Thu Mar 23 14:53:52 2006 @@ -773,7 +773,7 @@ mmio_opp = &v->arch.hvm_vcpu.mmio_op; regs = mmio_opp->inst_decoder_regs; - hvm_store_cpu_guest_regs(v, regs); + hvm_store_cpu_guest_regs(v, regs, NULL); if ((inst_len = hvm_instruction_length(v)) <= 0) { printf("handle_mmio: failed to get instruction length\n"); diff -r bd108ccc38a0 -r c947b278a349 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Thu Mar 23 14:30:00 2006 +++ b/xen/arch/x86/hvm/svm/svm.c Thu Mar 23 14:53:52 2006 @@ -201,31 +201,41 @@ } static void svm_store_cpu_guest_regs( - struct vcpu *v, struct cpu_user_regs *regs) + struct vcpu *v, struct cpu_user_regs *regs, unsigned long *crs) { struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; + if ( regs != NULL ) + { #if defined (__x86_64__) - regs->rip = vmcb->rip; - regs->rsp = vmcb->rsp; - regs->rflags = vmcb->rflags; - regs->cs = vmcb->cs.sel; - regs->ds = vmcb->ds.sel; - regs->es = vmcb->es.sel; - regs->ss = vmcb->ss.sel; - regs->gs = vmcb->gs.sel; - regs->fs = vmcb->fs.sel; + regs->rip = vmcb->rip; + regs->rsp = vmcb->rsp; + regs->rflags = vmcb->rflags; + regs->cs = vmcb->cs.sel; + regs->ds = vmcb->ds.sel; + regs->es = vmcb->es.sel; + regs->ss = vmcb->ss.sel; + regs->gs = vmcb->gs.sel; + regs->fs = vmcb->fs.sel; #elif defined (__i386__) - regs->eip = vmcb->rip; - regs->esp = vmcb->rsp; - regs->eflags = vmcb->rflags; - regs->cs = vmcb->cs.sel; - regs->ds = vmcb->ds.sel; - regs->es = vmcb->es.sel; - regs->ss = vmcb->ss.sel; - regs->gs = vmcb->gs.sel; - regs->fs = vmcb->fs.sel; + regs->eip = vmcb->rip; + regs->esp = vmcb->rsp; + regs->eflags = vmcb->rflags; + regs->cs = vmcb->cs.sel; + regs->ds = vmcb->ds.sel; + regs->es = vmcb->es.sel; + regs->ss = vmcb->ss.sel; + regs->gs = vmcb->gs.sel; + regs->fs = vmcb->fs.sel; #endif + } + + if ( crs != NULL ) + { + crs[0] = vmcb->cr0; + crs[3] = vmcb->cr3; + crs[4] = vmcb->cr4; + } } static void svm_load_cpu_guest_regs( @@ -372,15 +382,6 @@ return 1; } -void svm_store_cpu_guest_ctrl_regs(struct vcpu *v, unsigned long crs[8]) -{ - struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb; - - crs[0] = vmcb->cr0; - crs[3] = vmcb->cr3; - crs[4] = vmcb->cr4; -} - void svm_modify_guest_state(struct vcpu *v) { svm_modify_vmcb(v, &v->arch.guest_context.user_regs); @@ -448,7 +449,6 @@ hvm_funcs.store_cpu_guest_regs = svm_store_cpu_guest_regs; hvm_funcs.load_cpu_guest_regs = svm_load_cpu_guest_regs; - hvm_funcs.store_cpu_guest_ctrl_regs = svm_store_cpu_guest_ctrl_regs; hvm_funcs.modify_guest_state = svm_modify_guest_state; hvm_funcs.realmode = svm_realmode; diff -r bd108ccc38a0 -r c947b278a349 xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Thu Mar 23 14:30:00 2006 +++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Mar 23 14:53:52 2006 @@ -398,31 +398,81 @@ migrate_timer(&(VLAPIC(v)->vlapic_timer), v->processor); } -void vmx_store_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *regs) -{ +struct vmx_store_cpu_guest_regs_callback_info { + struct vcpu *v; + struct cpu_user_regs *regs; + unsigned long *crs; +}; + +static void vmx_store_cpu_guest_regs( + struct vcpu *v, struct cpu_user_regs *regs, unsigned long *crs); + +static void vmx_store_cpu_guest_regs_callback(void *data) +{ + struct vmx_store_cpu_guest_regs_callback_info *info = data; + vmx_store_cpu_guest_regs(info->v, info->regs, info->crs); +} + +static void vmx_store_cpu_guest_regs( + struct vcpu *v, struct cpu_user_regs *regs, unsigned long *crs) +{ + if ( v != current ) + { + /* Non-current VCPUs must be paused to get a register snapshot. */ + ASSERT(atomic_read(&v->pausecnt) != 0); + + if ( v->arch.hvm_vmx.launch_cpu != smp_processor_id() ) + { + /* Get register details from remote CPU. */ + struct vmx_store_cpu_guest_regs_callback_info info = { + .v = v, .regs = regs, .crs = crs }; + cpumask_t cpumask = cpumask_of_cpu(v->arch.hvm_vmx.launch_cpu); + on_selected_cpus(cpumask, vmx_store_cpu_guest_regs_callback, + &info, 1, 1); + return; + } + + /* Register details are on this CPU. Load the correct VMCS. */ + __vmptrld(virt_to_maddr(v->arch.hvm_vmx.vmcs)); + } + + ASSERT(v->arch.hvm_vmx.launch_cpu == smp_processor_id()); + + if ( regs != NULL ) + { #if defined (__x86_64__) - __vmread(GUEST_RFLAGS, &regs->rflags); - __vmread(GUEST_SS_SELECTOR, &regs->ss); - __vmread(GUEST_CS_SELECTOR, &regs->cs); - __vmread(GUEST_DS_SELECTOR, &regs->ds); - __vmread(GUEST_ES_SELECTOR, &regs->es); - __vmread(GUEST_GS_SELECTOR, &regs->gs); - __vmread(GUEST_FS_SELECTOR, &regs->fs); - __vmread(GUEST_RIP, &regs->rip); - __vmread(GUEST_RSP, &regs->rsp); + __vmread(GUEST_RFLAGS, &regs->rflags); + __vmread(GUEST_SS_SELECTOR, &regs->ss); + __vmread(GUEST_CS_SELECTOR, &regs->cs); + __vmread(GUEST_DS_SELECTOR, &regs->ds); + __vmread(GUEST_ES_SELECTOR, &regs->es); + __vmread(GUEST_GS_SELECTOR, &regs->gs); + __vmread(GUEST_FS_SELECTOR, &regs->fs); + __vmread(GUEST_RIP, &regs->rip); + __vmread(GUEST_RSP, &regs->rsp); #elif defined (__i386__) - __vmread(GUEST_RFLAGS, &regs->eflags); - __vmread(GUEST_SS_SELECTOR, &regs->ss); - __vmread(GUEST_CS_SELECTOR, &regs->cs); - __vmread(GUEST_DS_SELECTOR, &regs->ds); - __vmread(GUEST_ES_SELECTOR, &regs->es); - __vmread(GUEST_GS_SELECTOR, &regs->gs); - __vmread(GUEST_FS_SELECTOR, &regs->fs); - __vmread(GUEST_RIP, &regs->eip); - __vmread(GUEST_RSP, &regs->esp); -#else -#error Unsupported architecture + __vmread(GUEST_RFLAGS, &regs->eflags); + __vmread(GUEST_SS_SELECTOR, &regs->ss); + __vmread(GUEST_CS_SELECTOR, &regs->cs); + __vmread(GUEST_DS_SELECTOR, &regs->ds); + __vmread(GUEST_ES_SELECTOR, &regs->es); + __vmread(GUEST_GS_SELECTOR, &regs->gs); + __vmread(GUEST_FS_SELECTOR, &regs->fs); + __vmread(GUEST_RIP, &regs->eip); + __vmread(GUEST_RSP, &regs->esp); #endif + } + + if ( crs != NULL ) + { + __vmread(CR0_READ_SHADOW, &crs[0]); + __vmread(GUEST_CR3, &crs[3]); + __vmread(CR4_READ_SHADOW, &crs[4]); + } + + /* Reload current VCPU's VMCS if it was temporarily unloaded. */ + if ( (v != current) && hvm_guest(current) ) + __vmptrld(virt_to_maddr(current->arch.hvm_vmx.vmcs)); } void vmx_load_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *regs) @@ -454,13 +504,6 @@ #else #error Unsupported architecture #endif -} - -void vmx_store_cpu_guest_ctrl_regs(struct vcpu *v, unsigned long crs[8]) -{ - __vmread(CR0_READ_SHADOW, &crs[0]); - __vmread(GUEST_CR3, &crs[3]); - __vmread(CR4_READ_SHADOW, &crs[4]); } void vmx_modify_guest_state(struct vcpu *v) @@ -616,7 +659,6 @@ hvm_funcs.store_cpu_guest_regs = vmx_store_cpu_guest_regs; hvm_funcs.load_cpu_guest_regs = vmx_load_cpu_guest_regs; - hvm_funcs.store_cpu_guest_ctrl_regs = vmx_store_cpu_guest_ctrl_regs; hvm_funcs.modify_guest_state = vmx_modify_guest_state; hvm_funcs.realmode = vmx_realmode; diff -r bd108ccc38a0 -r c947b278a349 xen/arch/x86/x86_32/traps.c --- a/xen/arch/x86/x86_32/traps.c Thu Mar 23 14:30:00 2006 +++ b/xen/arch/x86/x86_32/traps.c Thu Mar 23 14:53:52 2006 @@ -27,8 +27,7 @@ if ( hvm_guest(current) && guest_mode(regs) ) { context = "hvm"; - hvm_store_cpu_guest_regs(current, &fault_regs); - hvm_store_cpu_guest_ctrl_regs(current, fault_crs); + hvm_store_cpu_guest_regs(current, &fault_regs, fault_crs); } else { diff -r bd108ccc38a0 -r c947b278a349 xen/arch/x86/x86_64/traps.c --- a/xen/arch/x86/x86_64/traps.c Thu Mar 23 14:30:00 2006 +++ b/xen/arch/x86/x86_64/traps.c Thu Mar 23 14:53:52 2006 @@ -27,8 +27,7 @@ if ( hvm_guest(current) && guest_mode(regs) ) { context = "hvm"; - hvm_store_cpu_guest_regs(current, &fault_regs); - hvm_store_cpu_guest_ctrl_regs(current, fault_crs); + hvm_store_cpu_guest_regs(current, &fault_regs, fault_crs); } else { diff -r bd108ccc38a0 -r c947b278a349 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h Thu Mar 23 14:30:00 2006 +++ b/xen/include/asm-x86/hvm/hvm.h Thu Mar 23 14:53:52 2006 @@ -41,12 +41,12 @@ /* * Store and load guest state: * 1) load/store guest register state, - * 2) store guest control register state (used for panic dumps), - * 3) modify guest state (e.g., set debug flags). + * 2) modify guest state (e.g., set debug flags). */ - void (*store_cpu_guest_regs)(struct vcpu *v, struct cpu_user_regs *r); - void (*load_cpu_guest_regs)(struct vcpu *v, struct cpu_user_regs *r); - void (*store_cpu_guest_ctrl_regs)(struct vcpu *v, unsigned long crs[8]); + void (*store_cpu_guest_regs)( + struct vcpu *v, struct cpu_user_regs *r, unsigned long *crs); + void (*load_cpu_guest_regs)( + struct vcpu *v, struct cpu_user_regs *r); void (*modify_guest_state)(struct vcpu *v); /* @@ -93,21 +93,16 @@ } static inline void -hvm_store_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *r) +hvm_store_cpu_guest_regs( + struct vcpu *v, struct cpu_user_regs *r, unsigned long *crs) { - hvm_funcs.store_cpu_guest_regs(v, r); + hvm_funcs.store_cpu_guest_regs(v, r, crs); } static inline void hvm_load_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *r) { hvm_funcs.load_cpu_guest_regs(v, r); -} - -static inline void -hvm_store_cpu_guest_ctrl_regs(struct vcpu *v, unsigned long crs[8]) -{ - hvm_funcs.store_cpu_guest_ctrl_regs(v, crs); } static inline void _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.