qemu-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v5 3/6] virtio:add support in configure interrupt

From: Jason Wang
Subject: Re: [PATCH v5 3/6] virtio:add support in configure interrupt
Date: Fri, 9 Apr 2021 15:21:36 +0800
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 

在 2021/4/8 下午5:38, Cindy Lu 写道:

Add configure notifier support in virtio and related driver
When peer is vhost vdpa, setup the configure interrupt function
vhost_net_start and release the resource when vhost_net_stop



Actually, this is the vhost support for config interrupt.




Signed-off-by: Cindy Lu <lulu@redhat.com>
---
  hw/net/vhost_net.c         |  9 +++++++++
  hw/net/virtio-net.c        |  6 ++++++
  hw/virtio/vhost.c          | 38 +++++++++++++++++++++++++++++++++++++-
  hw/virtio/virtio.c         | 25 +++++++++++++++++++++++++
  include/hw/virtio/vhost.h  |  3 +++
  include/hw/virtio/virtio.h |  5 +++++
  include/net/vhost_net.h    |  3 +++
  7 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 24d555e764..12e30dc25e 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -426,6 +426,15 @@ void vhost_net_virtqueue_mask(VHostNetState *net, 
VirtIODevice *dev,
      vhost_virtqueue_mask(&net->dev, dev, idx, mask);
  }
+bool vhost_net_config_pending(VHostNetState *net, int idx) 
+{
+    return vhost_config_pending(&net->dev, idx);
+}
+void vhost_net_config_mask(VHostNetState *net, VirtIODevice *dev,
+                              bool mask)
+{
+    vhost_config_mask(&net->dev, dev,  mask);
+}
  VHostNetState *get_vhost_net(NetClientState *nc)
  {
      VHostNetState *vhost_net = 0;
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 00d95e6615..e30a7d9835 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3064,6 +3064,9 @@ static bool 
virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx,
      if (type == VIRTIO_VQ_VECTOR) {
          return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
      }
+    if (type == VIRTIO_CONFIG_VECTOR) {
+        return vhost_net_config_pending(get_vhost_net(nc->peer), idx);
+    }
      return false;
  }
@@ -3076,6 +3079,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, 
      if (type == VIRTIO_VQ_VECTOR) {
          vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
       }
+    if (type == VIRTIO_CONFIG_VECTOR) {
+        vhost_net_config_mask(get_vhost_net(nc->peer), vdev, mask);
+     }
  }
static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features) 
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 614ccc2bcb..b5e915d5cf 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1313,6 +1313,10 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
              goto fail;
          }
      }
+    r = event_notifier_init(&hdev->masked_config_notifier, 0);
+    if (r < 0) {
+        return r;
+    }
if (busyloop_timeout) { 
          for (i = 0; i < hdev->nvqs; ++i) {
@@ -1405,6 +1409,7 @@ void vhost_dev_cleanup(struct vhost_dev *hdev)
      for (i = 0; i < hdev->nvqs; ++i) {
          vhost_virtqueue_cleanup(hdev->vqs + i);
      }
+    event_notifier_cleanup(&hdev->masked_config_notifier);
      if (hdev->mem) {
          /* those are only safe after successful init */
          memory_listener_unregister(&hdev->memory_listener);
@@ -1498,6 +1503,10 @@ bool vhost_virtqueue_pending(struct vhost_dev *hdev, int 
n)
      return event_notifier_test_and_clear(&vq->masked_notifier);
  }
+bool vhost_config_pending(struct vhost_dev *hdev, int n) 
+{
+    return event_notifier_test_and_clear(&hdev->masked_config_notifier);
+}
  /* Mask/unmask events from this vq. */
  void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
                           bool mask)
@@ -1522,6 +1531,28 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev, 
VirtIODevice *vdev, int n,
          VHOST_OPS_DEBUG("vhost_set_vring_call failed");
      }
  }
+void vhost_config_mask(struct vhost_dev *hdev, VirtIODevice *vdev,
+                         bool mask)
+{
+   int fd;
+   int r;
+   EventNotifier *masked_config_notifier = &hdev->masked_config_notifier;
+   EventNotifier *config_notifier = &vdev->config_notifier;
+   if (vdev->use_config_notifier != true) {
+        return;
+    }
+    assert(hdev->vhost_ops);
+    if (mask) {
+        assert(vdev->use_guest_notifier_mask);
+        fd = event_notifier_get_fd(masked_config_notifier);
+    } else {
+        fd = event_notifier_get_fd(config_notifier);
+    }
+   r = hdev->vhost_ops->vhost_set_config_call(hdev, &fd);
+   if (r < 0) {
+        error_report("vhost_set_config_call failed");
+    }
+}
uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits, 
                              uint64_t features)
@@ -1732,7 +1763,12 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice 
*vdev)
              goto fail_vq;
          }
      }
-
+    if (vdev->use_config_notifier == true) {
+        event_notifier_test_and_clear(&hdev->masked_config_notifier);
+        if (!vdev->use_guest_notifier_mask) {
+            vhost_config_mask(hdev, vdev,  false);
+        }
+    }
      if (hdev->log_enabled) {
          uint64_t log_base;
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c 
index ceb58fda6c..774ac3893b 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -3278,6 +3278,7 @@ void virtio_init(VirtIODevice *vdev, const char *name,
              virtio_vmstate_change, vdev);
      vdev->device_endian = virtio_default_endian();
      vdev->use_guest_notifier_mask = true;
+    vdev->use_config_notifier = false;
It's still unclear to me why we need use_config_notifier. What happens if we don't have that? 

Thanks



  }
/* 
@@ -3502,6 +3503,16 @@ static void 
virtio_queue_guest_notifier_read(EventNotifier *n)
      }
  }
+static void virtio_config_read(EventNotifier *n) 
+{
+    VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
+    if (vdev->use_config_notifier == false) {
+        return;
+    }
+    if (event_notifier_test_and_clear(n)) {
+        virtio_notify_config(vdev);
+    }
+}
  void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
                                                  bool with_irqfd)
  {
@@ -3517,6 +3528,16 @@ void 
virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
          virtio_queue_guest_notifier_read(&vq->guest_notifier);
      }
  }
+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) 
  {
@@ -3591,6 +3612,10 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue 
*vq)
      return &vq->host_notifier;
  }
+EventNotifier *virtio_get_config_notifier(VirtIODevice *vdev) 
+{
+    return &vdev->config_notifier;
+}
  void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled)
  {
      vq->host_notifier_enabled = enabled;
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 4a8bc75415..22efa7008e 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -91,6 +91,7 @@ struct vhost_dev {
      QLIST_HEAD(, vhost_iommu) iommu_list;
      IOMMUNotifier n;
      const VhostDevConfigOps *config_ops;
+    EventNotifier masked_config_notifier;
  };
struct vhost_net { 
@@ -108,6 +109,8 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice 
*vdev);
  void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev);
  int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev);
  void vhost_dev_disable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev);
+bool vhost_config_pending(struct vhost_dev *hdev, int n);
+void vhost_config_mask(struct vhost_dev *hdev, VirtIODevice *vdev,  bool mask);
/* Test and clear masked event pending status. 
   * Should be called after unmask to avoid losing events.
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 5a1940fe70..fd17dbb097 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -113,6 +113,8 @@ struct VirtIODevice
      bool use_guest_notifier_mask;
      AddressSpace *dma_as;
      QLIST_HEAD(, VirtQueue) *vector_queues;
+    EventNotifier config_notifier;
+    bool use_config_notifier;
  };
struct VirtioDeviceClass { 
@@ -315,11 +317,14 @@ 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,
+                                                bool with_irqfd);
  int virtio_device_start_ioeventfd(VirtIODevice *vdev);
  int virtio_device_grab_ioeventfd(VirtIODevice *vdev);
  void virtio_device_release_ioeventfd(VirtIODevice *vdev);
  bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev);
  EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
+EventNotifier *virtio_get_config_notifier(VirtIODevice *vdev);
  void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled);
  void virtio_queue_host_notifier_read(EventNotifier *n);
  void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext 
*ctx,
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index 172b0051d8..0d38c97c94 100644
--- a/include/net/vhost_net.h
+++ b/include/net/vhost_net.h
@@ -36,6 +36,9 @@ int vhost_net_set_config(struct vhost_net *net, const uint8_t 
*data,
  bool vhost_net_virtqueue_pending(VHostNetState *net, int n);
  void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
                                int idx, bool mask);
+bool vhost_net_config_pending(VHostNetState *net, int n);
+void vhost_net_config_mask(VHostNetState *net, VirtIODevice *dev,
+                              bool mask);
  int vhost_net_notify_migration_done(VHostNetState *net, char* mac_addr);
  VHostNetState *get_vhost_net(NetClientState *nc);
reply via email to
[Prev in Thread] Current Thread [Next in Thread]