PV extension of HVM(hybrid) in support in Xen
PATCH v5 1/1 PV extension of HVM(hybrid) in support in Xen
Hi Keir
The latest (hybrid) patchset again...
Change from v4:
1. Add support for PV clocksource on HVM. (Replace evtchn enabling with pv clock enabling).
2. Update the patch following Tim's comments.
Change from v3:
1. Minor polish the patchset. Replace several specific is_hvm_pv_evtchn_domain() judgement.
2. Name changed...
Change from v2:
1. Change the name "hybrid" to "PV featured HVM", as well as flag and macro names.
2. Merge the hypercall page with HVM.
3. Clean up VIRQ delivery mechanism, fixing the lock issue.
4. Remove the reserved the region in E820(but another issue remains, I can't get location of grant table elegantly, as I described in Linux part patches)
Please review, thanks!
Signature · 2 lines
regards Yang, Sheng
xen/arch/x86/domain.c +9 -0
@@ -686,7 +686,16 @@if (is_hvm_vcpu (v) ) { +unsigned long eip, cs; +hvm_set_info_guest (v); + + eip =c (user_regs.eip); +if (eip !=0 ) { + cs = eip >>12 <<8 ; +hvm_vcpu_reset_state (v, cs,0 ); + hvm_funcs.set_tsc_offset (v,0 ); + } goto out; }
xen/arch/x86/hvm/hvm.c +41 -0
59 lines not on this page · raw message
xen/arch/x86/hvm/irq.c +50 -14
136 lines not on this page · raw message
xen/arch/x86/hvm/vlapic.c +4 -0
@@ -289,6 +289,10 @@return X86EMUL_RETRY ;hvm_vcpu_reset_state (v, trampoline_vector <<8 ,0 ); + +/* Adjust TSC for PV clock */ +if (is_hvm_pv_clock_enabled_domain (v->domain)) + hvm_funcs.set_tsc_offset (v,0 );vcpu_unpause (v);
xen/arch/x86/hvm/vmx/intr.c +2 -1
@@ -164,7 +164,8 @@ {HVMTRACE_2D (INJ_VIRQ , intack.vector,/*fake=*/ 0 );vmx_inject_extint (intack.vector); -pt_intr_post (v, intack); +if (intack.source != hvm_intsrc_vector) +pt_intr_post (v, intack); }/* Is there another IRQ to queue up behind this one? */
xen/arch/x86/traps.c +9 -0
@@ -686,6 +686,7 @@struct domain *d = current->domain;/* Optionally shift out of the way of Viridian architectural leaves. */ uint32_t base =is_viridian_domain (d) ?0x40000100 :0x40000000 ; +unsigned int tmp_eax, tmp_ebx, tmp_ecx, tmp_edx; idx -= base;if ( idx >3 )
@@ -716,6 +717,14 @@ *edx =0 ;/* Features 2 */ if ( !is_hvm_vcpu (current) ) *ecx |=XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD ; + +/* Check if additional feature specified, e.g. Hybrid */ +if ( !is_viridian_domain (d) ) { +domain_cpuid (d,0x40000002 ,0 , + &tmp_eax, &tmp_ebx, &tmp_ecx, &tmp_edx); +if (tmp_edx !=0 ) + *edx = tmp_edx &XEN_CPUID_FEAT2_MASK ; + }break ;case 3 :
xen/include/asm-x86/hvm/hvm.h +3 -1
@@ -33,7 +33,8 @@ hvm_intsrc_pic, hvm_intsrc_lapic, hvm_intsrc_nmi, - hvm_intsrc_mce + hvm_intsrc_mce, + hvm_intsrc_vector, };struct hvm_intack {uint8_t source;/* enum hvm_intsrc */
@@ -44,6 +45,7 @@#define hvm_intack_lapic (vec) ( (struct hvm_intack) { hvm_intsrc_lapic, vec } )#define hvm_intack_nmi ( (struct hvm_intack) { hvm_intsrc_nmi, 2 } )#define hvm_intack_mce ( (struct hvm_intack) { hvm_intsrc_mce, 18 } ) +#define hvm_intack_vector (vec)( (struct hvm_intack) { hvm_intsrc_vector, vec } )enum hvm_intblk { hvm_intblk_none,/* not blocked (deliverable) */ hvm_intblk_shadow,/* MOV-SS or STI shadow */
xen/include/asm-x86/hvm/irq.h +3 -1
@@ -54,12 +54,14 @@enum { HVMIRQ_callback_none, HVMIRQ_callback_gsi, - HVMIRQ_callback_pci_intx + HVMIRQ_callback_pci_intx, + HVMIRQ_callback_vector, } callback_via_type; };union {uint32_t gsi;struct {uint8_t dev, intx; } pci; +uint32_t vector; } callback_via;/* Number of INTx wires asserting each PCI-ISA link. */
xen/include/public/arch-x86/cpuid.h +7 -0
@@ -65,4 +65,11 @@#define _XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD 0#define XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD (1u<<0) +/* Mask unsupported CPUID specified by user */ +#define XEN_CPUID_FEAT2_MASK 0x3ul +#define _XEN_CPUID_FEAT2_HVM_PV 0 +#define XEN_CPUID_FEAT2_HVM_PV (1u<<0) +#define _XEN_CPUID_FEAT2_HVM_PV_EVTCHN 1 +#define XEN_CPUID_FEAT2_HVM_PV_EVTCHN (1u<<1) +#endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */
xen/include/public/hvm/hvm_op.h +7 -0
@@ -127,6 +127,13 @@typedef struct xen_hvm_set_mem_type xen_hvm_set_mem_type_t ;DEFINE_XEN_GUEST_HANDLE (xen_hvm_set_mem_type_t); +#define HVMOP_enable_pv 9 +struct xen_hvm_pv_type { +domid_t domid; +uint32_t flags; +#define HVM_PV_CLOCK (1ull<<0) +#define HVM_PV_EVTCHN (1ull<<1) +};#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
xen/include/public/xen.h +6 -1
@@ -158,7 +158,12 @@#define VIRQ_ARCH_6 22#define VIRQ_ARCH_7 23 -#define NR_VIRQS 24 +#define VIRQ_EMUL_PIN_START 24 +#define VIRQ_EMUL_PIN_END 39 +#define VIRQ_EMUL_PIN_NUM 16 +#define VIRQ_EMUL_PIN (x) (VIRQ_EMUL_PIN_START + x) + +#define NR_VIRQS 40/* * HYPERVISOR_mmu_update(reqs, count, pdone, foreigndom)
xen/include/xen/sched.h +6 -0
@@ -311,6 +311,9 @@/* Memory paging support */ struct mem_event_domain mem_event; + +#define XEN_HVM_PV_CLOCK_ENABLED (1u << 0) +uint64_t hvm_pv_enabled; };struct domain_setup_info
@@ -597,6 +600,9 @@#define is_hvm_vcpu (v) (is_hvm_domain(v->domain))#define need_iommu (d) ((d)->need_iommu) +#define is_hvm_pv_clock_enabled_domain (d) \ + ((d)->hvm_pv_enabled & XEN_HVM_PV_CLOCK_ENABLED) +void set_vcpu_migration_delay (unsigned int delay);unsigned int get_vcpu_migration_delay (void );
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Hi,
Given that we now have a similar feature from Stefano I'd like to see them resolved into a single patchset.
xen/arch/x86/hvm/hvm.c line 3148
Quoted 6 lines · Sheng Yang
xen/arch/x86/hvm/hvm.c +6
-0+if (a.flags &HVM_PV_CLOCK ) { + d->hvm_pv_enabled |=XEN_HVM_PV_CLOCK_ENABLED ; +update_domain_wallclock_time (d); +/* Other vcpus are adjusted during the start-up */ + hvm_funcs.set_tsc_offset (d->vcpu[0 ],0 ); + }
This still makes no sense to me. Either it should affect the calling vcpu (i.e., current) or it should affect all online vcpus.
Also, whatever the semantics, they should be documented in comments in the header file.
Tim.
Signature · 3 lines
Tim Deegan <[email protected]> Principal Software Engineer, XenServer Engineering Citrix Systems UK Ltd. (Company #02937203, SL9 0BG)
Quoted 4 lines · On Thursday 04 March 2010 23:04:31 Tim Deegan wrote:
Hi,
Given that we now have a similar feature from Stefano I'd like to see them resolved into a single patchset.
I think Stefano's patch focused on pv_ops dom0? We are focused on upstream Linux as domU...
I think we can get dom0 approach step by step.
Quoted 11 lines
xen/arch/x86/hvm/hvm.c line 3148
Quoted 6 lines · Sheng Yang
xen/arch/x86/hvm/hvm.c +6
-0+if (a.flags &HVM_PV_CLOCK ) { + d->hvm_pv_enabled |=XEN_HVM_PV_CLOCK_ENABLED ; +update_domain_wallclock_time (d); +/* Other vcpus are adjusted during the start-up */ + hvm_funcs.set_tsc_offset (d->vcpu[0 ],0 ); + }This still makes no sense to me. Either it should affect the calling vcpu (i.e., current) or it should affect all online vcpus.
Yeah... I would make it affect the calling vcpu.
Quoted 3 lines
Also, whatever the semantics, they should be documented in comments in the header file.
Sure.
Signature · 2 lines
regards Yang, Sheng
Quoted 8 lines · Sheng Yang
Quoted 4 lines · On Thursday 04 March 2010 23:04:31 Tim Deegan wrote:
Hi,
Given that we now have a similar feature from Stefano I'd like to see them resolved into a single patchset.
I think Stefano's patch focused on
pv_opsdom0? We are focused on upstream Linux as domU...
Stefano's patches are based on the latest Xen branches which support dom0 but his work is focused on domU. That is because there is a lot of similarity between the needs of dom0 and the needs of PVonHVM event channels so it makes sense to leverage one for the other.
Quoted 1 line
I think we can get dom0 approach step by step.
I think we'd be better served in extracting the bits of the domain0 patchset which support/enable Stefano's patches and pushing that stuff upstream as a complete series. Otherwise we basically need to reimplement domain 0 stuff on top of / alongside your patcheset.
Ian.
Quoted 15 lines · Ian Campbell
Quoted 8 lines · Sheng Yang
Quoted 4 lines · On Thursday 04 March 2010 23:04:31 Tim Deegan wrote:
Hi,
Given that we now have a similar feature from Stefano I'd like to see them resolved into a single patchset.
I think Stefano's patch focused on
pv_opsdom0? We are focused on upstream Linux as domU...Stefano's patches are based on the latest Xen branches which support dom0 but his work is focused on domU. That is because there is a lot of similarity between the needs of dom0 and the needs of PVonHVM event channels so it makes sense to leverage one for the other.
Quoted 7 lines
Quoted 1 line
I think we can get dom0 approach step by step.
I think we'd be better served in extracting the bits of the domain0 patchset which support/enable Stefano's patches and pushing that stuff upstream as a complete series. Otherwise we basically need to reimplement domain 0 stuff on top of / alongside your patcheset.
Indeed.
If you look at the fourth patch of my series you'll find that the only thing needed is the xen_setup_pirqs mechanism, that has been recently refactored to address the comments from the kernel community, so it shouldn't be difficult to upstream.
Besides upstreaming something now that you know has to be changed soon is certainly not going to help Xen or its users.