[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v9 10/10] virtio-pci: add support for configure interrupt
From: |
Michael S. Tsirkin |
Subject: |
Re: [PATCH v9 10/10] virtio-pci: add support for configure interrupt |
Date: |
Tue, 19 Oct 2021 02:50:24 -0400 |
On Thu, Sep 30, 2021 at 10:33:48AM +0800, Cindy Lu wrote:
> Add support for configure interrupt, The process is used kvm_irqfd_assign
> to set the gsi to kernel. When the configure notifier was signal by
> host, qemu will inject a msix interrupt to guest
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 88 +++++++++++++++++++++++++++++++++---------
> hw/virtio/virtio-pci.h | 4 +-
> 2 files changed, 72 insertions(+), 20 deletions(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index d0a2c2fb81..50179c2ba1 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -728,7 +728,8 @@ static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy,
> int queue_no,
> VirtQueue *vq;
>
> if (queue_no == VIRTIO_CONFIG_IRQ_IDX) {
> - return -1;
> + *n = virtio_config_get_guest_notifier(vdev);
> + *vector = vdev->config_vector;
> } else {
> if (!virtio_queue_get_num(vdev, queue_no)) {
> return -1;
So here you are rewriting code you added previously ... not great.
> @@ -806,6 +807,10 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy
> *proxy, int nvqs)
> return ret;
> }
>
> +static int kvm_virtio_pci_vector_config_use(VirtIOPCIProxy *proxy)
> +{
> + return kvm_virtio_pci_vector_use_one(proxy, VIRTIO_CONFIG_IRQ_IDX);
> +}
>
> static void kvm_virtio_pci_vector_release_one(VirtIOPCIProxy *proxy,
> int queue_no)
> @@ -829,6 +834,7 @@ static void
> kvm_virtio_pci_vector_release_one(VirtIOPCIProxy *proxy,
> }
> kvm_virtio_pci_vq_vector_release(proxy, vector);
> }
> +
> static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
> {
> int queue_no;
> @@ -842,6 +848,11 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy
> *proxy, int nvqs)
> }
> }
>
> +static void kvm_virtio_pci_vector_config_release(VirtIOPCIProxy *proxy)
> +{
> + kvm_virtio_pci_vector_release_one(proxy, VIRTIO_CONFIG_IRQ_IDX);
> +}
> +
> static int virtio_pci_one_vector_unmask(VirtIOPCIProxy *proxy,
> unsigned int queue_no,
> unsigned int vector,
> @@ -923,9 +934,17 @@ static int virtio_pci_vector_unmask(PCIDevice *dev,
> unsigned vector,
> }
> vq = virtio_vector_next_queue(vq);
> }
> -
> + /* unmask config intr */
> + n = virtio_config_get_guest_notifier(vdev);
> + ret = virtio_pci_one_vector_unmask(proxy, VIRTIO_CONFIG_IRQ_IDX, vector,
> + msg, n);
> + if (ret < 0) {
> + goto undo_config;
> + }
> return 0;
> -
> +undo_config:
> + n = virtio_config_get_guest_notifier(vdev);
> + virtio_pci_one_vector_mask(proxy, VIRTIO_CONFIG_IRQ_IDX, vector, n);
> undo:
> vq = virtio_vector_first_queue(vdev, vector);
> while (vq && unmasked >= 0) {
> @@ -959,6 +978,8 @@ static void virtio_pci_vector_mask(PCIDevice *dev,
> unsigned vector)
> }
> vq = virtio_vector_next_queue(vq);
> }
> + n = virtio_config_get_guest_notifier(vdev);
> + virtio_pci_one_vector_mask(proxy, VIRTIO_CONFIG_IRQ_IDX, vector, n);
> }
>
> static void virtio_pci_vector_poll(PCIDevice *dev,
> @@ -971,19 +992,17 @@ static void virtio_pci_vector_poll(PCIDevice *dev,
> int queue_no;
> unsigned int vector;
> EventNotifier *notifier;
> - VirtQueue *vq;
> -
> - for (queue_no = 0; queue_no < proxy->nvqs_with_notifiers; queue_no++) {
> - if (!virtio_queue_get_num(vdev, queue_no)) {
> + int ret;
> + for (queue_no = VIRTIO_CONFIG_IRQ_IDX;
> + queue_no < proxy->nvqs_with_notifiers; queue_no++) {
Oh, it turns out it's important that this value is -1,
otherwise the loop will just go crazy.
> + ret = virtio_pci_get_notifier(proxy, queue_no, ¬ifier, &vector);
> + if (ret < 0) {
> break;
> }
> - vector = virtio_queue_vector(vdev, queue_no);
> if (vector < vector_start || vector >= vector_end ||
> !msix_is_masked(dev, vector)) {
> continue;
> }
> - vq = virtio_get_queue(vdev, queue_no);
> - notifier = virtio_queue_get_guest_notifier(vq);
> if (k->guest_notifier_pending) {
> if (k->guest_notifier_pending(vdev, queue_no)) {
> msix_set_pending(dev, vector);
> @@ -994,23 +1013,42 @@ static void virtio_pci_vector_poll(PCIDevice *dev,
> }
> }
>
> +void virtio_pci_set_guest_notifier_fd_handler(VirtIODevice *vdev, VirtQueue
> *vq,
> + int n, bool assign,
> + bool with_irqfd)
> +{
> + if (n == VIRTIO_CONFIG_IRQ_IDX) {
> + virtio_config_set_guest_notifier_fd_handler(vdev, assign,
> with_irqfd);
> + } else {
> + virtio_queue_set_guest_notifier_fd_handler(vq, assign, with_irqfd);
> + }
> +}
> +
> static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign,
> bool with_irqfd)
> {
> VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
> VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
> VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
> - VirtQueue *vq = virtio_get_queue(vdev, n);
> - EventNotifier *notifier = virtio_queue_get_guest_notifier(vq);
> + VirtQueue *vq = NULL;
> + EventNotifier *notifier = NULL;
> +
> + if (n == VIRTIO_CONFIG_IRQ_IDX) {
> + notifier = virtio_config_get_guest_notifier(vdev);
> + } else {
> + vq = virtio_get_queue(vdev, n);
> + notifier = virtio_queue_get_guest_notifier(vq);
> + }
>
> if (assign) {
> int r = event_notifier_init(notifier, 0);
> if (r < 0) {
> return r;
> }
> - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd);
> + virtio_pci_set_guest_notifier_fd_handler(vdev, vq, n, true,
> with_irqfd);
> } else {
> - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd);
> + virtio_pci_set_guest_notifier_fd_handler(vdev, vq, n, false,
> + with_irqfd);
> event_notifier_cleanup(notifier);
> }
>
> @@ -1052,6 +1090,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;
> }
> @@ -1067,7 +1106,11 @@ static int virtio_pci_set_guest_notifiers(DeviceState
> *d, int nvqs, bool assign)
> goto assign_error;
> }
> }
> -
> + r = virtio_pci_set_guest_notifier(d, VIRTIO_CONFIG_IRQ_IDX, assign,
> + with_irqfd);
> + if (r < 0) {
> + goto config_assign_error;
> + }
> /* Must set vector notifier after guest notifier has been assigned */
> if ((with_irqfd || k->guest_notifier_mask) && assign) {
> if (with_irqfd) {
> @@ -1076,11 +1119,14 @@ static int virtio_pci_set_guest_notifiers(DeviceState
> *d, int nvqs, bool assign)
> msix_nr_vectors_allocated(&proxy->pci_dev));
> r = kvm_virtio_pci_vector_use(proxy, nvqs);
> if (r < 0) {
> - goto assign_error;
> + goto config_assign_error;
> }
> }
> - r = msix_set_vector_notifiers(&proxy->pci_dev,
> - virtio_pci_vector_unmask,
> + r = kvm_virtio_pci_vector_config_use(proxy);
> + if (r < 0) {
> + goto config_error;
> + }
> + r = msix_set_vector_notifiers(&proxy->pci_dev,
> virtio_pci_vector_unmask,
> virtio_pci_vector_mask,
> virtio_pci_vector_poll);
> if (r < 0) {
> @@ -1095,7 +1141,11 @@ notifiers_error:
> assert(assign);
> kvm_virtio_pci_vector_release(proxy, nvqs);
> }
> -
> +config_error:
> + kvm_virtio_pci_vector_config_release(proxy);
> +config_assign_error:
> + virtio_pci_set_guest_notifier(d, VIRTIO_CONFIG_IRQ_IDX, !assign,
> + with_irqfd);
> assign_error:
> /* We get here on assignment failure. Recover by undoing for VQs 0 .. n.
> */
> assert(assign);
> diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
> index 2446dcd9ae..b704acc5a8 100644
> --- a/hw/virtio/virtio-pci.h
> +++ b/hw/virtio/virtio-pci.h
> @@ -251,5 +251,7 @@ void virtio_pci_types_register(const
> VirtioPCIDeviceTypeInfo *t);
> * @fixed_queues.
> */
> unsigned virtio_pci_optimal_num_queues(unsigned fixed_queues);
> -
> +void virtio_pci_set_guest_notifier_fd_handler(VirtIODevice *vdev, VirtQueue
> *vq,
> + int n, bool assign,
> + bool with_irqfd);
> #endif
> --
> 2.21.3