x86/nvmx: fixes for interrupt injection
v4 cover x86/nvmx: fixes for interrupt injection
Hello,
osstest identified a regression caused by my earlier attempt to fix interrupt injection when using nested VMX. This series aims to fix the regression, and should unblock several osstest branches.
The following report is from osstest with this series applied:
http://logs.test-lab.xenproject.org/osstest/logs/149084/
Note the last patch (2/2) is the one that actually fixes the issue. Xen will always use the Ack on exit feature so patche 1/2 don't change the functionality when running a nested Xen, as it always requires SVI to be updated.
Thanks, Roger.
Roger Pau Monne (2):
x86/nvmx: split updating RVI from SVI in nvmx_update_apicv x86/nvmx: update exit bitmap when using virtual interrupt delivery
xen/arch/x86/hvm/vmx/intr.c | 21 +++++++++++------- xen/arch/x86/hvm/vmx/vvmx.c | 36 +++++++++++++++++++++++-------- xen/include/asm-x86/hvm/vmx/vmx.h | 2 ++ 3 files changed, 42 insertions(+), 17 deletions(-)
Signature · 1 line
2.26.0
PATCH v4 1/2 x86/nvmx: split updating RVI from SVI in nvmx_update_apicv
Updating SVI is required when an interrupt has been injected using the Ack on exit VMEXIT feature, so that the in service interrupt in the GUEST_INTR_STATUS matches the vector that is signaled in VM_EXIT_INTR_INFO.
Updating RVI however is not tied to the Ack on exit feature, as it signals the next vector to be injected, and hence should always be updated to the next pending vector, regardless of whether Ack on exit is enabled.
When not using the Ack on exit feature preserve the previous vector in SVI, so that it's not lost when RVI is updated to contain the pending vector to inject.
---
Changes since v3:
- Return early if interrupt source is not lapic.
Changes since v2:
- Return early if the exit reason != EXTERNAL_INTERRUPT.
- Reduce the number of vmwrites by accumulating the changes to a local variable which is flushed at the end of the function.
- Attempt to preserve the exiting SVI if Ack on exit is not enabled.
--- xen/arch/x86/hvm/vmx/vvmx.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
xen/arch/x86/hvm/vmx/vvmx.c +25 -10
@@ -1384,28 +1384,43 @@ static void nvmx_update_apicv(struct vcpu *v)struct nestedvmx *nvmx = &vcpu_2_nvmx (v);unsigned long reason =get_vvmcs (v,VM_EXIT_REASON );unsigned long intr_info =get_vvmcs (v,VM_EXIT_INTR_INFO ); +unsigned long status; +int rvi; -if ( reason ==EXIT_REASON_EXTERNAL_INTERRUPT && - nvmx->intr.source == hvm_intsrc_lapic && - (intr_info &INTR_INFO_VALID_MASK ) ) +if ( reason !=EXIT_REASON_EXTERNAL_INTERRUPT || + nvmx->intr.source != hvm_intsrc_lapic ) +return ; + +if ( intr_info &INTR_INFO_VALID_MASK ) { -uint16_t status; -uint32_t rvi, ppr; -uint32_t vector = intr_info &0xff ; +uint32_t ppr; +unsigned int vector = intr_info &INTR_INFO_VECTOR_MASK ;struct vlapic *vlapic =vcpu_vlapic (v); +/* +* Update SVI to record the current in service interrupt that's +* signaled in EXIT_INTR_INFO. +*/ vlapic_ack_pending_irq (v, vector,1 ); ppr =vlapic_set_ppr (vlapic);WARN_ON ((ppr &0xf0 ) != (vector &0xf0 )); status = vector <<VMX_GUEST_INTR_STATUS_SVI_OFFSET ; - rvi =vlapic_has_pending_irq (v); -if ( rvi !=-1 ) - status |= rvi &VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK ; + } +else +/* Keep previous SVI if there's any. */ +__vmread (GUEST_INTR_STATUS , &status); -__vmwrite (GUEST_INTR_STATUS , status); + rvi =vlapic_has_pending_irq (v); +if ( rvi !=-1 ) + { + status &= ~VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK ; + status |= rvi &VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK ; } + +if ( status ) +__vmwrite (GUEST_INTR_STATUS , status); }static void virtual_vmexit (struct cpu_user_regs *regs)
Signature · 1 line
2.26.0
PATCH v4 2/2 x86/nvmx: update exit bitmap when using virtual interrupt delivery
In reply to Roger Pau MonneForce an update of the EOI exit bitmap in nvmx_update_apicv, because the one performed in vmx_intr_assist might not be reached if the interrupt is intercepted by nvmx_intr_intercept returning true.
Extract the code to update the exit bitmap from vmx_intr_assist into a helper and use it in nvmx_update_apicv.
---
Changes since v2:
- Only update the EOI exit bitmap if GUEST_INTR_STATUS is changed.
Changes since v1:
- Reword commit message.
--- xen/arch/x86/hvm/vmx/intr.c | 21 +++++++++++++-------- xen/arch/x86/hvm/vmx/vvmx.c | 3 +++ xen/include/asm-x86/hvm/vmx/vmx.h | 2 ++ 3 files changed, 18 insertions(+), 8 deletions(-)
xen/arch/x86/hvm/vmx/intr.c +13 -8
@@ -224,6 +224,18 @@ static int nvmx_intr_intercept(struct vcpu *v, struct hvm_intack intack)return 0 ; } +void vmx_sync_exit_bitmap (struct vcpu *v) +{ +const unsigned int n =ARRAY_SIZE (v->arch.hvm.vmx.eoi_exit_bitmap); +unsigned int i; + +while ( (i =find_first_bit (&v->arch.hvm.vmx.eoi_exitmap_changed, n)) < n ) + { +clear_bit (i, &v->arch.hvm.vmx.eoi_exitmap_changed); +__vmwrite (EOI_EXIT_BITMAP (i), v->arch.hvm.vmx.eoi_exit_bitmap[i]); + } +} +void vmx_intr_assist (void ) {struct hvm_intack intack;
@@ -318,7 +330,6 @@ void vmx_intr_assist(void) intack.source != hvm_intsrc_vector ) {unsigned long status; -unsigned int i, n;/* * intack.vector is the highest priority vector. So we set eoi_exit_bitmap
@@ -379,13 +390,7 @@ void vmx_intr_assist(void) intack.vector;__vmwrite (GUEST_INTR_STATUS , status); - n =ARRAY_SIZE (v->arch.hvm.vmx.eoi_exit_bitmap); -while ( (i =find_first_bit (&v->arch.hvm.vmx.eoi_exitmap_changed, - n)) < n ) - { -clear_bit (i, &v->arch.hvm.vmx.eoi_exitmap_changed); -__vmwrite (EOI_EXIT_BITMAP (i), v->arch.hvm.vmx.eoi_exit_bitmap[i]); - } +vmx_sync_exit_bitmap (v);pt_intr_post (v, intack); }
xen/arch/x86/hvm/vmx/vvmx.c +3 -0
@@ -1420,7 +1420,10 @@ static void nvmx_update_apicv(struct vcpu *v) }if ( status ) + {__vmwrite (GUEST_INTR_STATUS , status); +vmx_sync_exit_bitmap (v); + } }static void virtual_vmexit (struct cpu_user_regs *regs)
xen/include/asm-x86/hvm/vmx/vmx.h +2 -0
@@ -610,6 +610,8 @@ void update_guest_eip(void);void vmx_pi_per_cpu_init (unsigned int cpu);void vmx_pi_desc_fixup (unsigned int cpu); +void vmx_sync_exit_bitmap (struct vcpu *v); +#ifdef CONFIG_HVM void vmx_pi_hooks_assign (struct domain *d);void vmx_pi_hooks_deassign (struct domain *d);
Signature · 1 line
2.26.0