mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
x86/vm_event: consolidate hvm_event_fill_regs and p2m_vm_event_fill_regs
Currently the registers saved in the request depend on which type of event is filling in the registers. In this patch we consolidate the two versions of register filling function as to return a fix set of registers irrespective of the underlying event. Signed-off-by: Tamas K Lengyel <tlengyel@novetta.com> Acked-by: George Dunlap <george.dunlap@citrix.com> Acked-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
This commit is contained in:
Tamas K Lengyel authored and 
Jan Beulich committed
1 parent
a4b4d3d5a8
commit
adc75eba8b
4 files changed
+62
-89
No files matched your search
@@ -25,40 +25,9 @@
|
||||
#include <asm/hvm/event.h>
|
||||
#include <asm/monitor.h>
|
||||
#include <asm/altp2m.h>
|
||||
#include <asm/vm_event.h>
|
||||
#include <public/vm_event.h>
|
||||
|
||||
static void hvm_event_fill_regs(vm_event_request_t *req)
|
||||
{
|
||||
const struct cpu_user_regs *regs = guest_cpu_user_regs();
|
||||
const struct vcpu *curr = current;
|
||||
|
||||
req->data.regs.x86.rax = regs->eax;
|
||||
req->data.regs.x86.rcx = regs->ecx;
|
||||
req->data.regs.x86.rdx = regs->edx;
|
||||
req->data.regs.x86.rbx = regs->ebx;
|
||||
req->data.regs.x86.rsp = regs->esp;
|
||||
req->data.regs.x86.rbp = regs->ebp;
|
||||
req->data.regs.x86.rsi = regs->esi;
|
||||
req->data.regs.x86.rdi = regs->edi;
|
||||
|
||||
req->data.regs.x86.r8 = regs->r8;
|
||||
req->data.regs.x86.r9 = regs->r9;
|
||||
req->data.regs.x86.r10 = regs->r10;
|
||||
req->data.regs.x86.r11 = regs->r11;
|
||||
req->data.regs.x86.r12 = regs->r12;
|
||||
req->data.regs.x86.r13 = regs->r13;
|
||||
req->data.regs.x86.r14 = regs->r14;
|
||||
req->data.regs.x86.r15 = regs->r15;
|
||||
|
||||
req->data.regs.x86.rflags = regs->eflags;
|
||||
req->data.regs.x86.rip = regs->eip;
|
||||
|
||||
req->data.regs.x86.msr_efer = curr->arch.hvm_vcpu.guest_efer;
|
||||
req->data.regs.x86.cr0 = curr->arch.hvm_vcpu.guest_cr[0];
|
||||
req->data.regs.x86.cr3 = curr->arch.hvm_vcpu.guest_cr[3];
|
||||
req->data.regs.x86.cr4 = curr->arch.hvm_vcpu.guest_cr[4];
|
||||
}
|
||||
|
||||
static int hvm_event_traps(uint8_t sync, vm_event_request_t *req)
|
||||
{
|
||||
int rc;
|
||||
@@ -92,7 +61,7 @@ static int hvm_event_traps(uint8_t sync, vm_event_request_t *req)
|
||||
req->altp2m_idx = vcpu_altp2m(curr).p2midx;
|
||||
}
|
||||
|
||||
hvm_event_fill_regs(req);
|
||||
vm_event_fill_regs(req);
|
||||
vm_event_put_request(currd, &currd->vm_event->monitor, req);
|
||||
|
||||
return 1;
|
||||
|
||||
+1
-56
@@ -1541,61 +1541,6 @@ void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp)
|
||||
}
|
||||
}
|
||||
|
||||
static void p2m_vm_event_fill_regs(vm_event_request_t *req)
|
||||
{
|
||||
const struct cpu_user_regs *regs = guest_cpu_user_regs();
|
||||
struct segment_register seg;
|
||||
struct hvm_hw_cpu ctxt;
|
||||
struct vcpu *curr = current;
|
||||
|
||||
/* Architecture-specific vmcs/vmcb bits */
|
||||
hvm_funcs.save_cpu_ctxt(curr, &ctxt);
|
||||
|
||||
req->data.regs.x86.rax = regs->eax;
|
||||
req->data.regs.x86.rcx = regs->ecx;
|
||||
req->data.regs.x86.rdx = regs->edx;
|
||||
req->data.regs.x86.rbx = regs->ebx;
|
||||
req->data.regs.x86.rsp = regs->esp;
|
||||
req->data.regs.x86.rbp = regs->ebp;
|
||||
req->data.regs.x86.rsi = regs->esi;
|
||||
req->data.regs.x86.rdi = regs->edi;
|
||||
|
||||
req->data.regs.x86.r8 = regs->r8;
|
||||
req->data.regs.x86.r9 = regs->r9;
|
||||
req->data.regs.x86.r10 = regs->r10;
|
||||
req->data.regs.x86.r11 = regs->r11;
|
||||
req->data.regs.x86.r12 = regs->r12;
|
||||
req->data.regs.x86.r13 = regs->r13;
|
||||
req->data.regs.x86.r14 = regs->r14;
|
||||
req->data.regs.x86.r15 = regs->r15;
|
||||
|
||||
req->data.regs.x86.rflags = regs->eflags;
|
||||
req->data.regs.x86.rip = regs->eip;
|
||||
|
||||
req->data.regs.x86.dr7 = curr->arch.debugreg[7];
|
||||
req->data.regs.x86.cr0 = ctxt.cr0;
|
||||
req->data.regs.x86.cr2 = ctxt.cr2;
|
||||
req->data.regs.x86.cr3 = ctxt.cr3;
|
||||
req->data.regs.x86.cr4 = ctxt.cr4;
|
||||
|
||||
req->data.regs.x86.sysenter_cs = ctxt.sysenter_cs;
|
||||
req->data.regs.x86.sysenter_esp = ctxt.sysenter_esp;
|
||||
req->data.regs.x86.sysenter_eip = ctxt.sysenter_eip;
|
||||
|
||||
req->data.regs.x86.msr_efer = ctxt.msr_efer;
|
||||
req->data.regs.x86.msr_star = ctxt.msr_star;
|
||||
req->data.regs.x86.msr_lstar = ctxt.msr_lstar;
|
||||
|
||||
hvm_get_segment_register(curr, x86_seg_fs, &seg);
|
||||
req->data.regs.x86.fs_base = seg.base;
|
||||
|
||||
hvm_get_segment_register(curr, x86_seg_gs, &seg);
|
||||
req->data.regs.x86.gs_base = seg.base;
|
||||
|
||||
hvm_get_segment_register(curr, x86_seg_cs, &seg);
|
||||
req->data.regs.x86.cs_arbytes = seg.attr.bytes;
|
||||
}
|
||||
|
||||
void p2m_mem_access_emulate_check(struct vcpu *v,
|
||||
const vm_event_response_t *rsp)
|
||||
{
|
||||
@@ -1760,7 +1705,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla,
|
||||
req->u.mem_access.flags |= npfec.insn_fetch ? MEM_ACCESS_X : 0;
|
||||
req->vcpu_id = v->vcpu_id;
|
||||
|
||||
p2m_vm_event_fill_regs(req);
|
||||
vm_event_fill_regs(req);
|
||||
|
||||
if ( altp2m_active(v->domain) )
|
||||
{
|
||||
|
||||
@@ -122,6 +122,63 @@ void vm_event_set_registers(struct vcpu *v, vm_event_response_t *rsp)
|
||||
v->arch.user_regs.eip = rsp->data.regs.x86.rip;
|
||||
}
|
||||
|
||||
void vm_event_fill_regs(vm_event_request_t *req)
|
||||
{
|
||||
const struct cpu_user_regs *regs = guest_cpu_user_regs();
|
||||
struct segment_register seg;
|
||||
struct hvm_hw_cpu ctxt;
|
||||
struct vcpu *curr = current;
|
||||
|
||||
ASSERT(is_hvm_vcpu(curr));
|
||||
|
||||
/* Architecture-specific vmcs/vmcb bits */
|
||||
hvm_funcs.save_cpu_ctxt(curr, &ctxt);
|
||||
|
||||
req->data.regs.x86.rax = regs->eax;
|
||||
req->data.regs.x86.rcx = regs->ecx;
|
||||
req->data.regs.x86.rdx = regs->edx;
|
||||
req->data.regs.x86.rbx = regs->ebx;
|
||||
req->data.regs.x86.rsp = regs->esp;
|
||||
req->data.regs.x86.rbp = regs->ebp;
|
||||
req->data.regs.x86.rsi = regs->esi;
|
||||
req->data.regs.x86.rdi = regs->edi;
|
||||
|
||||
req->data.regs.x86.r8 = regs->r8;
|
||||
req->data.regs.x86.r9 = regs->r9;
|
||||
req->data.regs.x86.r10 = regs->r10;
|
||||
req->data.regs.x86.r11 = regs->r11;
|
||||
req->data.regs.x86.r12 = regs->r12;
|
||||
req->data.regs.x86.r13 = regs->r13;
|
||||
req->data.regs.x86.r14 = regs->r14;
|
||||
req->data.regs.x86.r15 = regs->r15;
|
||||
|
||||
req->data.regs.x86.rflags = regs->eflags;
|
||||
req->data.regs.x86.rip = regs->eip;
|
||||
|
||||
req->data.regs.x86.dr7 = curr->arch.debugreg[7];
|
||||
req->data.regs.x86.cr0 = ctxt.cr0;
|
||||
req->data.regs.x86.cr2 = ctxt.cr2;
|
||||
req->data.regs.x86.cr3 = ctxt.cr3;
|
||||
req->data.regs.x86.cr4 = ctxt.cr4;
|
||||
|
||||
req->data.regs.x86.sysenter_cs = ctxt.sysenter_cs;
|
||||
req->data.regs.x86.sysenter_esp = ctxt.sysenter_esp;
|
||||
req->data.regs.x86.sysenter_eip = ctxt.sysenter_eip;
|
||||
|
||||
req->data.regs.x86.msr_efer = ctxt.msr_efer;
|
||||
req->data.regs.x86.msr_star = ctxt.msr_star;
|
||||
req->data.regs.x86.msr_lstar = ctxt.msr_lstar;
|
||||
|
||||
hvm_get_segment_register(curr, x86_seg_fs, &seg);
|
||||
req->data.regs.x86.fs_base = seg.base;
|
||||
|
||||
hvm_get_segment_register(curr, x86_seg_gs, &seg);
|
||||
req->data.regs.x86.gs_base = seg.base;
|
||||
|
||||
hvm_get_segment_register(curr, x86_seg_cs, &seg);
|
||||
req->data.regs.x86.cs_arbytes = seg.attr.bytes;
|
||||
}
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* mode: C
|
||||
|
||||
@@ -42,4 +42,6 @@ void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *rsp);
|
||||
|
||||
void vm_event_set_registers(struct vcpu *v, vm_event_response_t *rsp);
|
||||
|
||||
void vm_event_fill_regs(vm_event_request_t *req);
|
||||
|
||||
#endif /* __ASM_X86_VM_EVENT_H__ */
|
||||