vhost_vdpa: don't setup irq offloading when irq_num < 0
authorZhu Lingshan <lingshan.zhu@intel.com>
Tue, 22 Feb 2022 11:54:25 +0000 (19:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 May 2022 07:57:25 +0000 (09:57 +0200)
[ Upstream commit cce0ab2b2a39072d81f98017f7b076f3410ef740 ]

When irq number is negative(e.g., -EINVAL), the virtqueue
may be disabled or the virtqueues are sharing a device irq.
In such case, we should not setup irq offloading for a virtqueue.

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Link: https://lore.kernel.org/r/20220222115428.998334-3-lingshan.zhu@intel.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/vhost/vdpa.c

index d62f05d056b7be92a8552715daba326b68b5cbfa..299a995326185aa32beed8c21511ba0921a6ee2b 100644 (file)
@@ -97,8 +97,11 @@ static void vhost_vdpa_setup_vq_irq(struct vhost_vdpa *v, u16 qid)
                return;
 
        irq = ops->get_vq_irq(vdpa, qid);
+       if (irq < 0)
+               return;
+
        irq_bypass_unregister_producer(&vq->call_ctx.producer);
-       if (!vq->call_ctx.ctx || irq < 0)
+       if (!vq->call_ctx.ctx)
                return;
 
        vq->call_ctx.producer.token = vq->call_ctx.ctx;