]> git.proxmox.com Git - mirror_qemu.git/commit
virtio-blk: avoid using ioeventfd state in irqfd conditional
authorStefan Hajnoczi <stefanha@redhat.com>
Mon, 22 Jan 2024 17:26:25 +0000 (12:26 -0500)
committerKevin Wolf <kwolf@redhat.com>
Thu, 8 Feb 2024 08:37:33 +0000 (09:37 +0100)
commitbfa36802d1704fc413c590ebdcc4e5ae0eacf439
treee2a89c971e65e7c35a5ba1fc68fa11c1a19307f2
parent52bff01f64eec017ffb0d5903a0ee1d67ca7a548
virtio-blk: avoid using ioeventfd state in irqfd conditional

Requests that complete in an IOThread use irqfd to notify the guest
while requests that complete in the main loop thread use the traditional
qdev irq code path. The reason for this conditional is that the irq code
path requires the BQL:

  if (s->ioeventfd_started && !s->ioeventfd_disabled) {
      virtio_notify_irqfd(vdev, req->vq);
  } else {
      virtio_notify(vdev, req->vq);
  }

There is a corner case where the conditional invokes the irq code path
instead of the irqfd code path:

  static void virtio_blk_stop_ioeventfd(VirtIODevice *vdev)
  {
      ...
      /*
       * Set ->ioeventfd_started to false before draining so that host notifiers
       * are not detached/attached anymore.
       */
      s->ioeventfd_started = false;

      /* Wait for virtio_blk_dma_restart_bh() and in flight I/O to complete */
      blk_drain(s->conf.conf.blk);

During blk_drain() the conditional produces the wrong result because
ioeventfd_started is false.

Use qemu_in_iothread() instead of checking the ioeventfd state.

Cc: qemu-stable@nongnu.org
Buglink: https://issues.redhat.com/browse/RHEL-15394
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240122172625.415386-1-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
hw/block/virtio-blk.c