| Message ID | 20210427033951.29805-9-lulu@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-vdpa: add support for configure interrupt | expand |
在 2021/4/27 上午11:39, Cindy Lu 写道: > This patch will decouple virtqueue from > virtio_queue_set_guest_notifier_fd_handler, > here queue number -1 mean the configure interrupt. The funtion > will set the config_notify_read as fd handler Any reason that this is not done before patch 3? Thanks > > Signed-off-by: Cindy Lu <lulu@redhat.com> > --- > hw/s390x/virtio-ccw.c | 6 +++--- > hw/virtio/virtio-mmio.c | 8 ++++---- > hw/virtio/virtio-pci.c | 9 +++++---- > hw/virtio/virtio.c | 35 +++++++++++++++++------------------ > include/hw/virtio/virtio.h | 4 +--- > 5 files changed, 30 insertions(+), 32 deletions(-) > > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 4582e94ae7..5d73c99d30 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -989,11 +989,11 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n, > if (r < 0) { > return r; > } > - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd); > + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd); > if (with_irqfd) { > r = virtio_ccw_add_irqfd(dev, n); > if (r) { > - virtio_queue_set_guest_notifier_fd_handler(vq, false, > + virtio_set_notifier_fd_handler(vdev, n, false, > with_irqfd); > return r; > } > @@ -1017,7 +1017,7 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n, > if (with_irqfd) { > virtio_ccw_remove_irqfd(dev, n); > } > - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd); > + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); > event_notifier_cleanup(notifier); > } > return 0; > diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c > index d8cb368728..4ea55001be 100644 > --- a/hw/virtio/virtio-mmio.c > +++ b/hw/virtio/virtio-mmio.c > @@ -620,9 +620,9 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign, > if (r < 0) { > return r; > } > - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd); > + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd); > } else { > - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd); > + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); > event_notifier_cleanup(notifier); > } > > @@ -642,9 +642,9 @@ static int virtio_mmio_set_config_notifier(DeviceState *d, bool assign) > int r = 0; > if (assign) { > r = event_notifier_init(notifier, 0); > - virtio_set_config_notifier_fd_handler(vdev, true, false); > + virtio_set_notifier_fd_handler(vdev, -1, true, false); > } else { > - virtio_set_config_notifier_fd_handler(vdev, false, false); > + virtio_set_notifier_fd_handler(vdev, -1, false, false); > event_notifier_cleanup(notifier); > } > if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) { > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 07d28dd367..5033b3db4f 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -806,10 +806,10 @@ static int virtio_pci_set_config_notifier(DeviceState *d, bool assign) > int r = 0; > if (assign) { > r = event_notifier_init(notifier, 0); > - virtio_set_config_notifier_fd_handler(vdev, true, true); > + virtio_set_notifier_fd_handler(vdev, -1, true, true); > kvm_virtio_pci_vector_config_use(proxy); > } else { > - virtio_set_config_notifier_fd_handler(vdev, false, true); > + virtio_set_notifier_fd_handler(vdev, -1, false, true); > kvm_virtio_pci_vector_config_release(proxy); > event_notifier_cleanup(notifier); > } > @@ -1005,9 +1005,9 @@ static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign, > if (r < 0) { > return r; > } > - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd); > + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd); > } else { > - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd); > + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); > event_notifier_cleanup(notifier); > } > > @@ -1049,6 +1049,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign) > msix_unset_vector_notifiers(&proxy->pci_dev); > if (proxy->vector_irqfd) { > kvm_virtio_pci_vector_release(proxy, nvqs); > + kvm_virtio_pci_vector_config_release(proxy); > g_free(proxy->vector_irqfd); > proxy->vector_irqfd = NULL; > } > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 5dff29c981..8f0087deac 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -3510,32 +3510,31 @@ static void virtio_config_read(EventNotifier *n) > virtio_notify_config(vdev); > } > } > -void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign, > - bool with_irqfd) > + > +void virtio_set_notifier_fd_handler(VirtIODevice *vdev, int queue_no, > + bool assign, bool with_irqfd) > { > - if (assign && !with_irqfd) { > - event_notifier_set_handler(&vq->guest_notifier, > - virtio_queue_guest_notifier_read); > + EventNotifier *e ; > + EventNotifierHandler *handler; > + if (queue_no != -1) { > + VirtQueue *vq = virtio_get_queue(vdev, queue_no); > + e = &vq->guest_notifier; > + handler = virtio_queue_guest_notifier_read; > + } else { > + e = &vdev->config_notifier; > + handler = virtio_config_read; > + } > + if (assign && !with_irqfd) { > + event_notifier_set_handler(e, handler); > } else { > - event_notifier_set_handler(&vq->guest_notifier, NULL); > + event_notifier_set_handler(e, NULL); > } > if (!assign) { > /* Test and clear notifier before closing it, > * in case poll callback didn't have time to run. */ > - virtio_queue_guest_notifier_read(&vq->guest_notifier); > + handler(e); > } > } > -void virtio_set_config_notifier_fd_handler(VirtIODevice *vdev, bool assign, > - bool with_irqfd) > -{ > - if (assign && !with_irqfd) { > - event_notifier_set_handler(&vdev->config_notifier, > - virtio_config_read); > - } else { > - event_notifier_set_handler(&vdev->config_notifier, NULL); > - } > -} > - > EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq) > { > return &vq->guest_notifier; > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index b0b714f6d4..d22f5a3e7e 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -309,9 +309,7 @@ void virtio_queue_update_used_idx(VirtIODevice *vdev, int n); > VirtQueue *virtio_get_queue(VirtIODevice *vdev, int n); > uint16_t virtio_get_queue_index(VirtQueue *vq); > EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq); > -void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign, > - bool with_irqfd); > -void virtio_set_config_notifier_fd_handler(VirtIODevice *vdev, bool assign, > +void virtio_set_notifier_fd_handler(VirtIODevice *vdev, int n, bool assign, > bool with_irqfd); > int virtio_device_start_ioeventfd(VirtIODevice *vdev); > int virtio_device_grab_ioeventfd(VirtIODevice *vdev);
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 4582e94ae7..5d73c99d30 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -989,11 +989,11 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n, if (r < 0) { return r; } - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd); + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd); if (with_irqfd) { r = virtio_ccw_add_irqfd(dev, n); if (r) { - virtio_queue_set_guest_notifier_fd_handler(vq, false, + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); return r; } @@ -1017,7 +1017,7 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n, if (with_irqfd) { virtio_ccw_remove_irqfd(dev, n); } - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd); + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); event_notifier_cleanup(notifier); } return 0; diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index d8cb368728..4ea55001be 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -620,9 +620,9 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign, if (r < 0) { return r; } - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd); + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd); } else { - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd); + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); event_notifier_cleanup(notifier); } @@ -642,9 +642,9 @@ static int virtio_mmio_set_config_notifier(DeviceState *d, bool assign) int r = 0; if (assign) { r = event_notifier_init(notifier, 0); - virtio_set_config_notifier_fd_handler(vdev, true, false); + virtio_set_notifier_fd_handler(vdev, -1, true, false); } else { - virtio_set_config_notifier_fd_handler(vdev, false, false); + virtio_set_notifier_fd_handler(vdev, -1, false, false); event_notifier_cleanup(notifier); } if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) { diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 07d28dd367..5033b3db4f 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -806,10 +806,10 @@ static int virtio_pci_set_config_notifier(DeviceState *d, bool assign) int r = 0; if (assign) { r = event_notifier_init(notifier, 0); - virtio_set_config_notifier_fd_handler(vdev, true, true); + virtio_set_notifier_fd_handler(vdev, -1, true, true); kvm_virtio_pci_vector_config_use(proxy); } else { - virtio_set_config_notifier_fd_handler(vdev, false, true); + virtio_set_notifier_fd_handler(vdev, -1, false, true); kvm_virtio_pci_vector_config_release(proxy); event_notifier_cleanup(notifier); } @@ -1005,9 +1005,9 @@ static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign, if (r < 0) { return r; } - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd); + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd); } else { - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd); + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd); event_notifier_cleanup(notifier); } @@ -1049,6 +1049,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign) msix_unset_vector_notifiers(&proxy->pci_dev); if (proxy->vector_irqfd) { kvm_virtio_pci_vector_release(proxy, nvqs); + kvm_virtio_pci_vector_config_release(proxy); g_free(proxy->vector_irqfd); proxy->vector_irqfd = NULL; } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 5dff29c981..8f0087deac 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -3510,32 +3510,31 @@ static void virtio_config_read(EventNotifier *n) virtio_notify_config(vdev); } } -void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign, - bool with_irqfd) + +void virtio_set_notifier_fd_handler(VirtIODevice *vdev, int queue_no, + bool assign, bool with_irqfd) { - if (assign && !with_irqfd) { - event_notifier_set_handler(&vq->guest_notifier, - virtio_queue_guest_notifier_read); + EventNotifier *e ; + EventNotifierHandler *handler; + if (queue_no != -1) { + VirtQueue *vq = virtio_get_queue(vdev, queue_no); + e = &vq->guest_notifier; + handler = virtio_queue_guest_notifier_read; + } else { + e = &vdev->config_notifier; + handler = virtio_config_read; + } + if (assign && !with_irqfd) { + event_notifier_set_handler(e, handler); } else { - event_notifier_set_handler(&vq->guest_notifier, NULL); + event_notifier_set_handler(e, NULL); } if (!assign) { /* Test and clear notifier before closing it, * in case poll callback didn't have time to run. */ - virtio_queue_guest_notifier_read(&vq->guest_notifier); + handler(e); } } -void virtio_set_config_notifier_fd_handler(VirtIODevice *vdev, bool assign, - bool with_irqfd) -{ - if (assign && !with_irqfd) { - event_notifier_set_handler(&vdev->config_notifier, - virtio_config_read); - } else { - event_notifier_set_handler(&vdev->config_notifier, NULL); - } -} - EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq) { return &vq->guest_notifier; diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index b0b714f6d4..d22f5a3e7e 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -309,9 +309,7 @@ void virtio_queue_update_used_idx(VirtIODevice *vdev, int n); VirtQueue *virtio_get_queue(VirtIODevice *vdev, int n); uint16_t virtio_get_queue_index(VirtQueue *vq); EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq); -void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign, - bool with_irqfd); -void virtio_set_config_notifier_fd_handler(VirtIODevice *vdev, bool assign, +void virtio_set_notifier_fd_handler(VirtIODevice *vdev, int n, bool assign, bool with_irqfd); int virtio_device_start_ioeventfd(VirtIODevice *vdev); int virtio_device_grab_ioeventfd(VirtIODevice *vdev);
This patch will decouple virtqueue from virtio_queue_set_guest_notifier_fd_handler, here queue number -1 mean the configure interrupt. The funtion will set the config_notify_read as fd handler Signed-off-by: Cindy Lu <lulu@redhat.com> --- hw/s390x/virtio-ccw.c | 6 +++--- hw/virtio/virtio-mmio.c | 8 ++++---- hw/virtio/virtio-pci.c | 9 +++++---- hw/virtio/virtio.c | 35 +++++++++++++++++------------------ include/hw/virtio/virtio.h | 4 +--- 5 files changed, 30 insertions(+), 32 deletions(-)