Re: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting

qemu-devel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting

From:	Jason Wang
Subject:	Re: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting process
Date:	Tue, 27 Apr 2021 14:40:44 +0800
User-agent:	Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.0


在 2021/4/27 上午11:39, Cindy Lu 写道:

Now the code for interrupt/vector are coupling
with the vq number, this patch will decouple the vritqueue
numbers from these functions.



So you need to describe why such kind of decoupling is needed,


Signed-off-by: Cindy Lu <lulu@redhat.com>
---
  hw/virtio/virtio-pci.c | 51 ++++++++++++++++++++++++------------------
  1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 36524a5728..2b7e6cc0d9 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -691,23 +691,17 @@ static void 
kvm_virtio_pci_vq_vector_release(VirtIOPCIProxy *proxy,
  }

static int kvm_virtio_pci_irqfd_use(VirtIOPCIProxy *proxy,

-                                 unsigned int queue_no,
+                                 EventNotifier *n,
                                   unsigned int vector)
  {
      VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];
-    VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
-    VirtQueue *vq = virtio_get_queue(vdev, queue_no);
-    EventNotifier *n = virtio_queue_get_guest_notifier(vq);
      return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, 
irqfd->virq);
  }

static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy,

-                                      unsigned int queue_no,
+                                      EventNotifier *n ,
                                        unsigned int vector)
  {
-    VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
-    VirtQueue *vq = virtio_get_queue(vdev, queue_no);
-    EventNotifier *n = virtio_queue_get_guest_notifier(vq);
      VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];
      int ret;

@@ -722,7 +716,8 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)

      VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
      unsigned int vector;
      int ret, queue_no;
-
+    VirtQueue *vq;
+    EventNotifier *n;
      for (queue_no = 0; queue_no < nvqs; queue_no++) {
          if (!virtio_queue_get_num(vdev, queue_no)) {
              break;
@@ -739,7 +734,9 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, 
int nvqs)
           * Otherwise, delay until unmasked in the frontend.
           */
          if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
-            ret = kvm_virtio_pci_irqfd_use(proxy, queue_no, vector);
+            vq = virtio_get_queue(vdev, queue_no);
+            n = virtio_queue_get_guest_notifier(vq);
+            ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
              if (ret < 0) {
                  kvm_virtio_pci_vq_vector_release(proxy, vector);
                  goto undo;
@@ -755,7 +752,9 @@ undo:
              continue;
          }
          if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
-            kvm_virtio_pci_irqfd_release(proxy, queue_no, vector);
+            vq = virtio_get_queue(vdev, queue_no);
+            n = virtio_queue_get_guest_notifier(vq);
+            kvm_virtio_pci_irqfd_release(proxy, n, vector);
          }
          kvm_virtio_pci_vq_vector_release(proxy, vector);
      }
@@ -769,7 +768,8 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy 
*proxy, int nvqs)
      unsigned int vector;
      int queue_no;
      VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
-
+    VirtQueue *vq;
+    EventNotifier *n;
      for (queue_no = 0; queue_no < nvqs; queue_no++) {
          if (!virtio_queue_get_num(vdev, queue_no)) {
              break;
@@ -782,7 +782,9 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy 
*proxy, int nvqs)
           * Otherwise, it was cleaned when masked in the frontend.
           */
          if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
-            kvm_virtio_pci_irqfd_release(proxy, queue_no, vector);
+            vq = virtio_get_queue(vdev, queue_no);
+            n = virtio_queue_get_guest_notifier(vq);
+            kvm_virtio_pci_irqfd_release(proxy, n, vector);
          }
          kvm_virtio_pci_vq_vector_release(proxy, vector);
      }
@@ -791,12 +793,11 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy 
*proxy, int nvqs)
  static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,
                                         unsigned int queue_no,
                                         unsigned int vector,
-                                       MSIMessage msg)
+                                       MSIMessage msg,
+                                        EventNotifier *n)

So you switch to use EventNotifier but keep using queue_no/vector, thislooks kind of duplication.

If we can keep queue_no or virtio_queue_get_guest_notifier working as inthe past, I don't see any reason for this effort.


Thanks

  {
      VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
      VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
-    VirtQueue *vq = virtio_get_queue(vdev, queue_no);
-    EventNotifier *n = virtio_queue_get_guest_notifier(vq);
      VirtIOIRQFD *irqfd;
      int ret = 0;

@@ -823,14 +824,15 @@ static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,

              event_notifier_set(n);
          }
      } else {
-        ret = kvm_virtio_pci_irqfd_use(proxy, queue_no, vector);
+        ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
      }
      return ret;
  }

static void virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy,

                                               unsigned int queue_no,
-                                             unsigned int vector)
+                                             unsigned int vector,
+                                             EventNotifier *n)
  {
      VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
      VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
@@ -841,7 +843,7 @@ static void virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy,
      if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
          k->guest_notifier_mask(vdev, queue_no, true);
      } else {
-        kvm_virtio_pci_irqfd_release(proxy, queue_no, vector);
+        kvm_virtio_pci_irqfd_release(proxy, n, vector);
      }
  }

@@ -851,6 +853,7 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector,

      VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev);
      VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
      VirtQueue *vq = virtio_vector_first_queue(vdev, vector);
+    EventNotifier *n;
      int ret, index, unmasked = 0;

while (vq) {

@@ -859,7 +862,8 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, 
unsigned vector,
              break;
          }
          if (index < proxy->nvqs_with_notifiers) {
-            ret = virtio_pci_vq_vector_unmask(proxy, index, vector, msg);
+            n = virtio_queue_get_guest_notifier(vq);
+            ret = virtio_pci_vq_vector_unmask(proxy, index, vector, msg, n);
              if (ret < 0) {
                  goto undo;
              }
@@ -875,7 +879,8 @@ undo:
      while (vq && unmasked >= 0) {
          index = virtio_get_queue_index(vq);
          if (index < proxy->nvqs_with_notifiers) {
-            virtio_pci_vq_vector_mask(proxy, index, vector);
+            n = virtio_queue_get_guest_notifier(vq);
+            virtio_pci_vq_vector_mask(proxy, index, vector, n);
              --unmasked;
          }
          vq = virtio_vector_next_queue(vq);
@@ -888,15 +893,17 @@ static void virtio_pci_vector_mask(PCIDevice *dev, 
unsigned vector)
      VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev);
      VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
      VirtQueue *vq = virtio_vector_first_queue(vdev, vector);
+    EventNotifier *n;
      int index;

while (vq) {

          index = virtio_get_queue_index(vq);
+         n = virtio_queue_get_guest_notifier(vq);
          if (!virtio_queue_get_num(vdev, index)) {
              break;
          }
          if (index < proxy->nvqs_with_notifiers) {
-            virtio_pci_vq_vector_mask(proxy, index, vector);
+            virtio_pci_vq_vector_mask(proxy, index, vector, n);
          }
          vq = virtio_vector_next_queue(vq);
      }

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH v6 0/9] vhost-vdpa: add support for configure interrupt, Cindy Lu, 2021/04/26
- [PATCH v6 1/9] hw: Add check for queue number, Cindy Lu, 2021/04/26
  - Re: [PATCH v6 1/9] hw: Add check for queue number, Jason Wang, 2021/04/27
    - Re: [PATCH v6 1/9] hw: Add check for queue number, Cindy Lu, 2021/04/28
- [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting process, Cindy Lu, 2021/04/26
  - Re: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting process, Jason Wang <=
    - Re: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting process, Jason Wang, 2021/04/27
- [PATCH v6 3/9] vhost: add new call back function for config interrupt, Cindy Lu, 2021/04/26
- [PATCH v6 4/9] vhost-vdpa: add support for config interrupt call back, Cindy Lu, 2021/04/26
- [PATCH v6 5/9] vhost:add support for configure interrupt, Cindy Lu, 2021/04/26
  - Re: [PATCH v6 5/9] vhost:add support for configure interrupt, Jason Wang, 2021/04/27
- [PATCH v6 6/9] virtio-mmio: add support for configure interrupt, Cindy Lu, 2021/04/26
- [PATCH v6 7/9] virtio-pci: add support for configure interrupt, Cindy Lu, 2021/04/26
  - Re: [PATCH v6 7/9] virtio-pci: add support for configure interrupt, Jason Wang, 2021/04/27
    - Re: [PATCH v6 7/9] virtio-pci: add support for configure interrupt, Cindy Lu, 2021/04/28
- [PATCH v6 8/9] virtio: decouple virtqueue from set notifier fd handler, Cindy Lu, 2021/04/26

Prev by Date: Re: [PATCH] hw/block/nvme: fix csi field for cns 0x00 and 0x11
Next by Date: Re: [PATCH 10/22] qapi/parser: Fix typing of token membership tests
Previous by thread: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting process
Next by thread: Re: [PATCH v6 2/9] virtio-pci:decouple virtqueue from interrupt setting process
Index(es):
- Date
- Thread