:PVH xen: support invalid op, return PVH features etc...
PATCH v2 12/18 :PVH xen: support invalid op, return PVH features etc...
The biggest change in this patch is in traps.c to allow forced invalid op for PVH guest. Also, enable hypercall page init for PVH guest also. Finally, set guest type to PVH if PV with HAP is created.
Changes in V2:
- Fix emulate_forced_invalid_op() to use proper copy function, and inject PF in case it fails.
- remove extraneous PVH check in STI/CLI ops en emulate_privileged_op().
- Make assert a debug ASSERT in show_registers().
- debug.c: keep get_gfn() locked and move put_gfn closer to it.
--- xen/arch/x86/debug.c | 9 ++++----- xen/arch/x86/traps.c | 43 +++++++++++++++++++++++++++++++++++++------ xen/arch/x86/x86_64/traps.c | 5 +++-- xen/common/domain.c | 9 +++++++++ xen/common/domctl.c | 4 ++++ xen/common/kernel.c | 6 +++++- 6 files changed, 62 insertions(+), 14 deletions(-)
xen/arch/x86/debug.c +4 -5
@@ -59,7 +59,9 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr,return INVALID_MFN ; } - mfn =mfn_x (get_gfn (dp, *gfn, &gfntype)); + mfn =mfn_x (get_gfn_query (dp, *gfn, &gfntype)); +put_gfn (dp, *gfn); +if (p2m_is_readonly (gfntype) && toaddr ) {DBGP2 ("kdb:p2m_is_readonly: gfntype:%x\n" , gfntype);
@@ -158,7 +160,7 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, pagecnt =min_t (long,PAGE_SIZE - (addr & ~PAGE_MASK ), len); - mfn = (is_hvm_domain (dp) + mfn = (is_hvm_or_pvh_domain (dp) ?dbg_hvm_va2mfn (addr, dp, toaddr, &gfn) :dbg_pv_va2mfn (addr, dp, pgd3));if ( mfn ==INVALID_MFN )
@@ -178,9 +180,6 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, }unmap_domain_page (va); -if ( gfn !=INVALID_GFN ) -put_gfn (dp, gfn); - addr += pagecnt; buf += pagecnt; len -= pagecnt;
xen/arch/x86/traps.c +37 -6
103 lines not on this page · raw message
xen/arch/x86/x86_64/traps.c +3 -2
@@ -147,7 +147,7 @@ void vcpu_show_registers(const struct vcpu *v)unsigned long crs[8 ];/* No need to handle HVM for now. */ -if (is_hvm_vcpu (v) ) +if (is_hvm_or_pvh_vcpu (v) )return ; crs[0 ] = v->arch.pv_vcpu.ctrlreg[0 ];
@@ -440,6 +440,7 @@ static long register_guest_callback(struct callback_register *reg)long ret =0 ;struct vcpu *v = current; +ASSERT ( !is_pvh_vcpu (v) );if ( !is_canonical_address (reg->address) )return -EINVAL ;
@@ -620,7 +621,7 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page)void hypercall_page_initialise (struct domain *d,void *hypercall_page) {memset (hypercall_page,0xCC ,PAGE_SIZE ); -if (is_hvm_domain (d) ) +if (is_hvm_or_pvh_domain (d) )hvm_hypercall_page_initialise (d, hypercall_page);else if ( !is_pv_32bit_domain (d) )hypercall_page_initialise_ring3_kernel (hypercall_page);
xen/common/domain.c +9 -0
@@ -232,6 +232,15 @@ struct domain *domain_create(if ( domcr_flags & DOMCRF_hvm ) d->guest_type = hvm_guest; +else if ( domcr_flags & DOMCRF_pvh ) { + d->guest_type = pvh_guest; +if ( !(domcr_flags & DOMCRF_hap) ) { +printk ("PVH guest must have HAP on\n" ); + goto fail; + }else +printk ("PVH guest. Please note it is experimental. domid:%d\n" , + domid); + }if ( domid ==0 ) {
xen/common/domctl.c +4 -0
@@ -149,6 +149,8 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info)if (is_hvm_domain (d) ) info->flags |= XEN_DOMINF_hvm_guest; +else if (is_pvh_domain (d) ) + info->flags |= XEN_DOMINF_pvh_guest;xsm_security_domaininfo (d, info);
@@ -400,6 +402,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) domcr_flags =0 ;if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hvm_guest ) domcr_flags |= DOMCRF_hvm; +else if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) + domcr_flags |= DOMCRF_pvh;/* PV with HAP is a PVH guest */ if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) domcr_flags |= DOMCRF_hap;if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_s3_integrity )
xen/common/kernel.c +5 -1
@@ -289,7 +289,11 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)if ( current->domain == dom0 ) fi.submap |=1U << XENFEAT_dom0;#ifdef CONFIG_X86 -if ( !is_hvm_vcpu (current) ) +if (is_pvh_vcpu (current) ) + fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | + (1U << XENFEAT_supervisor_mode_kernel) | + (1U << XENFEAT_hvm_callback_vector); +else if ( !is_hvm_vcpu (current) ) fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits);
Signature · 1 line
1.7.2.3
xen/arch/x86/traps.c static void instruction_done( · line 464
Quoted 10 lines
Quoted 1 line
Quoted 1 line · Mukesh Rathor
xen/arch/x86/traps.c +3
-0@@ -459,6 +459,10 @@ static void instruction_done( struct cpu_user_regs *regs, unsigned long eip, unsigned int bpmatch) { regs->eip = eip; + +if (is_pvh_vcpu (current) ) +return ;
So how would breakpoint matching on emulated instructions work?
xen/arch/x86/traps.c static unsigned int check_guest_io_breakpoint(struct vcpu *v, · line 483
Quoted 10 lines
xen/arch/x86/traps.c +3
-0+ regs->eflags &= ~X86_EFLAGS_RF ;if ( bpmatch || (regs->eflags &X86_EFLAGS_TF ) ) {@@ -475,6 +479,10 @@ static unsigned int check_guest_io_breakpoint(struct vcpu *v,unsigned int width, i, match =0 ;unsigned long start; +if (is_pvh_vcpu (v) ) { +/* for pvh, ctrlreg field is not implemented/used unless we need to */
???
Quoted 15 lines
xen/arch/x86/traps.c +3
-1+return 0 ; + }if ( !(v->arch.debugreg[5 ]) || !(v->arch.pv_vcpu.ctrlreg[4 ] &X86_CR4_DE ) )return 0 ;@@ -908,14 +916,18 @@ static int emulate_invalid_rdtscp(struct cpu_user_regs *regs)unsigned long emulate_forced_invalid_op (struct cpu_user_regs *regs) {char sig[5 ], instr[2 ]; -unsigned long eip, rc; +unsigned long eip, rc, addr; eip = regs->eip;/* Check for forced emulation signature: ud2 ; .ascii "xen". */
xen/arch/x86/traps.c static int emulate_invalid_rdtscp(struct cpu_user_regs *regs) · line 931
Quoted 10 lines
xen/arch/x86/traps.c +6
-2-if ( (rc =copy_from_user (sig, (char *)eip,sizeof (sig))) !=0 ) +if ( (rc =raw_copy_from_guest (sig, (char *)eip,sizeof (sig))) !=0 ) { -propagate_page_fault (eip +sizeof (sig) - rc,0 ); + addr = eip +sizeof (sig) - rc; +if (is_pvh_vcpu (current) ) +return addr; + +propagate_page_fault (addr,0 );return EXCRET_fault_fixed;
Returning "addr" here as well as EXCRET_* values, even if you got this properly separated right now, looks like setting us up for future problems.
Jan
Quoted 13 lines · On Mon, 18 Mar 2013 12:27:47 +0000 "Jan Beulich" <[email protected]> wrote:
xen/arch/x86/traps.c static void instruction_done( · line 464
Quoted 11 lines
Quoted 2 lines
Quoted 2 lines
On 16.03.13 at 01:48, Mukesh Rathor <[email protected]> wrote:
xen/arch/x86/traps.c +3
-0@@ -459,6 +459,10 @@ static void instruction_done( struct cpu_user_regs *regs, unsigned long eip, unsigned int bpmatch) { regs->eip = eip; + +if (is_pvh_vcpu (current) ) +return ;So how would breakpoint matching on emulated instructions work?
Should be same as HVM guest, but I'll add action item to investigate more.
thanks,
Mukesh
Quoted 60 lines · Mukesh Rathor
The biggest change in this patch is in
traps.cto allow forced invalid op for PVH guest. Also, enable hypercall page init for PVH guest also. Finally, set guest type to PVH if PV with HAP is created.Changes in V2:
- Fixemulate_forced_invalid_op()to use proper copy function, and inject PF in case it fails.
- remove extraneous PVH check in STI/CLI ops enemulate_privileged_op().
- Make assert a debug ASSERT inshow_registers().
-debug.c: keepget_gfn()locked and moveput_gfncloser to it.Signed-off-by Mukesh Rathor <[email protected]>--- xen/arch/x86/debug.c | 9 ++++----- xen/arch/x86/traps.c | 43 +++++++++++++++++++++++++++++++++++++------ xen/arch/x86/x86_64/traps.c | 5 +++-- xen/common/domain.c | 9 +++++++++ xen/common/domctl.c | 4 ++++ xen/common/kernel.c | 6 +++++- 6 files changed, 62 insertions(+), 14 deletions(-)xen/arch/x86/debug.c +4
-5@@ -59,7 +59,9 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr,return INVALID_MFN ; } - mfn =mfn_x (get_gfn (dp, *gfn, &gfntype)); + mfn =mfn_x (get_gfn_query (dp, *gfn, &gfntype)); +put_gfn (dp, *gfn); +if (p2m_is_readonly (gfntype) && toaddr ) {DBGP2 ("kdb:p2m_is_readonly: gfntype:%x\n" , gfntype);@@ -158,7 +160,7 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, pagecnt =min_t (long,PAGE_SIZE - (addr & ~PAGE_MASK ), len); - mfn = (is_hvm_domain (dp) + mfn = (is_hvm_or_pvh_domain (dp) ?dbg_hvm_va2mfn (addr, dp, toaddr, &gfn) :dbg_pv_va2mfn (addr, dp, pgd3));if ( mfn ==INVALID_MFN )@@ -178,9 +180,6 @@ dbg_rw_guest_mem(dbgva_t addr, dbgbyte_t *buf, int len, struct domain *dp, }unmap_domain_page (va); -if ( gfn !=INVALID_GFN ) -put_gfn (dp, gfn); - addr += pagecnt; buf += pagecnt; len -= pagecnt;xen/arch/x86/traps.c +0
-0
xen/arch/x86/traps.c static void instruction_done( · line 464
Quoted 6 lines
xen/arch/x86/traps.c +3
-0@@ -459,6 +459,10 @@ static void instruction_done( struct cpu_user_regs *regs, unsigned long eip, unsigned int bpmatch) { regs->eip = eip; + +if (is_pvh_vcpu (current) ) +return ;
Can it be above the 'regs->eip = eip' ?
Quoted 65 lines
xen/arch/x86/traps.c +22
-5+ regs->eflags &= ~X86_EFLAGS_RF ;if ( bpmatch || (regs->eflags &X86_EFLAGS_TF ) ) {@@ -475,6 +479,10 @@ static unsigned int check_guest_io_breakpoint(struct vcpu *v,unsigned int width, i, match =0 ;unsigned long start; +if (is_pvh_vcpu (v) ) { +/* for pvh, ctrlreg field is not implemented/used unless we need to */ +return 0 ; + }if ( !(v->arch.debugreg[5 ]) || !(v->arch.pv_vcpu.ctrlreg[4 ] &X86_CR4_DE ) )return 0 ;@@ -908,14 +916,18 @@ static int emulate_invalid_rdtscp(struct cpu_user_regs *regs)unsigned long emulate_forced_invalid_op (struct cpu_user_regs *regs) {char sig[5 ], instr[2 ]; -unsigned long eip, rc; +unsigned long eip, rc, addr; eip = regs->eip;/* Check for forced emulation signature: ud2 ; .ascii "xen". */ -if ( (rc =copy_from_user (sig, (char *)eip,sizeof (sig))) !=0 ) +if ( (rc =raw_copy_from_guest (sig, (char *)eip,sizeof (sig))) !=0 ) { -propagate_page_fault (eip +sizeof (sig) - rc,0 ); + addr = eip +sizeof (sig) - rc; +if (is_pvh_vcpu (current) ) +return addr; + +propagate_page_fault (addr,0 );return EXCRET_fault_fixed; }if (memcmp (sig,"\xf\xbxen" ,sizeof (sig)) )@@ -923,9 +935,13 @@ unsigned long emulate_forced_invalid_op(struct cpu_user_regs *regs) eip +=sizeof (sig);/* We only emulate CPUID. */ -if ( ( rc =copy_from_user (instr, (char *)eip,sizeof (instr))) !=0 ) +if ( ( rc =raw_copy_from_guest (instr, (char *)eip,sizeof (instr))) !=0 ) { -propagate_page_fault (eip +sizeof (instr) - rc,0 ); + addr = eip +sizeof (instr) - rc; +if (is_pvh_vcpu (current) ) +return addr; + +propagate_page_fault (addr,0 );return EXCRET_fault_fixed; }if (memcmp (instr,"\xf\xa2" ,sizeof (instr)) )@@ -1068,6 +1084,10 @@ void propagate_page_fault(unsigned long addr, u16 error_code)struct vcpu *v = current;struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; +/* PVH should not get here. ctrlreg is not implemented amongst other +* things */ +ASSERT ( !is_pvh_vcpu (v) ); + v->arch.pv_vcpu.ctrlreg[2 ] = addr;arch_set_cr2 (v, addr);
xen/arch/x86/traps.c static int read_descriptor(unsigned int sel, · line 1477
Quoted 5 lines
xen/arch/x86/traps.c +2
-0@@ -1453,6 +1473,9 @@ static int read_descriptor(unsigned int sel, {struct desc_struct desc; +if (is_pvh_vcpu (v) ) +return hvm_pvh_read_descriptor (sel, v, regs, base, limit, ar);
Ah, that is why you are using such weird arguments. And it looks like emulate_privileged_op really needs it as single variables.
Perhaps then you can just add a comment in hvm_pvh_read_descriptor saying that the reason you are shifting is b/c the caller (emulate_privileged_op) expects it to be in this format.
xen/arch/x86/traps.c static int guest_io_okay( · line 1599
Quoted 11 lines
xen/arch/x86/traps.c +4
-0+if ( !vm86_mode (regs) ) {if ( sel <4 )@@ -1571,6 +1594,11 @@ static int guest_io_okay(int user_mode = !(v->arch.flags & TF_kernel_mode);#define TOGGLE_MODE () if ( user_mode ) toggle_guest_mode(v) +/* for PVH we check this in vmexit for EXIT_REASON_IO_INSTRUCTION +* and so don't need to check again here. */ +if (is_pvh_vcpu (v))
Odd syntax.
Quoted 29 lines
xen/arch/x86/traps.c +6
-1+return 1 ; +if ( !vm86_mode (regs) && (v->arch.pv_vcpu.iopl >= (guest_kernel_mode (v, regs) ?1 :3 )) )return 1 ;@@ -1816,7 +1844,7 @@ static inline uint64_t guest_misc_enable(uint64_t val) _ptr = (unsigned int )_ptr; \if ( (limit) <sizeof (_x) -1 || (eip) > (limit) - (sizeof (_x) -1 ) ) \ goto fail; \ -if ( (_rc =copy_from_user (&_x, (type *)_ptr,sizeof (_x))) !=0 ) \ +if ( (_rc =raw_copy_from_guest (&_x, (type *)_ptr,sizeof (_x))) !=0 ) \ { \propagate_page_fault (_ptr +sizeof (_x) - _rc,0 ); \ goto skip; \@@ -3245,6 +3273,9 @@ void do_device_not_available(struct cpu_user_regs *regs)BUG_ON (!guest_mode (regs)); +/* PVH should not get here. ctrlreg is not implemented */ +ASSERT ( !is_pvh_vcpu (curr) ); +vcpu_restore_fpu_lazy (curr);if ( curr->arch.pv_vcpu.ctrlreg[0 ] &X86_CR0_TS )xen/arch/x86/x86_64/traps.c +0
-0
xen/arch/x86/x86_64/traps.c void vcpu_show_registers(const struct vcpu *v) · line 149
Quoted 3 lines
xen/arch/x86/x86_64/traps.c +0
-0@@ -147,7 +147,7 @@ void vcpu_show_registers(const struct vcpu *v)unsigned long crs[8 ];/* No need to handle HVM for now. */
.. and PVH ..
Quoted 28 lines
xen/arch/x86/x86_64/traps.c +1
-1-if (is_hvm_vcpu (v) ) +if (is_hvm_or_pvh_vcpu (v) )return ;crs[0] = v->arch.pv_vcpu.ctrlreg[0];xen/arch/x86/x86_64/traps.c +2
-1@@ -440,6 +440,7 @@ static long register_guest_callback(struct callback_register *reg)long ret =0 ;struct vcpu *v = current; +ASSERT ( !is_pvh_vcpu (v) );if ( !is_canonical_address (reg->address) )return -EINVAL ;@@ -620,7 +621,7 @@ static void hypercall_page_initialise_ring3_kernel(void *hypercall_page)void hypercall_page_initialise (struct domain *d,void *hypercall_page) {memset (hypercall_page,0xCC ,PAGE_SIZE ); -if (is_hvm_domain (d) ) +if (is_hvm_or_pvh_domain (d) )hvm_hypercall_page_initialise (d, hypercall_page);else if ( !is_pv_32bit_domain (d) )hypercall_page_initialise_ring3_kernel (hypercall_page);xen/common/domain.c +0
-0
xen/common/domain.c struct domain *domain_create( · line 238
Quoted 7 lines
xen/common/domain.c +4
-0@@ -232,6 +232,15 @@ struct domain *domain_create(if ( domcr_flags & DOMCRF_hvm ) d->guest_type = hvm_guest; +else if ( domcr_flags & DOMCRF_pvh ) { + d->guest_type = pvh_guest; +if ( !(domcr_flags & DOMCRF_hap) ) { +printk ("PVH guest must have HAP on\n" );
Ahem. XENLOG_ERR
xen/common/domain.c struct domain *domain_create( · line 242
Quoted 4 lines
xen/common/domain.c +4
-0+ goto fail; + }else +printk ("PVH guest. Please note it is experimental. domid:%d\n" , + domid);
XENLOG_INFO or XENLOG_DEBUG
Quoted 18 lines
xen/common/domain.c +1
-0+ }if ( domid ==0 ) {xen/common/domctl.c +2
-0@@ -149,6 +149,8 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info)if (is_hvm_domain (d) ) info->flags |= XEN_DOMINF_hvm_guest; +else if (is_pvh_domain (d) ) + info->flags |= XEN_DOMINF_pvh_guest;xsm_security_domaininfo (d, info);
xen/common/domctl.c long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) · line 406
Quoted 5 lines
xen/common/domctl.c +2
-0@@ -400,6 +402,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) domcr_flags =0 ;if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hvm_guest ) domcr_flags |= DOMCRF_hvm; +else if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) + domcr_flags |= DOMCRF_pvh;/* PV with HAP is a PVH guest */
<scratches his head>
So if the user sets: 'hap' in their guest config we automatically set domcr_flags to DOMCRF_hvm | DOMCRF_pvh right?
Then in domain_create we do this check:
if (domcr_flags & DOMCRF_pvh ) {
d->guest_type = pvh_guest;and we force an HVM guest with 'hap=1' in the guest config to be a pvh_guest ?
Quoted 29 lines
xen/common/domctl.c +0
-0if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) domcr_flags |= DOMCRF_hap;if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_s3_integrity )xen/common/kernel.c +5
-1@@ -289,7 +289,11 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)if ( current->domain == dom0 ) fi.submap |=1U << XENFEAT_dom0;#ifdef CONFIG_X86 -if ( !is_hvm_vcpu (current) ) +if (is_pvh_vcpu (current) ) + fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | + (1U << XENFEAT_supervisor_mode_kernel) | + (1U << XENFEAT_hvm_callback_vector); +else if ( !is_hvm_vcpu (current) ) fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits);Signature · 7 lines
1.7.2.3 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Quoted 6 lines · On Mon, 18 Mar 2013 13:48:43 -0400 Konrad Rzeszutek Wilk…
Quoted 5 lines · Mukesh Rathor
The biggest change in this patch is in
traps.cto allow forced
invalid op for PVH guest. Also, enable hypercall page init for PVH guest also. Finally, set guest type to PVH if PV with HAP is created.
Quoted 12 lines
xen/arch/x86/traps.c static void instruction_done( · line 464
Quoted 10 lines
index ab54f82..14656c1 100644
xen/arch/x86/traps.c +3
-0@@ -459,6 +459,10 @@ static void instruction_done( struct cpu_user_regs *regs, unsigned long eip, unsigned int bpmatch) { regs->eip = eip; + +if (is_pvh_vcpu (current) ) +return ;Can it be above the '
regs->eip= eip' ?
No it can't.
Quoted 19 lines
Quoted 15 lines
xen/arch/x86/traps.c +2
-0@@ -149,6 +149,8 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info)if (is_hvm_domain (d) ) info->flags |= XEN_DOMINF_hvm_guest; +else if (is_pvh_domain (d) ) + info->flags |= XEN_DOMINF_pvh_guest;xsm_security_domaininfo (d, info);@@ -400,6 +402,8 @@ longdo_domctl (XEN_GUEST_HANDLE_PARAM (xen_domctl_t ) u_domctl)
domcr_flags= 0; if (op->u.createdomain.flags&XEN_DOMCTL_CDF_hvm_guest)domcr_flags|=DOMCRF_hvm;xen/arch/x86/traps.c +2
-0+else if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_hap ) + domcr_flags |= DOMCRF_pvh;/* PV with HAP is a PVH Quoted 1 line
guest */
<scratches his head>
Quoted 3 lines
So if the user sets: 'hap' in their guest config we automatically set
domcr_flagstoDOMCRF_hvm|DOMCRF_pvhright?
No. hap doesn't automatically result in setting of DOMCRF_hvm.
Quoted 10 lines · Mukesh Rathor
xen/arch/x86/traps.c +1
-1@@ -908,14 +916,18 @@ static int emulate_invalid_rdtscp(struct cpu_user_regs *regs)unsigned long emulate_forced_invalid_op (struct cpu_user_regs *regs) {char sig[5 ], instr[2 ]; -unsigned long eip, rc; +unsigned long eip, rc, addr; eip = regs->eip;/* Check for forced emulation signature: ud2 ; .ascii "xen". */
xen/arch/x86/traps.c static int emulate_invalid_rdtscp(struct cpu_user_regs *regs) · line 931
Quoted 10 lines
xen/arch/x86/traps.c +6
-2-if ( (rc =copy_from_user (sig, (char *)eip,sizeof (sig))) !=0 ) +if ( (rc =raw_copy_from_guest (sig, (char *)eip,sizeof (sig))) !=0 ) { -propagate_page_fault (eip +sizeof (sig) - rc,0 ); + addr = eip +sizeof (sig) - rc; +if (is_pvh_vcpu (current) ) +return addr; + +propagate_page_fault (addr,0 );return EXCRET_fault_fixed;
Ah, I see Jan already commented on this. Since the function can already return 0 or 1 there's no consistent way to tell what the return value means (and if there were, it would merit a great big comment at the declaration explaining it).
Tim.