3 files changed, 29 insertions, 16 deletions

diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c
index 01f572c10c71..23a41a9f8db9 100644
--- a/virt/kvm/assigned-dev.c
+++ b/virt/kvm/assigned-dev.c
@@ -334,6 +334,11 @@ static int assigned_device_enable_host_intx(struct kvm *kvm,
 }
 
 #ifdef __KVM_HAVE_MSI
+static irqreturn_t kvm_assigned_dev_msi(int irq, void *dev_id)
+{
+        return IRQ_WAKE_THREAD;
+}
+
 static int assigned_device_enable_host_msi(struct kvm *kvm,
                                            struct kvm_assigned_dev_kernel *dev)
 {
@@ -346,7 +351,7 @@ static int assigned_device_enable_host_msi(struct kvm *kvm,
         }
 
         dev->host_irq = dev->dev->irq;
-        if (request_threaded_irq(dev->host_irq, NULL,
+        if (request_threaded_irq(dev->host_irq, kvm_assigned_dev_msi,
                                  kvm_assigned_dev_thread_msi, 0,
                                  dev->irq_name, dev)) {
                 pci_disable_msi(dev->dev);
@@ -358,6 +363,11 @@ static int assigned_device_enable_host_msi(struct kvm *kvm,
 #endif
 
 #ifdef __KVM_HAVE_MSIX
+static irqreturn_t kvm_assigned_dev_msix(int irq, void *dev_id)
+{
+        return IRQ_WAKE_THREAD;
+}
+
 static int assigned_device_enable_host_msix(struct kvm *kvm,
                                             struct kvm_assigned_dev_kernel *dev)
 {
@@ -374,7 +384,8 @@ static int assigned_device_enable_host_msix(struct kvm *kvm,
 
         for (i = 0; i < dev->entries_nr; i++) {
                 r = request_threaded_irq(dev->host_msix_entries[i].vector,
-                                         NULL, kvm_assigned_dev_thread_msix,
+                                         kvm_assigned_dev_msix,
+                                         kvm_assigned_dev_thread_msix,
                                          0, dev->irq_name, dev);
                 if (r)
                         goto err;
@@ -635,7 +646,6 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
         int r = 0, idx;
         struct kvm_assigned_dev_kernel *match;
         struct pci_dev *dev;
-        u8 header_type;
 
         if (!(assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU))
                 return -EINVAL;
@@ -668,8 +678,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
         }
 
         /* Don't allow bridges to be assigned */
-        pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type);
-        if ((header_type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL) {
+        if (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) {
                 r = -EPERM;
                 goto out_put;
         }
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index f59c1e8de7a2..7d7e2aaffece 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -198,7 +198,7 @@ static void irqfd_update(struct kvm *kvm, struct _irqfd *irqfd,
 }
 
 static int
-kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)
+kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
 {
         struct kvm_irq_routing_table *irq_rt;
         struct _irqfd *irqfd, *tmp;
@@ -212,12 +212,12 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)
                 return -ENOMEM;
 
         irqfd->kvm = kvm;
-        irqfd->gsi = gsi;
+        irqfd->gsi = args->gsi;
         INIT_LIST_HEAD(&irqfd->list);
         INIT_WORK(&irqfd->inject, irqfd_inject);
         INIT_WORK(&irqfd->shutdown, irqfd_shutdown);
 
-        file = eventfd_fget(fd);
+        file = eventfd_fget(args->fd);
         if (IS_ERR(file)) {
                 ret = PTR_ERR(file);
                 goto fail;
@@ -298,19 +298,19 @@ kvm_eventfd_init(struct kvm *kvm)
  * shutdown any irqfd's that match fd+gsi
  */
 static int
-kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi)
+kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args)
 {
         struct _irqfd *irqfd, *tmp;
         struct eventfd_ctx *eventfd;
 
-        eventfd = eventfd_ctx_fdget(fd);
+        eventfd = eventfd_ctx_fdget(args->fd);
         if (IS_ERR(eventfd))
                 return PTR_ERR(eventfd);
 
         spin_lock_irq(&kvm->irqfds.lock);
 
         list_for_each_entry_safe(irqfd, tmp, &kvm->irqfds.items, list) {
-                if (irqfd->eventfd == eventfd && irqfd->gsi == gsi) {
+                if (irqfd->eventfd == eventfd && irqfd->gsi == args->gsi) {
                         /*
                          * This rcu_assign_pointer is needed for when
                          * another thread calls kvm_irq_routing_update before
@@ -338,12 +338,15 @@ kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi)
 }
 
 int
-kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
+kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
 {
-        if (flags & KVM_IRQFD_FLAG_DEASSIGN)
-                return kvm_irqfd_deassign(kvm, fd, gsi);
+        if (args->flags & ~KVM_IRQFD_FLAG_DEASSIGN)
+                return -EINVAL;
+
+        if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)
+                return kvm_irqfd_deassign(kvm, args);
 
-        return kvm_irqfd_assign(kvm, fd, gsi);
+        return kvm_irqfd_assign(kvm, args);
 }
 
 /*
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7e140683ff14..44ee7124b16d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2047,7 +2047,7 @@ static long kvm_vm_ioctl(struct file *filp,
                 r = -EFAULT;
                 if (copy_from_user(&data, argp, sizeof data))
                         goto out;
-                r = kvm_irqfd(kvm, data.fd, data.gsi, data.flags);
+                r = kvm_irqfd(kvm, &data);
                 break;
         }
         case KVM_IOEVENTFD: {
@@ -2845,6 +2845,7 @@ void kvm_exit(void)
         kvm_arch_hardware_unsetup();
         kvm_arch_exit();
         free_cpumask_var(cpus_hardware_enabled);
+        __free_page(fault_page);
         __free_page(hwpoison_page);
         __free_page(bad_page);
 }