split last patch of my previous series to two
cover split last patch of my previous series to two
The first one is a bug fix. The second one is get_irq() callback removing.
Gleb Natapov (2):
Fix userspace IRQ chip migration.
Get rid of get_irq() callback.
arch/x86/include/asm/kvm_host.h | 1 - arch/x86/kvm/svm.c | 8 -------- arch/x86/kvm/vmx.c | 8 -------- arch/x86/kvm/x86.c | 18 ++++++++---------- 4 files changed, 8 insertions(+), 27 deletions(-)
PATCH 1/2 Fix userspace IRQ chip migration.
Re-put pending IRQ vector into interrupt_bitmap before migration. Otherwise it will be lost if migration happens in the wrong time.
Signed-off-by Gleb Natapov <[email protected]>
--- arch/x86/kvm/x86.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/kvm/x86.c +6 -6
@@ -3555,17 +3555,17 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, sregs->efer = vcpu->arch.shadow_efer; sregs->apic_base =kvm_get_apic_base (vcpu); -if (irqchip_in_kernel (vcpu->kvm)) { +if (irqchip_in_kernel (vcpu->kvm))memset (sregs->interrupt_bitmap,0 ,sizeof sregs->interrupt_bitmap); - pending_vec = kvm_x86_ops->get_irq (vcpu); -if (pending_vec >=0 ) -set_bit (pending_vec, - (unsigned long *)sregs->interrupt_bitmap); - }else +else memcpy (sregs->interrupt_bitmap, vcpu->arch.irq_pending,sizeof sregs->interrupt_bitmap); + pending_vec = kvm_x86_ops->get_irq (vcpu); +if (pending_vec >=0 ) +set_bit (pending_vec, (unsigned long *)sregs->interrupt_bitmap); +vcpu_put (vcpu);return 0 ;
Signature · 1 line
1.5.6.5
PATCH 2/2 Get rid of get_irq() callback.
In reply to Gleb NatapovIt just returns pending IRQ vector from the queue for VMX/SVM. Get IRQ directly from the queue before migration and put it back after.
Signed-off-by Gleb Natapov <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 1 - arch/x86/kvm/svm.c | 8 -------- arch/x86/kvm/vmx.c | 8 -------- arch/x86/kvm/x86.c | 12 +++++------- 4 files changed, 5 insertions(+), 24 deletions(-)
arch/x86/include/asm/kvm_host.h +0 -1
@@ -513,7 +513,6 @@ struct kvm_x86_ops {void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu);void (*patch_hypercall)(struct kvm_vcpu *vcpu,unsigned char *hypercall_addr); -int (*get_irq)(struct kvm_vcpu *vcpu);void (*set_irq)(struct kvm_vcpu *vcpu,int vec);void (*set_nmi)(struct kvm_vcpu *vcpu); void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr,
arch/x86/kvm/svm.c +0 -8
@@ -964,13 +964,6 @@ static int svm_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg)return 0 ; } -static int svm_get_irq (struct kvm_vcpu *vcpu) -{ -if (!vcpu->arch.interrupt.pending) -return -1 ; -return vcpu->arch.interrupt.nr; -} -static void load_host_msrs (struct kvm_vcpu *vcpu) {#ifdef CONFIG_X86_64
@@ -2634,7 +2627,6 @@ static struct kvm_x86_ops svm_x86_ops = { .handle_exit = handle_exit, .skip_emulated_instruction = skip_emulated_instruction, .patch_hypercall = svm_patch_hypercall, - .get_irq = svm_get_irq, .set_irq = svm_set_irq, .set_nmi = svm_inject_nmi, .queue_exception = svm_queue_exception,
arch/x86/kvm/vmx.c +0 -8
@@ -1045,13 +1045,6 @@ static int set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg)return 0 ; } -static int vmx_get_irq (struct kvm_vcpu *vcpu) -{ -if (!vcpu->arch.interrupt.pending) -return -1 ; -return vcpu->arch.interrupt.nr; -} -static __init int cpu_has_kvm_support (void ) {return cpu_has_vmx ();
@@ -3634,7 +3627,6 @@ static struct kvm_x86_ops vmx_x86_ops = { .handle_exit = vmx_handle_exit, .skip_emulated_instruction = skip_emulated_instruction, .patch_hypercall = vmx_patch_hypercall, - .get_irq = vmx_get_irq, .set_irq = vmx_inject_irq, .set_nmi = vmx_inject_nmi, .queue_exception = vmx_queue_exception,
arch/x86/kvm/x86.c +5 -7
@@ -3525,7 +3525,6 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) {struct descriptor_table dt; -int pending_vec;vcpu_load (vcpu);
@@ -3562,9 +3561,9 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,memcpy (sregs->interrupt_bitmap, vcpu->arch.irq_pending,sizeof sregs->interrupt_bitmap); - pending_vec = kvm_x86_ops->get_irq (vcpu); -if (pending_vec >=0 ) -set_bit (pending_vec, (unsigned long *)sregs->interrupt_bitmap); +if (vcpu->arch.interrupt.pending) +set_bit (vcpu->arch.interrupt.nr, + (unsigned long *)sregs->interrupt_bitmap);vcpu_put (vcpu);
@@ -4080,9 +4079,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, max_bits);/* Only pending external irq is handled here */ if (pending_vec < max_bits) { - kvm_x86_ops->set_irq (vcpu, pending_vec); -pr_debug ("Set back pending irq %d\n" , - pending_vec); +kvm_queue_interrupt (vcpu, pending_vec); +pr_debug ("Set back pending irq %d\n" , pending_vec); }kvm_pic_clear_isr_ack (vcpu->kvm); }
Signature · 1 line
1.5.6.5