VMX: configure posted interrupt descriptor when assigning device
cover VMX: configure posted interrupt descriptor when assigning device
Configuration of the posted interrupt descriptor is incorrect when devices are hotplugged to the guest (and vcpus are halted).
See patch 4 for details.
---
v2: rather than using a potentially racy IPI (vs vcpu->cpu switches),
kick the vcpus when assigning a device and let the blocked per-CPU list manipulation happen locally at ->pre_block and ->post_block (Sean Christopherson).
PATCH 1/4 KVM: x86: add start_assignment hook to kvm_x86_ops
Add a start_assignment hook to kvm_x86_ops, which is called when kvm_arch_start_assignment is done.
The hook is required to update the wakeup vector of a sleeping vCPU when a device is assigned to the guest.
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1322,6 +1322,7 @@ struct kvm_x86_ops {int (*update_pi_irte)(struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set); +void (*start_assignment)(struct kvm *kvm,int device_count);void (*apicv_post_state_restore)(struct kvm_vcpu *vcpu);bool (*dy_apicv_has_pending_interrupt)(struct kvm_vcpu *vcpu);
arch/x86/kvm/svm/svm.c +1 -0
@@ -4601,6 +4601,7 @@ static struct kvm_x86_ops svm_x86_ops __ .deliver_posted_interrupt = svm_deliver_avic_intr, .dy_apicv_has_pending_interrupt = svm_dy_apicv_has_pending_interrupt, .update_pi_irte = svm_update_pi_irte, + .start_assignment = NULL, .setup_mce = svm_setup_mce, .smi_allowed = svm_smi_allowed,
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -7732,6 +7732,7 @@ static struct kvm_x86_ops vmx_x86_ops __ .nested_ops = &vmx_nested_ops, .update_pi_irte = pi_update_irte, + .start_assignment =NULL , #ifdef CONFIG_X86_64 .set_hv_timer = vmx_set_hv_timer,
arch/x86/kvm/x86.c +4 -1
@@ -11295,7 +11295,10 @@ bool kvm_arch_can_dequeue_async_page_prevoid kvm_arch_start_assignment (struct kvm *kvm) { -atomic_inc (&kvm->arch.assigned_device_count); +int ret; + + ret =atomic_inc_return (&kvm->arch.assigned_device_count); +static_call_cond (kvm_x86_start_assignment)(kvm, ret); }EXPORT_SYMBOL_GPL (kvm_arch_start_assignment);
arch/x86/include/asm/kvm-x86-ops.h +1 -0
@@ -99,6 +99,7 @@ KVM_X86_OP_NULL(post_block) KVM_X86_OP_NULL(vcpu_blocking) KVM_X86_OP_NULL(vcpu_unblocking) KVM_X86_OP_NULL(update_pi_irte) +KVM_X86_OP_NULL(start_assignment) KVM_X86_OP_NULL(apicv_post_state_restore) KVM_X86_OP_NULL(dy_apicv_has_pending_interrupt) KVM_X86_OP_NULL(set_hv_timer)
Re: [patch 1/4] KVM: x86: add start_assignment hook to kvm_x86_ops
Quoted 13 lines · Marcelo Tosatti
Add a
start_assignmenthook tokvm_x86_ops, which is called whenkvm_arch_start_assignmentis done.The hook is required to update the wakeup vector of a sleeping vCPU when a device is assigned to the guest.
Signed-off-by Marcelo Tosatti <[email protected]>Index:
kvm/arch/x86/include/asm/kvm_host.h
===================================================================
arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 1325
Quoted 4 lines
arch/x86/include/asm/kvm_host.h +1
-0@@ -1322,6 +1322,7 @@ struct kvm_x86_ops {int (*update_pi_irte)(struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set); +void (*start_assignment)(struct kvm *kvm,int device_count);
I'm thinking what the hook could do with the device_count besides comparing it against 1...
If we can't think of any, perhaps we can directly make it an enablement hook instead (so we avoid calling the hook at all when count>1)?
/* Called when the first assignment registers (count from 0 to 1) */ void (*enable_assignment)(struct kvm *kvm);
Signature · 1 line
Peter Xu
Re: [patch 1/4] KVM: x86: add start_assignment hook to kvm_x86_ops
Quoted 22 lines · Peter Xu
Quoted 13 lines · Marcelo Tosatti
Add a
start_assignmenthook tokvm_x86_ops, which is called whenkvm_arch_start_assignmentis done.The hook is required to update the wakeup vector of a sleeping vCPU when a device is assigned to the guest.
Signed-off-by Marcelo Tosatti <[email protected]>Index:
kvm/arch/x86/include/asm/kvm_host.h
===================================================================arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 1325
Quoted 4 lines
arch/x86/include/asm/kvm_host.h +1
-0@@ -1322,6 +1322,7 @@ struct kvm_x86_ops {int (*update_pi_irte)(struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set); +void (*start_assignment)(struct kvm *kvm,int device_count);I'm thinking what the hook could do with the
device_countbesides comparing it against 1...
Quoted 5 lines
If we can't think of any, perhaps we can directly make it an enablement hook instead (so we avoid calling the hook at all when count>1)?
/* Called when the first assignment registers (count from 0 to 1) */ void (*enable_assignment)(struct kvm *kvm);
Sure, sounds good, just kept the original name...
PATCH 2/4 KVM: add arch specific vcpu_check_block callback
In reply to Marcelo TosattiAdd callback in kvm_vcpu_check_block, so that architectures can direct a vcpu to exit the vcpu block loop without requiring events that would unhalt it.
include/linux/kvm_host.h +7 -0
@@ -971,6 +971,13 @@ static inline int kvm_arch_flush_remote_ }#endif +#ifndef __KVM_HAVE_ARCH_VCPU_CHECK_BLOCK +static inline int kvm_arch_vcpu_check_block (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +#endif +#ifdef __KVM_HAVE_ARCH_NONCOHERENT_DMAvoid kvm_arch_register_noncoherent_dma (struct kvm *kvm);void kvm_arch_unregister_noncoherent_dma (struct kvm *kvm);
virt/kvm/kvm_main.c +2 -0
@@ -2794,6 +2794,8 @@ static int kvm_vcpu_check_block(struct k goto out;if (signal_pending (current)) goto out; +if (kvm_arch_vcpu_check_block (vcpu)) + goto out; ret =0 ; out:
PATCH 3/4 KVM: x86: implement kvm_arch_vcpu_check_block callback
In reply to Marcelo TosattiImplement kvm_arch_vcpu_check_block for x86. Next patch will add implementation of kvm_x86_ops.vcpu_check_block for VMX.
arch/x86/include/asm/kvm_host.h +11 -0
@@ -1320,6 +1320,8 @@ struct kvm_x86_ops {void (*vcpu_blocking)(struct kvm_vcpu *vcpu);void (*vcpu_unblocking)(struct kvm_vcpu *vcpu); +int (*vcpu_check_block)(struct kvm_vcpu *vcpu); +int (*update_pi_irte)(struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set);void (*start_assignment)(struct kvm *kvm,int device_count);
@@ -1801,6 +1803,15 @@ static inline bool kvm_irq_is_postable(s irq->delivery_mode == APIC_DM_LOWEST); } +#define __KVM_HAVE_ARCH_VCPU_CHECK_BLOCK +static inline int kvm_arch_vcpu_check_block (struct kvm_vcpu *vcpu) +{ +if (kvm_x86_ops.vcpu_check_block) +return static_call (kvm_x86_vcpu_check_block)(vcpu); + +return 0 ; +} +static inline void kvm_arch_vcpu_blocking (struct kvm_vcpu *vcpu) {static_call_cond (kvm_x86_vcpu_blocking)(vcpu);
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -7727,6 +7727,7 @@ static struct kvm_x86_ops vmx_x86_ops __ .pre_block = vmx_pre_block, .post_block = vmx_post_block, + .vcpu_check_block = NULL, .pmu_ops = &intel_pmu_ops, .nested_ops = &vmx_nested_ops,
arch/x86/include/asm/kvm-x86-ops.h +1 -0
@@ -98,6 +98,7 @@ KVM_X86_OP_NULL(pre_block) KVM_X86_OP_NULL(post_block) KVM_X86_OP_NULL(vcpu_blocking) KVM_X86_OP_NULL(vcpu_unblocking) +KVM_X86_OP_NULL(vcpu_check_block) KVM_X86_OP_NULL(update_pi_irte) KVM_X86_OP_NULL(start_assignment) KVM_X86_OP_NULL(apicv_post_state_restore)
arch/x86/kvm/svm/svm.c +1 -0
@@ -4517,6 +4517,7 @@ static struct kvm_x86_ops svm_x86_ops __ .vcpu_put = svm_vcpu_put, .vcpu_blocking = svm_vcpu_blocking, .vcpu_unblocking = svm_vcpu_unblocking, + .vcpu_check_block = NULL, .update_exception_bitmap = svm_update_exception_bitmap, .get_msr_feature = svm_get_msr_feature,
PATCH 4/4 KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
In reply to Marcelo TosattiFor VMX, when a vcpu enters HLT emulation, pi_post_block will:
1) Add vcpu to per-cpu list of blocked vcpus.
2) Program the posted-interrupt descriptor "notification vector" to POSTED_INTR_WAKEUP_VECTOR
With interrupt remapping, an interrupt will set the PIR bit for the vector programmed for the device on the CPU, test-and-set the ON bit on the posted interrupt descriptor, and if the ON bit is clear generate an interrupt for the notification vector.
This way, the target CPU wakes upon a device interrupt and wakes up the target vcpu.
Problem is that pi_post_block only programs the notification vector if kvm_arch_has_assigned_device() is true. Its possible for the following to happen:
1) vcpu V HLTs on pcpu P, kvm_arch_has_assigned_device is false, notification vector is not programmed
2) device is assigned to VM
3) device interrupts vcpu V, sets ON bit
(notification vector not programmed, so pcpu P remains in idle)
4) vcpu 0 IPIs vcpu V (in guest), but since pi descriptor ON bit is set, kvm_vcpu_kick is skipped
5) vcpu 0 busy spins on vcpu V's response for several seconds, until RCU watchdog NMIs all vCPUs.
To fix this, use the start_assignment kvm_x86_ops callback to kick vcpus out of the halt loop, so the notification vector is properly reprogrammed to the wakeup vector.
---
v2: add vmx_pi_start_assignment to vmx's kvm_x86_ops
arch/x86/kvm/vmx/posted_intr.c +39 -0
@@ -203,6 +203,25 @@ void pi_post_block(struct kvm_vcpu *vcpulocal_irq_enable (); } +int vmx_vcpu_check_block (struct kvm_vcpu *vcpu) +{ +struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); + +if (!irq_remapping_cap (IRQ_POSTING_CAP )) +return 0 ; + +if (!kvm_vcpu_apicv_active (vcpu)) +return 0 ; + +if (!kvm_arch_has_assigned_device (vcpu->kvm)) +return 0 ; + +if (pi_desc->nv ==POSTED_INTR_WAKEUP_VECTOR ) +return 0 ; + +return 1 ; +} +/* * Handler for POSTED_INTERRUPT_WAKEUP_VECTOR. */
@@ -236,6 +255,26 @@ bool pi_has_pending_interrupt(struct kvm (pi_test_sn (pi_desc) && !pi_is_pir_empty (pi_desc)); } +void vmx_pi_start_assignment (struct kvm *kvm,int device_count) +{ +struct kvm_vcpu *vcpu; +int i; + +if (!irq_remapping_cap (IRQ_POSTING_CAP )) +return ; + +/* only care about first device assignment */ +if (device_count !=1 ) +return ; + +/* Update wakeup vector and add vcpu to blocked_vcpu_list */ +kvm_for_each_vcpu (i, vcpu, kvm) { +if (!kvm_vcpu_apicv_active (vcpu)) +continue ; + +kvm_vcpu_kick (vcpu); + } +}/* * pi_update_irte - set IRTE for Posted-Interrupts
arch/x86/kvm/vmx/posted_intr.h +2 -0
@@ -95,5 +95,7 @@ void __init pi_init_cpu(int cpu);bool pi_has_pending_interrupt (struct kvm_vcpu *vcpu);int pi_update_irte (struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set); +void vmx_pi_start_assignment (struct kvm *kvm,int device_count); +int vmx_vcpu_check_block (struct kvm_vcpu *vcpu);#endif /* __KVM_X86_VMX_POSTED_INTR_H */
arch/x86/kvm/vmx/vmx.c +2 -2
@@ -7727,13 +7727,13 @@ static struct kvm_x86_ops vmx_x86_ops __ .pre_block = vmx_pre_block, .post_block = vmx_post_block, - .vcpu_check_block = NULL, + .vcpu_check_block = vmx_vcpu_check_block, .pmu_ops = &intel_pmu_ops, .nested_ops = &vmx_nested_ops, .update_pi_irte = pi_update_irte, - .start_assignment =NULL , + .start_assignment = vmx_pi_start_assignment, #ifdef CONFIG_X86_64 .set_hv_timer = vmx_set_hv_timer,
Sean Christopherson
maintainerRe: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 15 lines · Marcelo Tosatti
Index:
kvm/arch/x86/kvm/vmx/posted_intr.c
===================================================================arch/x86/kvm/vmx/posted_intr.c +7
-0@@ -203,6 +203,25 @@ void pi_post_block(struct kvm_vcpu *vcpulocal_irq_enable (); } +int vmx_vcpu_check_block (struct kvm_vcpu *vcpu) +{ +struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); + +if (!irq_remapping_cap (IRQ_POSTING_CAP )) +return 0 ; +
arch/x86/kvm/vmx/posted_intr.c void pi_post_block(struct kvm_vcpu *vcpu · line 222
Quoted 10 lines
arch/x86/kvm/vmx/posted_intr.c +10
-0+if (!kvm_vcpu_apicv_active (vcpu)) +return 0 ; + +if (!kvm_arch_has_assigned_device (vcpu->kvm)) +return 0 ; + +if (pi_desc->nv ==POSTED_INTR_WAKEUP_VECTOR ) +return 0 ; + +return 1 ;
IIUC, the logic is to bail out of the block loop if the VM has an assigned device, but the blocking vCPU didn't reconfigure the PI.NV to the wakeup vector, i.e. the assigned device came along after the initial check in vcpu_block(). That makes sense, but you can add a comment somewhere in/above this function?
Quoted 12 lines
arch/x86/kvm/vmx/posted_intr.c +5
-0+} +/* * Handler for POSTED_INTERRUPT_WAKEUP_VECTOR. */ @@ -236,6 +255,26 @@ bool pi_has_pending_interrupt(struct kvm (pi_test_sn (pi_desc) && !pi_is_pir_empty (pi_desc)); } +void vmx_pi_start_assignment (struct kvm *kvm,int device_count) +{ +struct kvm_vcpu *vcpu;
arch/x86/kvm/vmx/posted_intr.c bool pi_has_pending_interrupt(struct kvm · line 270
Quoted 10 lines
arch/x86/kvm/vmx/posted_intr.c +10
-0+int i; + +if (!irq_remapping_cap (IRQ_POSTING_CAP )) +return ; + +/* only care about first device assignment */ +if (device_count !=1 ) +return ; + +/* Update wakeup vector and add vcpu to blocked_vcpu_list */
Can you expand this comment, too? Specifically, I think what you're saying is that the wakeup will cause the vCPU to bail out of kvm_vcpu_block() and go back through vcpu_block() and thus pi_pre_block().
arch/x86/kvm/vmx/posted_intr.c bool pi_has_pending_interrupt(struct kvm · line 275
Quoted 5 lines
arch/x86/kvm/vmx/posted_intr.c +5
-0+kvm_for_each_vcpu (i, vcpu, kvm) { +if (!kvm_vcpu_apicv_active (vcpu)) +continue ; + +kvm_vcpu_kick (vcpu);
Actually, can't we avoid the full kick and instead just do kvm_vcpu_wake_up()? If the vCPU is in guest mode, i.e. kvm_arch_vcpu_should_kick() returns true, then by definition it can't be blocking. And if it about to block, it's guaranteed to see the assigned device.
Quoted 2 lines
arch/x86/kvm/vmx/posted_intr.c +2
-0+ } +}
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 23 lines · Sean Christopherson
Quoted 22 lines · Marcelo Tosatti
Index:
kvm/arch/x86/kvm/vmx/posted_intr.c
===================================================================arch/x86/kvm/vmx/posted_intr.c +14
-0@@ -203,6 +203,25 @@ void pi_post_block(struct kvm_vcpu *vcpulocal_irq_enable (); } +int vmx_vcpu_check_block (struct kvm_vcpu *vcpu) +{ +struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); + +if (!irq_remapping_cap (IRQ_POSTING_CAP )) +return 0 ; + +if (!kvm_vcpu_apicv_active (vcpu)) +return 0 ; + +if (!kvm_arch_has_assigned_device (vcpu->kvm)) +return 0 ; + +if (pi_desc->nv ==POSTED_INTR_WAKEUP_VECTOR )
Quoted 8 lines
arch/x86/kvm/vmx/posted_intr.c void pi_post_block(struct kvm_vcpu *vcpu · line 222
Quoted 3 lines
arch/x86/kvm/vmx/posted_intr.c +3
-0+return 0 ; + +return 1 ;IIUC, the logic is to bail out of the block loop if the VM has an assigned device, but the blocking vCPU didn't reconfigure the PI.NV to the wakeup vector, i.e. the assigned device came along after the initial check in
vcpu_block(). That makes sense, but you can add a comment somewhere in/above this function?
Wondering whether we should add a pi_test_on() check in kvm_vcpu_has_events() somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (as kvm_arch_vcpu_runnable will return true properly)?
Signature · 1 line
Peter Xu
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 33 lines · Peter Xu
Quoted 23 lines · Sean Christopherson
Quoted 22 lines · Marcelo Tosatti
Index:
kvm/arch/x86/kvm/vmx/posted_intr.c
===================================================================arch/x86/kvm/vmx/posted_intr.c +14
-0@@ -203,6 +203,25 @@ void pi_post_block(struct kvm_vcpu *vcpulocal_irq_enable (); } +int vmx_vcpu_check_block (struct kvm_vcpu *vcpu) +{ +struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); + +if (!irq_remapping_cap (IRQ_POSTING_CAP )) +return 0 ; + +if (!kvm_vcpu_apicv_active (vcpu)) +return 0 ; + +if (!kvm_arch_has_assigned_device (vcpu->kvm)) +return 0 ; + +if (pi_desc->nv ==POSTED_INTR_WAKEUP_VECTOR )Quoted 8 lines
arch/x86/kvm/vmx/posted_intr.c void pi_post_block(struct kvm_vcpu *vcpu · line 222
Quoted 3 lines
arch/x86/kvm/vmx/posted_intr.c +3
-0+return 0 ; + +return 1 ;IIUC, the logic is to bail out of the block loop if the VM has an assigned device, but the blocking vCPU didn't reconfigure the PI.NV to the wakeup vector, i.e. the assigned device came along after the initial check in
vcpu_block(). That makes sense, but you can add a comment somewhere in/above this function?
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?
static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu)
{
int ret = -EINTR;
int idx = srcu_read_lock(&vcpu->kvm->srcu);
if (kvm_arch_vcpu_runnable(vcpu)) {
kvm_make_request(KVM_REQ_UNHALT, vcpu); <---
goto out;
}Don't want to unhalt the vcpu.
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if pi_test_on() returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
Signature · 1 line
Peter Xu
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }
Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on() only returns true when an interrupt is signalled by the device. But the sequence of events is:
1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit kvm_vcpu_block after 2, but before 3 (where ON bit is not set).
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).
Ah yes.. thanks.
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a KVM_REQ_UNBLOCK to replace the pre_block hook (in x86's kvm_host.h):
#define KVM_REQ_UNBLOCK KVM_ARCH_REQ(31)
We can set it in vmx_pi_start_assignment(), then check+clear it in kvm_vcpu_has_events() (or make it a bool in kvm_vcpu struct?).
The thing is current vmx_vcpu_check_block() is mostly a sanity check and copy-paste of the pi checks on a few items, so maybe cleaner to use KVM_REQ_UNBLOCK, as it might be reused in the future for re-evaluating of pre-block for similar purpose?
No strong opinion, though.
Signature · 1 line
Peter Xu
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 41 lines · Peter Xu
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).Ah yes.. thanks.
Quoted 7 lines
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a
KVM_REQ_UNBLOCKto replace thepre_blockhook (in x86'skvm_host.h):#define
KVM_REQ_UNBLOCKKVM_ARCH_REQ(31)We can set it in
vmx_pi_start_assignment(), then check+clear it inkvm_vcpu_has_events()(or make it a bool inkvm_vcpustruct?).
Can't check it in kvm_vcpu_has_events() because that will set KVM_REQ_UNHALT (which we don't want).
I think KVM_REQ_UNBLOCK will add more lines of code.
Quoted 6 lines
The thing is current
vmx_vcpu_check_block()is mostly a sanity check and copy-paste of the pi checks on a few items, so maybe cleaner to useKVM_REQ_UNBLOCK, as it might be reused in the future for re-evaluating of pre-block for similar purpose?No strong opinion, though.
Hum... IMHO v3 is quite clean already (although i don't object to your suggestion).
Paolo, what do you think?
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 45 lines · Marcelo Tosatti
Quoted 44 lines · Peter Xu
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).Ah yes.. thanks.
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a
KVM_REQ_UNBLOCKto replace thepre_blockhook (in x86'skvm_host.h):
Quoted 7 lines
Quoted 4 lines
#define
KVM_REQ_UNBLOCKKVM_ARCH_REQ(31)We can set it in
vmx_pi_start_assignment(), then check+clear it inkvm_vcpu_has_events()(or make it a bool inkvm_vcpustruct?).Can't check it in
kvm_vcpu_has_events()because that will setKVM_REQ_UNHALT(which we don't want).
I thought it was okay to break the guest HLT? As IMHO the guest code should always be able to re-run the HLT when interrupted? As IIUC HLT can easily be interrupted by e.g., SMIs, according to SDM Vol.2. Not to mention vfio hotplug should be rare, and we'll only trigger this once for the 1st device.
Quoted 2 lines
I think
KVM_REQ_UNBLOCKwill add more lines of code.
It's very possible I overlooked something above... but if breaking HLT unregularly is okay, I attached one patch that is based on your v3 series, just dropped the vcpu_check_block() but use KVM_REQ_UNBLOCK (no compile test even, just to satisfy my own curiosity on how many loc we can save.. :), it gives me:
7 files changed, 5 insertions(+), 41 deletions(-)
But again, I could have missed something...
Thanks,
Quoted 15 lines
Quoted 7 lines
The thing is current
vmx_vcpu_check_block()is mostly a sanity check and copy-paste of the pi checks on a few items, so maybe cleaner to useKVM_REQ_UNBLOCK, as it might be reused in the future for re-evaluating of pre-block for similar purpose?No strong opinion, though.
Hum... IMHO v3 is quite clean already (although i don't object to your suggestion).
Paolo, what do you think?
Signature · 1 line
Peter Xu
From 1131248f3c8f1f2715dd49d439c9fab25b4db9b8 Mon Sep 17 00:00:00 2001
From: Peter Xu <[email protected]>
Date: Tue, 11 May 2021 17:33:21 -0400
Subject: [PATCH] replace vcpu_check_block() hook with KVM_REQ_UNBLOCK
--- arch/x86/include/asm/kvm-x86-ops.h | 1 - arch/x86/include/asm/kvm_host.h | 12 +----------- arch/x86/kvm/svm/svm.c | 1 - arch/x86/kvm/vmx/posted_intr.c | 27 +-------------------------- arch/x86/kvm/vmx/posted_intr.h | 1 - arch/x86/kvm/vmx/vmx.c | 1 - arch/x86/kvm/x86.c | 3 +++ 7 files changed, 5 insertions(+), 41 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +0 -1
@@ -98,7 +98,6 @@ KVM_X86_OP_NULL(pre_block) KVM_X86_OP_NULL(post_block) KVM_X86_OP_NULL(vcpu_blocking) KVM_X86_OP_NULL(vcpu_unblocking) -KVM_X86_OP_NULL(vcpu_check_block) KVM_X86_OP_NULL(update_pi_irte) KVM_X86_OP_NULL(start_assignment) KVM_X86_OP_NULL(apicv_post_state_restore)
arch/x86/include/asm/kvm_host.h +1 -11
@@ -91,6 +91,7 @@#define KVM_REQ_MSR_FILTER_CHANGED KVM_ARCH_REQ(29)#define KVM_REQ_UPDATE_CPU_DIRTY_LOGGING \ KVM_ARCH_REQ_FLAGS(30, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) +#define KVM_REQ_UNBLOCK KVM_ARCH_REQ(31)#define CR0_RESERVED_BITS \ (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
@@ -1350,8 +1351,6 @@ struct kvm_x86_ops {void (*vcpu_blocking)(struct kvm_vcpu *vcpu);void (*vcpu_unblocking)(struct kvm_vcpu *vcpu); -int (*vcpu_check_block)(struct kvm_vcpu *vcpu); -int (*update_pi_irte)(struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set);void (*start_assignment)(struct kvm *kvm);
@@ -1835,15 +1834,6 @@ static inline bool kvm_irq_is_postable(struct kvm_lapic_irq *irq) irq->delivery_mode == APIC_DM_LOWEST); } -#define __KVM_HAVE_ARCH_VCPU_CHECK_BLOCK -static inline int kvm_arch_vcpu_check_block (struct kvm_vcpu *vcpu) -{ -if (kvm_x86_ops.vcpu_check_block) -return static_call (kvm_x86_vcpu_check_block)(vcpu); - -return 0 ; -} -static inline void kvm_arch_vcpu_blocking (struct kvm_vcpu *vcpu) {static_call_cond (kvm_x86_vcpu_blocking)(vcpu);
arch/x86/kvm/svm/svm.c +0 -1
@@ -4459,7 +4459,6 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .vcpu_put = svm_vcpu_put, .vcpu_blocking = svm_vcpu_blocking, .vcpu_unblocking = svm_vcpu_unblocking, - .vcpu_check_block = NULL, .update_exception_bitmap = svm_update_exception_bitmap, .get_msr_feature = svm_get_msr_feature,
arch/x86/kvm/vmx/posted_intr.c +1 -26
@@ -203,32 +203,6 @@ void pi_post_block(struct kvm_vcpu *vcpu)local_irq_enable (); } -/* -* Bail out of the block loop if the VM has an assigned -* device, but the blocking vCPU didn't reconfigure the -* PI.NV to the wakeup vector, i.e. the assigned device -* came along after the initial check in vcpu_block(). -*/ - -int vmx_vcpu_check_block (struct kvm_vcpu *vcpu) -{ -struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); - -if (!irq_remapping_cap (IRQ_POSTING_CAP )) -return 0 ; - -if (!kvm_vcpu_apicv_active (vcpu)) -return 0 ; - -if (!kvm_arch_has_assigned_device (vcpu->kvm)) -return 0 ; - -if (pi_desc->nv ==POSTED_INTR_WAKEUP_VECTOR ) -return 0 ; - -return 1 ; -} -/* * Handler for POSTED_INTERRUPT_WAKEUP_VECTOR. */
@@ -278,6 +252,7 @@ void vmx_pi_start_assignment(struct kvm *kvm)if (!kvm_vcpu_apicv_active (vcpu))continue ; +kvm_make_request (KVM_REQ_UNBLOCK , vcpu);kvm_vcpu_wake_up (vcpu); } }
arch/x86/kvm/vmx/posted_intr.h +0 -1
@@ -96,6 +96,5 @@ bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);int pi_update_irte (struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set);void vmx_pi_start_assignment (struct kvm *kvm); -int vmx_vcpu_check_block (struct kvm_vcpu *vcpu);#endif /* __KVM_X86_VMX_POSTED_INTR_H */
arch/x86/kvm/vmx/vmx.c +0 -1
@@ -7716,7 +7716,6 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .pre_block = vmx_pre_block, .post_block = vmx_post_block, - .vcpu_check_block = vmx_vcpu_check_block, .pmu_ops = &intel_pmu_ops, .nested_ops = &vmx_nested_ops,
arch/x86/kvm/x86.c +3 -0
@@ -11177,6 +11177,9 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) static_call(kvm_x86_smi_allowed)(vcpu, false)))return true; +if (kvm_check_request (KVM_REQ_UNBLOCK , vcpu)) +return true; +if (kvm_arch_interrupt_allowed (vcpu) && (kvm_cpu_has_interrupt (vcpu) ||kvm_guest_apic_has_interrupt (vcpu)))
Signature · 1 line
2.31.1
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 48 lines · Peter Xu
Quoted 47 lines · Marcelo Tosatti
Quoted 46 lines · Peter Xu
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).Ah yes.. thanks.
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a
KVM_REQ_UNBLOCKto replace thepre_blockhook (in x86'skvm_host.h):#define
KVM_REQ_UNBLOCKKVM_ARCH_REQ(31)
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
We can set it in
vmx_pi_start_assignment(), then check+clear it inkvm_vcpu_has_events()(or make it a bool inkvm_vcpustruct?).Can't check it in
kvm_vcpu_has_events()because that will setKVM_REQ_UNHALT(which we don't want).I thought it was okay to break the guest HLT?
Intel:
"HLT-HALT
Description
Stops instruction execution and places the processor in a HALT state. An enabled interrupt (including NMI and SMI), a debug exception, the BINIT# signal, the INIT# signal, or the RESET# signal will resume execution. If an interrupt (including NMI) is used to resume execution after a HLT instruction, the saved instruction pointer (CS:EIP) points to the instruction following the HLT instruction."
AMD:
"6.5 Processor Halt
The processor halt instruction (HLT) halts instruction execution, leaving the processor in the halt state. No registers or machine state are modified as a result of executing the HLT instruction. The processor remains in the halt state until one of the following occurs:
• A non-maskable interrupt (NMI).
• An enabled, maskable interrupt (INTR).
• Processor reset (RESET).
• Processor initialization (INIT).
• System-management interrupt (SMI)."
The KVM_REQ_UNBLOCK patch will resume execution even any such event occuring. So the behaviour would be different from baremetal.
Quoted 3 lines
As IMHO the guest code should
always be able to re-run the HLT when interrupted? As IIUC HLT can easily be interrupted by e.g., SMIs, according to SDM Vol.2.
CPU will by default return to HLT'ed state, not continue to the instruction following HLT, on SMI:
34.10 AUTO HALT RESTART
If the processor is in a HALT state (due to the prior execution of a HLT instruction) when it receives an SMI, the processor records the fact in the auto HALT restart flag in the saved processor state (see Figure 34-3). (This flag is located at offset 7F02H and bit 0 in the state save area of the SMRAM.)
If the processor sets the auto HALT restart flag upon entering SMM (indicating that the SMI occurred when the processor was in the HALT state), the SMI handler has two options:
* It can leave the auto HALT restart flag set, which instructs the RSM instruction to return program control to the HLT instruction. This option in effect causes the processor to re-enter the HALT state after handling the SMI. (This is the default operation.)
* It can clear the auto HALT restart flag, which instructs the RSM instruction to return program control to the instruction following the HLT instruction.
Quoted 198 lines
Not to mention vfio hotplug
should be rare, and we'll only trigger this once for the 1st device.Quoted 2 lines
I think
KVM_REQ_UNBLOCKwill add more lines of code.It's very possible I overlooked something above... but if breaking HLT unregularly is okay, I attached one patch that is based on your v3 series, just dropped the
vcpu_check_block()but useKVM_REQ_UNBLOCK(no compile test even, just to satisfy my own curiosity on how many loc we can save.. :), it gives me:7 files changed, 5 insertions(+), 41 deletions(-)But again, I could have missed something...
Thanks,
Quoted 15 lines
Quoted 7 lines
The thing is current
vmx_vcpu_check_block()is mostly a sanity check and copy-paste of the pi checks on a few items, so maybe cleaner to useKVM_REQ_UNBLOCK, as it might be reused in the future for re-evaluating of pre-block for similar purpose?No strong opinion, though.
Hum... IMHO v3 is quite clean already (although i don't object to your suggestion).
Paolo, what do you think?
Signature · 1 line
Peter XuQuoted 1 line
From
1131248f3c8f1f2715dd49d439c9fab25b4db9b8Mon Sep 17 00:00:00 2001From: Peter Xu <[email protected]>
Date: Tue, 11 May 2021 17:33:21 -0400
Subject: [PATCH] replacevcpu_check_block()hook withKVM_REQ_UNBLOCKSigned-off-by Peter Xu <[email protected]>--- arch/x86/include/asm/kvm-x86-ops.h | 1 - arch/x86/include/asm/kvm_host.h | 12 +----------- arch/x86/kvm/svm/svm.c | 1 - arch/x86/kvm/vmx/posted_intr.c | 27 +-------------------------- arch/x86/kvm/vmx/posted_intr.h | 1 - arch/x86/kvm/vmx/vmx.c | 1 - arch/x86/kvm/x86.c | 3 +++ 7 files changed, 5 insertions(+), 41 deletions(-)arch/x86/include/asm/kvm-x86-ops.h +0
-1@@ -98,7 +98,6 @@ KVM_X86_OP_NULL(pre_block) KVM_X86_OP_NULL(post_block) KVM_X86_OP_NULL(vcpu_blocking) KVM_X86_OP_NULL(vcpu_unblocking) -KVM_X86_OP_NULL(vcpu_check_block) KVM_X86_OP_NULL(update_pi_irte) KVM_X86_OP_NULL(start_assignment) KVM_X86_OP_NULL(apicv_post_state_restore)arch/x86/include/asm/kvm_host.h +1
-11@@ -91,6 +91,7 @@#define KVM_REQ_MSR_FILTER_CHANGED KVM_ARCH_REQ(29)#define KVM_REQ_UPDATE_CPU_DIRTY_LOGGING \ KVM_ARCH_REQ_FLAGS(30, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) +#define KVM_REQ_UNBLOCK KVM_ARCH_REQ(31)#define CR0_RESERVED_BITS \ (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \@@ -1350,8 +1351,6 @@ struct kvm_x86_ops {void (*vcpu_blocking)(struct kvm_vcpu *vcpu);void (*vcpu_unblocking)(struct kvm_vcpu *vcpu); -int (*vcpu_check_block)(struct kvm_vcpu *vcpu); -int (*update_pi_irte)(struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set);void (*start_assignment)(struct kvm *kvm);@@ -1835,15 +1834,6 @@ static inline bool kvm_irq_is_postable(struct kvm_lapic_irq *irq) irq->delivery_mode == APIC_DM_LOWEST); } -#define __KVM_HAVE_ARCH_VCPU_CHECK_BLOCK -static inline int kvm_arch_vcpu_check_block (struct kvm_vcpu *vcpu) -{ -if (kvm_x86_ops.vcpu_check_block) -return static_call (kvm_x86_vcpu_check_block)(vcpu); - -return 0 ; -} -static inline void kvm_arch_vcpu_blocking (struct kvm_vcpu *vcpu) {static_call_cond (kvm_x86_vcpu_blocking)(vcpu);arch/x86/kvm/svm/svm.c +0
-1@@ -4459,7 +4459,6 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .vcpu_put = svm_vcpu_put, .vcpu_blocking = svm_vcpu_blocking, .vcpu_unblocking = svm_vcpu_unblocking, - .vcpu_check_block = NULL, .update_exception_bitmap = svm_update_exception_bitmap, .get_msr_feature = svm_get_msr_feature,arch/x86/kvm/vmx/posted_intr.c +1
-26@@ -203,32 +203,6 @@ void pi_post_block(struct kvm_vcpu *vcpu)local_irq_enable (); } -/* -* Bail out of the block loop if the VM has an assigned -* device, but the blocking vCPU didn't reconfigure the -* PI.NV to the wakeup vector, i.e. the assigned device -* came along after the initial check in vcpu_block(). -*/ - -int vmx_vcpu_check_block (struct kvm_vcpu *vcpu) -{ -struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu); - -if (!irq_remapping_cap (IRQ_POSTING_CAP )) -return 0 ; - -if (!kvm_vcpu_apicv_active (vcpu)) -return 0 ; - -if (!kvm_arch_has_assigned_device (vcpu->kvm)) -return 0 ; - -if (pi_desc->nv ==POSTED_INTR_WAKEUP_VECTOR ) -return 0 ; - -return 1 ; -} -/* * Handler for POSTED_INTERRUPT_WAKEUP_VECTOR. */ @@ -278,6 +252,7 @@ void vmx_pi_start_assignment(struct kvm *kvm)if (!kvm_vcpu_apicv_active (vcpu))continue ; +kvm_make_request (KVM_REQ_UNBLOCK , vcpu);kvm_vcpu_wake_up (vcpu); } }arch/x86/kvm/vmx/posted_intr.h +0
-1@@ -96,6 +96,5 @@ bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);int pi_update_irte (struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,bool set);void vmx_pi_start_assignment (struct kvm *kvm); -int vmx_vcpu_check_block (struct kvm_vcpu *vcpu);#endif /* __KVM_X86_VMX_POSTED_INTR_H */ arch/x86/kvm/vmx/vmx.c +0
-1@@ -7716,7 +7716,6 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .pre_block = vmx_pre_block, .post_block = vmx_post_block, - .vcpu_check_block = vmx_vcpu_check_block, .pmu_ops = &intel_pmu_ops, .nested_ops = &vmx_nested_ops,arch/x86/kvm/x86.c +3
-0@@ -11177,6 +11177,9 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) static_call(kvm_x86_smi_allowed)(vcpu, false)))return true; +if (kvm_check_request (KVM_REQ_UNBLOCK , vcpu)) +return true; +if (kvm_arch_interrupt_allowed (vcpu) && (kvm_cpu_has_interrupt (vcpu) ||kvm_guest_apic_has_interrupt (vcpu)))Signature · 1 line
2.31.1
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 80 lines · Marcelo Tosatti
Quoted 48 lines · Peter Xu
Quoted 47 lines · Marcelo Tosatti
Quoted 46 lines · Peter Xu
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).Ah yes.. thanks.
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a
KVM_REQ_UNBLOCKto replace thepre_blockhook (in x86'skvm_host.h):#define
KVM_REQ_UNBLOCKKVM_ARCH_REQ(31)Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
We can set it in
vmx_pi_start_assignment(), then check+clear it inkvm_vcpu_has_events()(or make it a bool inkvm_vcpustruct?).Can't check it in
kvm_vcpu_has_events()because that will setKVM_REQ_UNHALT(which we don't want).I thought it was okay to break the guest HLT?
Intel:
"HLT-HALT
Description
Stops instruction execution and places the processor in a HALT state. An enabled interrupt (including NMI and SMI), a debug exception, the BINIT# signal, the INIT# signal, or the RESET# signal will resume execution. If an interrupt (including NMI) is used to resume execution after a HLT instruction, the saved instruction pointer (CS:EIP) points to the instruction following the HLT instruction."
AMD:
"6.5 Processor Halt
The processor halt instruction (HLT) halts instruction execution, leaving the processor in the halt state. No registers or machine state are modified as a result of executing the HLT instruction. The processor remains in the halt state until one of the following occurs:
• A non-maskable interrupt (NMI).
• An enabled, maskable interrupt (INTR).
• Processor reset (RESET).
• Processor initialization (INIT).
• System-management interrupt (SMI)."
Quoted 1 line
The
KVM_REQ_UNBLOCKpatch will resume execution even any such event
even without any such event
Quoted 1 line
occuring. So the behaviour would be different from baremetal.
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 81 lines · Marcelo Tosatti
Quoted 80 lines · Marcelo Tosatti
Quoted 48 lines · Peter Xu
Quoted 47 lines · Marcelo Tosatti
Quoted 46 lines · Peter Xu
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).Ah yes.. thanks.
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a
KVM_REQ_UNBLOCKto replace thepre_blockhook (in x86'skvm_host.h):#define
KVM_REQ_UNBLOCKKVM_ARCH_REQ(31)Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
We can set it in
vmx_pi_start_assignment(), then check+clear it inkvm_vcpu_has_events()(or make it a bool inkvm_vcpustruct?).Can't check it in
kvm_vcpu_has_events()because that will setKVM_REQ_UNHALT(which we don't want).I thought it was okay to break the guest HLT?
Intel:
"HLT-HALT
Description
Stops instruction execution and places the processor in a HALT state. An enabled interrupt (including NMI and SMI), a debug exception, the BINIT# signal, the INIT# signal, or the RESET# signal will resume execution. If an interrupt (including NMI) is used to resume execution after a HLT instruction, the saved instruction pointer (CS:EIP) points to the instruction following the HLT instruction."
AMD:
"6.5 Processor Halt
The processor halt instruction (HLT) halts instruction execution, leaving the processor in the halt state. No registers or machine state are modified as a result of executing the HLT instruction. The processor remains in the halt state until one of the following occurs:
• A non-maskable interrupt (NMI).
• An enabled, maskable interrupt (INTR).
• Processor reset (RESET).
• Processor initialization (INIT).
• System-management interrupt (SMI)."
Quoted 6 lines
Quoted 1 line
The
KVM_REQ_UNBLOCKpatch will resume execution even any such eventeven without any such event
Quoted 1 line
occuring. So the behaviour would be different from baremetal.
What if we move that kvm_check_request() into kvm_vcpu_check_block()?
---8<---
arch/x86/kvm/x86.c +0 -3
@@ -11177,9 +11177,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) static_call(kvm_x86_smi_allowed)(vcpu, false)))return true; -if (kvm_check_request (KVM_REQ_UNBLOCK , vcpu)) -return true; -if (kvm_arch_interrupt_allowed (vcpu) && (kvm_cpu_has_interrupt (vcpu) ||kvm_guest_apic_has_interrupt (vcpu)))
virt/kvm/kvm_main.c +4 -0
@@ -2925,6 +2925,10 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu)kvm_make_request (KVM_REQ_UNHALT , vcpu); goto out; } +#ifdef CONFIG_X86 +if (kvm_check_request (KVM_REQ_UNBLOCK , vcpu)) +return true; +#endif if (kvm_cpu_has_pending_timer (vcpu)) goto out;if (signal_pending (current))
---8<---
(The CONFIG_X86 is ugly indeed.. but just to show what I meant, e.g. it can be
a boolean too I think)
Would this work?
Thanks,
Signature · 1 line
Peter Xu
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 123 lines · Peter Xu
Quoted 81 lines · Marcelo Tosatti
Quoted 80 lines · Marcelo Tosatti
Quoted 48 lines · Peter Xu
Quoted 47 lines · Marcelo Tosatti
Quoted 46 lines · Peter Xu
Quoted 30 lines · Marcelo Tosatti
Quoted 15 lines · Peter Xu
Quoted 14 lines · Marcelo Tosatti
Quoted 3 lines
Wondering whether we should add a
pi_test_on()check inkvm_vcpu_has_events()somehow, so that even without customized ->vcpu_check_block we should be able to break the block loop (askvm_arch_vcpu_runnablewill return true properly)?static int
kvm_vcpu_check_block(struct kvm_vcpu *vcpu){ int ret = -EINTR; int idx = srcu_read_lock(&vcpu->kvm->srcu); if (kvm_arch_vcpu_runnable(vcpu)) { kvm_make_request(KVM_REQ_UNHALT, vcpu); <--- goto out; }Quoted 5 lines
Quoted 1 line
Don't want to unhalt the vcpu.
Could you elaborate? It's not obvious to me why we can't do that if
pi_test_on()returns true.. we have pending post interrupts anyways, so shouldn't we stop halting? Thanks!
pi_test_on()only returns true when an interrupt is signalled by the device. But the sequence of events is:1. pCPU idles without notification vector configured to wakeup vector.
2. PCI device is hotplugged, assigned device count increases from 0 to 1.
Quoted 7 lines
<arbitrary amount of time>
3. device generates interrupt, sets ON bit to true in the posted interrupt descriptor.
We want to exit
kvm_vcpu_blockafter 2, but before 3 (where ON bit is not set).Ah yes.. thanks.
Besides the current approach, I'm thinking maybe it'll be cleaner/less LOC to define a
KVM_REQ_UNBLOCKto replace thepre_blockhook (in x86'skvm_host.h):#define
KVM_REQ_UNBLOCKKVM_ARCH_REQ(31)Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
We can set it in
vmx_pi_start_assignment(), then check+clear it inkvm_vcpu_has_events()(or make it a bool inkvm_vcpustruct?).Can't check it in
kvm_vcpu_has_events()because that will setKVM_REQ_UNHALT(which we don't want).I thought it was okay to break the guest HLT?
Intel:
"HLT-HALT
Description
Stops instruction execution and places the processor in a HALT state. An enabled interrupt (including NMI and SMI), a debug exception, the BINIT# signal, the INIT# signal, or the RESET# signal will resume execution. If an interrupt (including NMI) is used to resume execution after a HLT instruction, the saved instruction pointer (CS:EIP) points to the instruction following the HLT instruction."
AMD:
"6.5 Processor Halt
The processor halt instruction (HLT) halts instruction execution, leaving the processor in the halt state. No registers or machine state are modified as a result of executing the HLT instruction. The processor remains in the halt state until one of the following occurs:
• A non-maskable interrupt (NMI).
• An enabled, maskable interrupt (INTR).
• Processor reset (RESET).
• Processor initialization (INIT).
• System-management interrupt (SMI)."Quoted 6 lines
Quoted 1 line
The
KVM_REQ_UNBLOCKpatch will resume execution even any such eventeven without any such event
Quoted 1 line
occuring. So the behaviour would be different from baremetal.
What if we move that
kvm_check_request()intokvm_vcpu_check_block()?---8<---
arch/x86/kvm/x86.c +0
-3@@ -11177,9 +11177,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) static_call(kvm_x86_smi_allowed)(vcpu, false)))return true; -if (kvm_check_request (KVM_REQ_UNBLOCK , vcpu)) -return true; -if (kvm_arch_interrupt_allowed (vcpu) && (kvm_cpu_has_interrupt (vcpu) ||kvm_guest_apic_has_interrupt (vcpu)))virt/kvm/kvm_main.c +4
-1@@ -2925,6 +2925,10 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu)kvm_make_request (KVM_REQ_UNHALT , vcpu); goto out; } +#ifdef CONFIG_X86 +if (kvm_check_request (KVM_REQ_UNBLOCK , vcpu)) +return true; +#endif if (kvm_cpu_has_pending_timer (vcpu)) goto out;if (signal_pending (current)) ---8<---
Quoted 4 lines
(The
CONFIG_X86is ugly indeed.. but just to show what I meant, e.g. it can be
a boolean too I think)Would this work?
That would work: but vcpu->requests are nicely checked (and processed) at vcpu_enter_guest, before guest entry. The proposed request does not follow that pattern.
Sean Christopherson
maintainerRe: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
In reply to Marcelo TosattiQuoted 5 lines · Marcelo Tosatti
Quoted 1 line
The
KVM_REQ_UNBLOCKpatch will resume execution even any such eventeven without any such event
Quoted 1 line
occuring. So the behaviour would be different from baremetal.
I agree with Marcelo, we don't want to spuriously unhalt the vCPU. It's legal, albeit risky, to do something like
hlt /* #UD to triple fault if this CPU is awakened. */ ud2
when offlining a CPU, in which case the spurious wake event will crash the guest.
Re: [patch 4/4] KVM: VMX: update vcpu posted-interrupt descriptor when assigning device
Quoted 7 lines · Sean Christopherson
Quoted 5 lines · Marcelo Tosatti
Quoted 1 line
The
KVM_REQ_UNBLOCKpatch will resume execution even any such eventeven without any such event
Quoted 1 line
occuring. So the behaviour would be different from baremetal.
Quoted 8 lines
I agree with Marcelo, we don't want to spuriously unhalt the vCPU. It's legal, albeit risky, to do something like
hlt /* #UD to triple fault if this CPU is awakened. */ ud2when offlining a CPU, in which case the spurious wake event will crash the guest.
We can avoid that by moving the check+clear of KVM_REQ_UNBLOCK from kvm_vcpu_has_events() into kvm_vcpu_check_block() as replied in the other thread. But I also agree Marcelo's series should work already to fix the bug, hence no strong opinion on this.
Thanks,
Signature · 1 line
Peter Xu