Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa2fbe6d authored by Yang Zhang's avatar Yang Zhang Committed by Marcelo Tosatti
Browse files

KVM: Let ioapic know the irq line status 



Userspace may deliver RTC interrupt without query the status. So we
want to track RTC EOI for this case.

Signed-off-by: default avatarYang Zhang <yang.z.zhang@Intel.com>
Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent f3bff631

arch/x86/kvm/i8254.c

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ static void pit_do_work(struct kthread_work *work) 
	}

	spin_unlock(&ps->inject_lock);

	if (inject) {

		kvm_set_irq(kvm, kvm->arch.vpit->irq_source_id, 0, 1);

		kvm_set_irq(kvm, kvm->arch.vpit->irq_source_id, 0, 0);

		kvm_set_irq(kvm, kvm->arch.vpit->irq_source_id, 0, 1, false);

		kvm_set_irq(kvm, kvm->arch.vpit->irq_source_id, 0, 0, false);



		/*

		 * Provides NMI watchdog support via Virtual Wire mode.

arch/x86/kvm/x86.c

+4 −2
Original line number Diff line number Diff line
@@ -3491,13 +3491,15 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 
	return r;

}



int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event)

int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event,

			bool line_status)

{

	if (!irqchip_in_kernel(kvm))

		return -ENXIO;



	irq_event->status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,

					irq_event->irq, irq_event->level);

					irq_event->irq, irq_event->level,

					line_status);

	return 0;

}

include/linux/kvm_host.h

+7 −4
Original line number Diff line number Diff line
@@ -292,7 +292,8 @@ struct kvm_kernel_irq_routing_entry { 
	u32 gsi;

	u32 type;

	int (*set)(struct kvm_kernel_irq_routing_entry *e,

		   struct kvm *kvm, int irq_source_id, int level);

		   struct kvm *kvm, int irq_source_id, int level,

		   bool line_status);

	union {

		struct {

			unsigned irqchip;
@@ -591,7 +592,8 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 


int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,

				   struct kvm_userspace_memory_region *mem);

int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level);

int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level,

			bool line_status);

long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg);
@@ -722,10 +724,11 @@ void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic, 
				   union kvm_ioapic_redirect_entry *entry,

				   unsigned long *deliver_bitmask);

#endif

int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level);

int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,

		bool line_status);

int kvm_set_irq_inatomic(struct kvm *kvm, int irq_source_id, u32 irq, int level);

int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm,

		int irq_source_id, int level);

		int irq_source_id, int level, bool line_status);

bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin);

void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);

void kvm_register_irq_ack_notifier(struct kvm *kvm,

virt/kvm/assigned-dev.c

+7 −6
Original line number Diff line number Diff line
@@ -80,11 +80,12 @@ kvm_assigned_dev_raise_guest_irq(struct kvm_assigned_dev_kernel *assigned_dev, 
		spin_lock(&assigned_dev->intx_mask_lock);

		if (!(assigned_dev->flags & KVM_DEV_ASSIGN_MASK_INTX))

			kvm_set_irq(assigned_dev->kvm,

				    assigned_dev->irq_source_id, vector, 1);

				    assigned_dev->irq_source_id, vector, 1,

				    false);

		spin_unlock(&assigned_dev->intx_mask_lock);

	} else

		kvm_set_irq(assigned_dev->kvm, assigned_dev->irq_source_id,

			    vector, 1);

			    vector, 1, false);

}



static irqreturn_t kvm_assigned_dev_thread_intx(int irq, void *dev_id)
@@ -165,7 +166,7 @@ static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian) 
		container_of(kian, struct kvm_assigned_dev_kernel,

			     ack_notifier);



	kvm_set_irq(dev->kvm, dev->irq_source_id, dev->guest_irq, 0);

	kvm_set_irq(dev->kvm, dev->irq_source_id, dev->guest_irq, 0, false);



	spin_lock(&dev->intx_mask_lock);
@@ -188,7 +189,7 @@ static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian) 


		if (reassert)

			kvm_set_irq(dev->kvm, dev->irq_source_id,

				    dev->guest_irq, 1);

				    dev->guest_irq, 1, false);

	}



	spin_unlock(&dev->intx_mask_lock);
@@ -202,7 +203,7 @@ static void deassign_guest_irq(struct kvm *kvm, 
						&assigned_dev->ack_notifier);



	kvm_set_irq(assigned_dev->kvm, assigned_dev->irq_source_id,

		    assigned_dev->guest_irq, 0);

		    assigned_dev->guest_irq, 0, false);



	if (assigned_dev->irq_source_id != -1)

		kvm_free_irq_source_id(kvm, assigned_dev->irq_source_id);
@@ -901,7 +902,7 @@ static int kvm_vm_ioctl_set_pci_irq_mask(struct kvm *kvm, 
	if (match->irq_requested_type & KVM_DEV_IRQ_GUEST_INTX) {

		if (assigned_dev->flags & KVM_DEV_ASSIGN_MASK_INTX) {

			kvm_set_irq(match->kvm, match->irq_source_id,

				    match->guest_irq, 0);

				    match->guest_irq, 0, false);

			/*

			 * Masking at hardware-level is performed on demand,

			 * i.e. when an IRQ actually arrives at the host.

virt/kvm/eventfd.c

+9 −6
Original line number Diff line number Diff line
@@ -100,11 +100,13 @@ irqfd_inject(struct work_struct *work) 
	struct kvm *kvm = irqfd->kvm;



	if (!irqfd->resampler) {

		kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID, irqfd->gsi, 1);

		kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID, irqfd->gsi, 0);

		kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID, irqfd->gsi, 1,

				false);

		kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID, irqfd->gsi, 0,

				false);

	} else

		kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,

			    irqfd->gsi, 1);

			    irqfd->gsi, 1, false);

}



/*
@@ -121,7 +123,7 @@ irqfd_resampler_ack(struct kvm_irq_ack_notifier *kian) 
	resampler = container_of(kian, struct _irqfd_resampler, notifier);



	kvm_set_irq(resampler->kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,

		    resampler->notifier.gsi, 0);

		    resampler->notifier.gsi, 0, false);



	rcu_read_lock();
@@ -146,7 +148,7 @@ irqfd_resampler_shutdown(struct _irqfd *irqfd) 
		list_del(&resampler->link);

		kvm_unregister_irq_ack_notifier(kvm, &resampler->notifier);

		kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,

			    resampler->notifier.gsi, 0);

			    resampler->notifier.gsi, 0, false);

		kfree(resampler);

	}
@@ -225,7 +227,8 @@ irqfd_wakeup(wait_queue_t *wait, unsigned mode, int sync, void *key) 
		irq = rcu_dereference(irqfd->irq_entry);

		/* An event has been signaled, inject an interrupt */

		if (irq)

			kvm_set_msi(irq, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1);

			kvm_set_msi(irq, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1,

					false);

		else

			schedule_work(&irqfd->inject);

		rcu_read_unlock();