* [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt
@ 2021-07-06 7:20 Cindy Lu
2021-07-06 7:20 ` [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX Cindy Lu
` (8 more replies)
0 siblings, 9 replies; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
these patches are add the support for configure interrupt
These code are all tested in vp-vdpa (support configure interrupt)
vdpa_sim (not support configure interrupt), virtio tap device
test in virtio-pci bus and virtio-mmio bus
Change in v2:
Add support for virtio-mmio bus
active the notifier while the backend support configure interrupt
misc fixes form v1
Change in v3
fix the coding style problems
Change in v4
misc fixes form v3
merge the set_config_notifier to set_guest_notifier
when vdpa start, check the feature by VIRTIO_NET_F_STATUS
Change in v5
misc fixes form v4
split the code for introduce configure interrupt type and callback function
will init the configure interrupt in all virtio-pci and virtio-mmio bus, but will
only active while using vhost-vdpa driver
Change in v6
misc fixes form v5
decouple virtqueue from interrupt setting and misc process
fix the bug in virtio_net_handle_rx
use -1 as the queue number to identify if the interrupt is configure interrupt
Change in v7
misc fixes form v6
decouple virtqueue from interrupt setting and misc process
decouple virtqueue from verctor use/release process
decouple virtqueue from set notifier fd handler process
move config_notifier and masked_config_notifier to VirtIODevice
fix the bug in virtio_net_handle_rx, add more information
add VIRTIO_CONFIG_IRQ_IDX as the queue number to identify if the interrupt is configure interrupt
Change in v8
misc fixes form v7
decouple virtqueue from interrupt setting and misc process
decouple virtqueue from verctor use/release process
decouple virtqueue from set notifier fd handler process
move the vhost configure interrpt to vhost_net
Cindy Lu (9):
virtio: introduce macro IRTIO_CONFIG_IRQ_IDX
virtio-pci:decouple virtqueue from interrupt setting process
vhost: add new call back function for config interrupt
vhost-vdpa: add support for config interrupt call back
vhost-net:add support for configure interrupt
virtio-mmio: add support for configure interrupt
virtio-pci: decouple notifier from interrupt process
virtio-pci:decouple the single vector from the interrupt process
virtio-pci: add support for configure interrupt
hw/display/vhost-user-gpu.c | 6 +
hw/net/vhost_net.c | 36 ++++++
hw/net/virtio-net.c | 16 ++-
hw/virtio/trace-events | 2 +
hw/virtio/vhost-user-fs.c | 9 +-
hw/virtio/vhost-vdpa.c | 7 +
hw/virtio/vhost-vsock-common.c | 6 +
hw/virtio/vhost.c | 44 +++++++
hw/virtio/virtio-crypto.c | 6 +
hw/virtio/virtio-mmio.c | 26 ++++
hw/virtio/virtio-pci.c | 207 ++++++++++++++++++------------
hw/virtio/virtio.c | 33 ++++-
include/hw/virtio/vhost-backend.h | 3 +
include/hw/virtio/vhost.h | 2 +
include/hw/virtio/virtio.h | 7 +
include/net/vhost_net.h | 3 +
16 files changed, 326 insertions(+), 87 deletions(-)
--
2.21.3
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 4:04 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 2/9] virtio-pci:decouple virtqueue from interrupt setting process Cindy Lu
` (7 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
In order to support configure interrupt for vhost-vdpa
introduce VIRTIO_CONFIG_IRQ_IDX -1 as a queue index,
then we can reuse the function guest_notifier_mask and
guest_notifier_pending.
we add the check of queue index, if the driver
is not support configure interrupt, the function will just return
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/display/vhost-user-gpu.c | 6 ++++++
hw/net/virtio-net.c | 10 +++++++---
hw/virtio/vhost-user-fs.c | 9 +++++++--
hw/virtio/vhost-vsock-common.c | 6 ++++++
hw/virtio/virtio-crypto.c | 6 ++++++
include/hw/virtio/virtio.h | 2 ++
6 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 6cdaa1c73b..c232d55986 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -483,6 +483,9 @@ vhost_user_gpu_guest_notifier_pending(VirtIODevice *vdev, int idx)
{
VhostUserGPU *g = VHOST_USER_GPU(vdev);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return false;
+ }
return vhost_virtqueue_pending(&g->vhost->dev, idx);
}
@@ -491,6 +494,9 @@ vhost_user_gpu_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask)
{
VhostUserGPU *g = VHOST_USER_GPU(vdev);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return;
+ }
vhost_virtqueue_mask(&g->vhost->dev, vdev, idx, mask);
}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 66b9ff4511..f50235b5d6 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3052,7 +3052,10 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx));
assert(n->vhost_started);
- return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
+ if (idx != VIRTIO_CONFIG_IRQ_IDX) {
+ return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
+ }
+ return false;
}
static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
@@ -3061,8 +3064,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx));
assert(n->vhost_started);
- vhost_net_virtqueue_mask(get_vhost_net(nc->peer),
- vdev, idx, mask);
+ if (idx != VIRTIO_CONFIG_IRQ_IDX) {
+ vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
+ }
}
static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features)
diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
index 6f7f91533d..7e8ca25f71 100644
--- a/hw/virtio/vhost-user-fs.c
+++ b/hw/virtio/vhost-user-fs.c
@@ -156,11 +156,13 @@ static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq)
*/
}
-static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx,
- bool mask)
+static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask)
{
VHostUserFS *fs = VHOST_USER_FS(vdev);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return;
+ }
vhost_virtqueue_mask(&fs->vhost_dev, vdev, idx, mask);
}
@@ -168,6 +170,9 @@ static bool vuf_guest_notifier_pending(VirtIODevice *vdev, int idx)
{
VHostUserFS *fs = VHOST_USER_FS(vdev);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return false;
+ }
return vhost_virtqueue_pending(&fs->vhost_dev, idx);
}
diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c
index 4ad6e234ad..2112b44802 100644
--- a/hw/virtio/vhost-vsock-common.c
+++ b/hw/virtio/vhost-vsock-common.c
@@ -101,6 +101,9 @@ static void vhost_vsock_common_guest_notifier_mask(VirtIODevice *vdev, int idx,
{
VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return;
+ }
vhost_virtqueue_mask(&vvc->vhost_dev, vdev, idx, mask);
}
@@ -109,6 +112,9 @@ static bool vhost_vsock_common_guest_notifier_pending(VirtIODevice *vdev,
{
VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return false;
+ }
return vhost_virtqueue_pending(&vvc->vhost_dev, idx);
}
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
index 54f9bbb789..1d5192f8b4 100644
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -948,6 +948,9 @@ static void virtio_crypto_guest_notifier_mask(VirtIODevice *vdev, int idx,
assert(vcrypto->vhost_started);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return;
+ }
cryptodev_vhost_virtqueue_mask(vdev, queue, idx, mask);
}
@@ -958,6 +961,9 @@ static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx)
assert(vcrypto->vhost_started);
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return false;
+ }
return cryptodev_vhost_virtqueue_pending(vdev, queue, idx);
}
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b7ece7a6a8..63cb9455ed 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -67,6 +67,8 @@ typedef struct VirtQueueElement
#define VIRTIO_NO_VECTOR 0xffff
+#define VIRTIO_CONFIG_IRQ_IDX -1
+
#define TYPE_VIRTIO_DEVICE "virtio-device"
OBJECT_DECLARE_TYPE(VirtIODevice, VirtioDeviceClass, VIRTIO_DEVICE)
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 2/9] virtio-pci:decouple virtqueue from interrupt setting process
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
2021-07-06 7:20 ` [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:22 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 3/9] vhost: add new call back function for config interrupt Cindy Lu
` (6 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
Decouple virtqueue from interrupt setting process to support config interrupt
Now the code for interrupt/vector are coupling
with the vq number, this patch will decouple the vritqueue
numbers from these functions
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/virtio-pci.c | 55 ++++++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 24 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index b321604d9b..2fe5b1f5aa 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -693,23 +693,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;
@@ -724,7 +718,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;
@@ -741,7 +736,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;
@@ -757,7 +754,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);
}
@@ -771,7 +770,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;
@@ -784,21 +784,22 @@ 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);
}
}
-static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,
+static int virtio_pci_one_vector_unmask(VirtIOPCIProxy *proxy,
unsigned int queue_no,
unsigned int vector,
- MSIMessage msg)
+ MSIMessage msg,
+ EventNotifier *n)
{
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;
@@ -825,14 +826,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,
+static void virtio_pci_one_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);
@@ -843,7 +845,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);
}
}
@@ -853,6 +855,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) {
@@ -861,7 +864,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_one_vector_unmask(proxy, index, vector, msg, n);
if (ret < 0) {
goto undo;
}
@@ -877,7 +881,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_one_vector_mask(proxy, index, vector, n);
--unmasked;
}
vq = virtio_vector_next_queue(vq);
@@ -890,15 +895,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_one_vector_mask(proxy, index, vector, n);
}
vq = virtio_vector_next_queue(vq);
}
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 3/9] vhost: add new call back function for config interrupt
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
2021-07-06 7:20 ` [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX Cindy Lu
2021-07-06 7:20 ` [PATCH v8 2/9] virtio-pci:decouple virtqueue from interrupt setting process Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:23 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 4/9] vhost-vdpa: add support for config interrupt call back Cindy Lu
` (5 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
To support configure interrupt, we need to
add a new call back function for config interrupt.
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
include/hw/virtio/vhost-backend.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
index 8a6f8e2a7a..8ade8e0bd2 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -125,6 +125,8 @@ typedef int (*vhost_get_device_id_op)(struct vhost_dev *dev, uint32_t *dev_id);
typedef bool (*vhost_force_iommu_op)(struct vhost_dev *dev);
+typedef int (*vhost_set_config_call_op)(struct vhost_dev *dev,
+ int fd);
typedef struct VhostOps {
VhostBackendType backend_type;
vhost_backend_init vhost_backend_init;
@@ -170,6 +172,7 @@ typedef struct VhostOps {
vhost_vq_get_addr_op vhost_vq_get_addr;
vhost_get_device_id_op vhost_get_device_id;
vhost_force_iommu_op vhost_force_iommu;
+ vhost_set_config_call_op vhost_set_config_call;
} VhostOps;
extern const VhostOps user_ops;
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 4/9] vhost-vdpa: add support for config interrupt call back
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
` (2 preceding siblings ...)
2021-07-06 7:20 ` [PATCH v8 3/9] vhost: add new call back function for config interrupt Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:24 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 5/9] vhost-net:add support for configure interrupt Cindy Lu
` (4 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
Add new call back function in vhost-vdpa, this call back function only
supported in vhost-vdpa backend
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/trace-events | 2 ++
hw/virtio/vhost-vdpa.c | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index c62727f879..152db5917d 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -52,6 +52,8 @@ vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p index:
vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64
vhost_vdpa_set_owner(void *dev) "dev: %p"
vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64
+vhost_vdpa_set_config_call(void *dev, int fd)"dev: %p fd: %d"
+
# virtio.c
virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u"
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 01d2101d09..58075da9d9 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -545,6 +545,12 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev,
trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd);
return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file);
}
+static int vhost_vdpa_set_config_call(struct vhost_dev *dev,
+ int fd)
+{
+ trace_vhost_vdpa_set_config_call(dev, fd);
+ return vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG_CALL, &fd);
+}
static int vhost_vdpa_get_features(struct vhost_dev *dev,
uint64_t *features)
@@ -611,4 +617,5 @@ const VhostOps vdpa_ops = {
.vhost_get_device_id = vhost_vdpa_get_device_id,
.vhost_vq_get_addr = vhost_vdpa_vq_get_addr,
.vhost_force_iommu = vhost_vdpa_force_iommu,
+ .vhost_set_config_call = vhost_vdpa_set_config_call,
};
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 5/9] vhost-net:add support for configure interrupt
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
` (3 preceding siblings ...)
2021-07-06 7:20 ` [PATCH v8 4/9] vhost-vdpa: add support for config interrupt call back Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:41 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 6/9] virtio-mmio: add " Cindy Lu
` (3 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
Add configure notifier support in vhost and virtio driver
When backend support VIRTIO_NET_F_STATUS,setup the configure
interrupt function in vhost_net_start and release the related
resource when vhost_net_stop
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/net/vhost_net.c | 36 +++++++++++++++++++++++++++++++
hw/net/virtio-net.c | 6 ++++++
hw/virtio/vhost.c | 44 ++++++++++++++++++++++++++++++++++++++
hw/virtio/virtio.c | 33 ++++++++++++++++++++++++++--
include/hw/virtio/vhost.h | 2 ++
include/hw/virtio/virtio.h | 5 +++++
include/net/vhost_net.h | 3 +++
7 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 24d555e764..be453717c4 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -310,6 +310,31 @@ static void vhost_net_stop_one(struct vhost_net *net,
vhost_dev_disable_notifiers(&net->dev, dev);
}
+static void vhost_net_stop_config_intr(struct vhost_net *net)
+{
+ struct vhost_dev *dev = &net->dev;
+ if (dev->features & (0x1ULL << VIRTIO_NET_F_STATUS)) {
+ if (dev->vhost_ops->vhost_set_config_call) {
+ int fd = -1;
+ dev->vhost_ops->vhost_set_config_call(dev, fd);
+ }
+ }
+}
+
+static void vhost_net_start_config_intr(struct vhost_net *net)
+{
+ struct vhost_dev *dev = &net->dev;
+ if (!(dev->features & (0x1ULL << VIRTIO_NET_F_STATUS))) {
+ return;
+ }
+ if (dev->vhost_ops->vhost_set_config_call) {
+ int fd = event_notifier_get_fd(&dev->vdev->config_notifier);
+ int r = dev->vhost_ops->vhost_set_config_call(dev, fd);
+ if (!r) {
+ event_notifier_set(&dev->vdev->config_notifier);
+ }
+ }
+}
int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
int total_queues)
{
@@ -364,6 +389,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
}
}
+ vhost_net_start_config_intr(get_vhost_net(ncs[0].peer));
return 0;
err_start:
@@ -397,6 +423,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", r);
fflush(stderr);
}
+ vhost_net_stop_config_intr(get_vhost_net(ncs[0].peer));
assert(r >= 0);
}
@@ -426,6 +453,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 f50235b5d6..02033be748 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3055,6 +3055,9 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
if (idx != VIRTIO_CONFIG_IRQ_IDX) {
return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
}
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ return vhost_net_config_pending(get_vhost_net(nc->peer), idx);
+ }
return false;
}
@@ -3067,6 +3070,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
if (idx != VIRTIO_CONFIG_IRQ_IDX) {
vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
}
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
+ 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 e2163a0d63..6716109448 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1505,6 +1505,16 @@ 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)
+{
+ assert(hdev->vhost_ops);
+ VirtIODevice *vdev = hdev->vdev;
+ if ((hdev->started == false) ||
+ (hdev->vhost_ops->vhost_set_config_call == NULL)) {
+ return false;
+ }
+ return event_notifier_test_and_clear(&vdev->masked_config_notifier);
+}
/* Mask/unmask events from this vq. */
void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
bool mask)
@@ -1529,6 +1539,30 @@ 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 = &vdev->masked_config_notifier;
+ EventNotifier *config_notifier = &vdev->config_notifier;
+ assert(hdev->vhost_ops);
+
+ if ((hdev->started == false) ||
+ (hdev->vhost_ops->vhost_set_config_call == NULL)) {
+ return ;
+ }
+ 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) {
+ VHOST_OPS_DEBUG("vhost_set_config_call failed");
+ }
+}
uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
uint64_t features)
@@ -1740,6 +1774,14 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
}
}
+ r = event_notifier_init(&vdev->masked_config_notifier, 0);
+ if (r < 0) {
+ return r;
+ }
+ event_notifier_test_and_clear(&vdev->masked_config_notifier);
+ if (!vdev->use_guest_notifier_mask) {
+ vhost_config_mask(hdev, vdev, true);
+ }
if (hdev->log_enabled) {
uint64_t log_base;
@@ -1798,6 +1840,8 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev)
/* should only be called after backend is connected */
assert(hdev->vhost_ops);
+ event_notifier_test_and_clear(&vdev->masked_config_notifier);
+ event_notifier_test_and_clear(&vdev->config_notifier);
if (hdev->vhost_ops->vhost_dev_start) {
hdev->vhost_ops->vhost_dev_start(hdev, false);
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 07f4e60b30..dbd2e36403 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -3504,10 +3504,18 @@ static void virtio_queue_guest_notifier_read(EventNotifier *n)
virtio_irq(vq);
}
}
+static void virtio_config_read(EventNotifier *n)
+{
+ VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
+ 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)
{
+
if (assign && !with_irqfd) {
event_notifier_set_handler(&vq->guest_notifier,
virtio_queue_guest_notifier_read);
@@ -3515,12 +3523,29 @@ void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
event_notifier_set_handler(&vq->guest_notifier, NULL);
}
if (!assign) {
- /* Test and clear notifier before closing it,
- * in case poll callback didn't have time to run. */
+ /* 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);
}
}
+void virtio_set_config_notifier_fd_handler(VirtIODevice *vdev, bool assign,
+ bool with_irqfd)
+{
+ EventNotifier *n;
+ n = &vdev->config_notifier;
+ if (assign && !with_irqfd) {
+ event_notifier_set_handler(n, virtio_config_read);
+ } else {
+ event_notifier_set_handler(n, NULL);
+ }
+ if (!assign) {
+ /* Test and clear notifier before closing it,*/
+ /* in case poll callback didn't have time to run. */
+ virtio_config_read(n);
+ }
+}
+
EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq)
{
return &vq->guest_notifier;
@@ -3594,6 +3619,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..b8814ece32 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -108,6 +108,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 63cb9455ed..3bfd0692a4 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -110,6 +110,8 @@ struct VirtIODevice
bool use_guest_notifier_mask;
AddressSpace *dma_as;
QLIST_HEAD(, VirtQueue) *vector_queues;
+ EventNotifier config_notifier;
+ EventNotifier masked_config_notifier;
};
struct VirtioDeviceClass {
@@ -312,11 +314,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);
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 6/9] virtio-mmio: add support for configure interrupt
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
` (4 preceding siblings ...)
2021-07-06 7:20 ` [PATCH v8 5/9] vhost-net:add support for configure interrupt Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:43 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 7/9] virtio-pci: decouple notifier from interrupt process Cindy Lu
` (2 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
Add configure interrupt support for virtio-mmio bus. This
interrupt will working while backend is vhost-vdpa
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/virtio-mmio.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 342c918ea7..6c786db071 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -670,7 +670,29 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign,
return 0;
}
+static int virtio_mmio_set_config_notifier(DeviceState *d, bool assign)
+{
+ VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d);
+ VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
+ VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
+ EventNotifier *notifier = virtio_get_config_notifier(vdev);
+ int r = 0;
+ if (assign) {
+ r = event_notifier_init(notifier, 0);
+ if (r < 0) {
+ return r;
+ }
+ virtio_set_config_notifier_fd_handler(vdev, true, false);
+ } else {
+ virtio_set_config_notifier_fd_handler(vdev, false, false);
+ event_notifier_cleanup(notifier);
+ }
+ if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) {
+ vdc->guest_notifier_mask(vdev, VIRTIO_CONFIG_IRQ_IDX, !assign);
+ }
+ return r;
+}
static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs,
bool assign)
{
@@ -692,6 +714,10 @@ static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs,
goto assign_error;
}
}
+ r = virtio_mmio_set_config_notifier(d, assign);
+ if (r < 0) {
+ goto assign_error;
+ }
return 0;
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 7/9] virtio-pci: decouple notifier from interrupt process
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
` (5 preceding siblings ...)
2021-07-06 7:20 ` [PATCH v8 6/9] virtio-mmio: add " Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:53 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 8/9] virtio-pci:decouple the single vector from the " Cindy Lu
2021-07-06 7:20 ` [PATCH v8 9/9] virtio-pci: add support for configure interrupt Cindy Lu
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
use the virtio_pci_get_notifier function to
get the notifer, the input of the function
will is the idx, the output is notifier and
vector
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/virtio-pci.c | 45 ++++++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 2fe5b1f5aa..fe06847b62 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -710,6 +710,28 @@ static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy,
ret = kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, irqfd->virq);
assert(ret == 0);
}
+static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy, int queue_no,
+ EventNotifier **n, unsigned int *vector)
+{
+ PCIDevice *dev = &proxy->pci_dev;
+ VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
+ VirtQueue *vq;
+
+ if (queue_no == VIRTIO_CONFIG_IRQ_IDX) {
+ return -1;
+ } else {
+ if (!virtio_queue_get_num(vdev, queue_no)) {
+ return -1;
+ }
+ *vector = virtio_queue_vector(vdev, queue_no);
+ vq = virtio_get_queue(vdev, queue_no);
+ *n = virtio_queue_get_guest_notifier(vq);
+ }
+ if (*vector >= msix_nr_vectors_allocated(dev)) {
+ return -1;
+ }
+ return 0;
+}
static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
{
@@ -718,13 +740,15 @@ 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;
}
- vector = virtio_queue_vector(vdev, queue_no);
+ ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
+ if (ret < 0) {
+ break;
+ }
if (vector >= msix_nr_vectors_allocated(dev)) {
continue;
}
@@ -736,8 +760,6 @@ 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) {
- 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);
@@ -754,8 +776,10 @@ undo:
continue;
}
if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
- vq = virtio_get_queue(vdev, queue_no);
- n = virtio_queue_get_guest_notifier(vq);
+ ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
+ if (ret < 0) {
+ break;
+ }
kvm_virtio_pci_irqfd_release(proxy, n, vector);
}
kvm_virtio_pci_vq_vector_release(proxy, vector);
@@ -770,13 +794,16 @@ 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;
+ int ret ;
for (queue_no = 0; queue_no < nvqs; queue_no++) {
if (!virtio_queue_get_num(vdev, queue_no)) {
break;
}
- vector = virtio_queue_vector(vdev, queue_no);
+ ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
+ if (ret < 0) {
+ break;
+ }
if (vector >= msix_nr_vectors_allocated(dev)) {
continue;
}
@@ -784,8 +811,6 @@ 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) {
- 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);
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 8/9] virtio-pci:decouple the single vector from the interrupt process
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
` (6 preceding siblings ...)
2021-07-06 7:20 ` [PATCH v8 7/9] virtio-pci: decouple notifier from interrupt process Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 5:54 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 9/9] virtio-pci: add support for configure interrupt Cindy Lu
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
use the kvm_virtio_pci_vector_use_one and _release_one
these funtion is to deal with the single vector, the
whole process will finish in a loop with vq number.
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/virtio-pci.c | 109 ++++++++++++++++-------------------------
1 file changed, 42 insertions(+), 67 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index fe06847b62..e43d5760ee 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -666,7 +666,6 @@ static uint32_t virtio_read_config(PCIDevice *pci_dev,
}
static int kvm_virtio_pci_vq_vector_use(VirtIOPCIProxy *proxy,
- unsigned int queue_no,
unsigned int vector)
{
VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];
@@ -733,87 +732,63 @@ static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy, int queue_no,
return 0;
}
-static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
+static int kvm_virtio_pci_vector_use_one(VirtIOPCIProxy *proxy, int queue_no)
{
- PCIDevice *dev = &proxy->pci_dev;
- VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
- VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
unsigned int vector;
- int ret, queue_no;
+ int ret;
EventNotifier *n;
- for (queue_no = 0; queue_no < nvqs; queue_no++) {
- if (!virtio_queue_get_num(vdev, queue_no)) {
- break;
- }
- ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
- if (ret < 0) {
- break;
- }
- if (vector >= msix_nr_vectors_allocated(dev)) {
- continue;
- }
- ret = kvm_virtio_pci_vq_vector_use(proxy, queue_no, vector);
- if (ret < 0) {
- goto undo;
- }
- /* If guest supports masking, set up irqfd now.
- * Otherwise, delay until unmasked in the frontend.
- */
- if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
- ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
- if (ret < 0) {
- kvm_virtio_pci_vq_vector_release(proxy, vector);
- goto undo;
- }
- }
+ ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
+ if (ret < 0) {
+ return ret;
+ }
+ ret = kvm_virtio_pci_vq_vector_use(proxy, vector);
+ if (ret < 0) {
+ goto undo;
+ }
+ ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
+ if (ret < 0) {
+ goto undo;
}
return 0;
-
undo:
- while (--queue_no >= 0) {
- vector = virtio_queue_vector(vdev, queue_no);
- if (vector >= msix_nr_vectors_allocated(dev)) {
- continue;
- }
- if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
- ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
- if (ret < 0) {
- break;
- }
- kvm_virtio_pci_irqfd_release(proxy, n, vector);
- }
- kvm_virtio_pci_vq_vector_release(proxy, vector);
+ kvm_virtio_pci_irqfd_release(proxy, n, vector);
+ return ret;
+}
+static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
+{
+ int queue_no;
+ int ret = 0;
+ for (queue_no = 0; queue_no < nvqs; queue_no++) {
+ ret = kvm_virtio_pci_vector_use_one(proxy, queue_no);
}
return ret;
}
-static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
+
+static void kvm_virtio_pci_vector_release_one(VirtIOPCIProxy *proxy,
+ int queue_no)
{
- PCIDevice *dev = &proxy->pci_dev;
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
unsigned int vector;
- int queue_no;
- VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
EventNotifier *n;
- int ret ;
+ int ret;
+ VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
+ ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
+ if (ret < 0) {
+ return;
+ }
+
+ if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
+ kvm_virtio_pci_irqfd_release(proxy, n, vector);
+ }
+ kvm_virtio_pci_vq_vector_release(proxy, vector);
+}
+static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
+{
+ int queue_no;
+
for (queue_no = 0; queue_no < nvqs; queue_no++) {
- if (!virtio_queue_get_num(vdev, queue_no)) {
- break;
- }
- ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
- if (ret < 0) {
- break;
- }
- if (vector >= msix_nr_vectors_allocated(dev)) {
- continue;
- }
- /* If guest supports masking, clean up irqfd now.
- * 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, n, vector);
- }
- kvm_virtio_pci_vq_vector_release(proxy, vector);
+ kvm_virtio_pci_vector_release_one(proxy, queue_no);
}
}
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v8 9/9] virtio-pci: add support for configure interrupt
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
` (7 preceding siblings ...)
2021-07-06 7:20 ` [PATCH v8 8/9] virtio-pci:decouple the single vector from the " Cindy Lu
@ 2021-07-06 7:20 ` Cindy Lu
2021-07-09 6:03 ` Jason Wang
8 siblings, 1 reply; 19+ messages in thread
From: Cindy Lu @ 2021-07-06 7:20 UTC (permalink / raw)
To: lulu, mst, jasowang, qemu-devel
Add support for configure interrupt, use kvm_irqfd_assign and set the
gsi to kernel. When the configure notifier was eventfd_signal by host
kernel, this will finally inject an msix interrupt to guest
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/virtio/virtio-pci.c | 60 +++++++++++++++++++++++++++++++++++-------
1 file changed, 50 insertions(+), 10 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index e43d5760ee..73b5ffd1b8 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -717,7 +717,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_get_config_notifier(vdev);
+ *vector = vdev->config_vector;
} else {
if (!virtio_queue_get_num(vdev, queue_no)) {
return -1;
@@ -764,6 +765,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)
@@ -792,6 +797,30 @@ 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_set_config_notifier(DeviceState *d, bool assign)
+{
+ VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
+ VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
+ EventNotifier *notifier = virtio_get_config_notifier(vdev);
+ int r = 0;
+ if (assign) {
+ r = event_notifier_init(notifier, 0);
+ if (r < 0) {
+ return r;
+ }
+ virtio_set_config_notifier_fd_handler(vdev, true, true);
+ kvm_virtio_pci_vector_config_use(proxy);
+ } else {
+ virtio_set_config_notifier_fd_handler(vdev, false, true);
+ kvm_virtio_pci_vector_config_release(proxy);
+ event_notifier_cleanup(notifier);
+ }
+ return r;
+}
static int virtio_pci_one_vector_unmask(VirtIOPCIProxy *proxy,
unsigned int queue_no,
unsigned int vector,
@@ -873,7 +902,12 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector,
}
vq = virtio_vector_next_queue(vq);
}
-
+ n = virtio_get_config_notifier(vdev);
+ ret = virtio_pci_one_vector_unmask(proxy, VIRTIO_CONFIG_IRQ_IDX,
+ vector, msg, n);
+ if (ret < 0) {
+ goto undo;
+ }
return 0;
undo:
@@ -909,6 +943,8 @@ static void virtio_pci_vector_mask(PCIDevice *dev, unsigned vector)
}
vq = virtio_vector_next_queue(vq);
}
+ n = virtio_get_config_notifier(vdev);
+ virtio_pci_one_vector_mask(proxy, VIRTIO_CONFIG_IRQ_IDX, vector, n);
}
static void virtio_pci_vector_poll(PCIDevice *dev,
@@ -921,19 +957,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++) {
+ 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);
@@ -1002,6 +1036,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;
}
@@ -1029,6 +1064,10 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign)
goto assign_error;
}
}
+ r = virtio_pci_set_config_notifier(d, assign);
+ if (r < 0) {
+ goto config_error;
+ }
r = msix_set_vector_notifiers(&proxy->pci_dev,
virtio_pci_vector_unmask,
virtio_pci_vector_mask,
@@ -1045,7 +1084,8 @@ notifiers_error:
assert(assign);
kvm_virtio_pci_vector_release(proxy, nvqs);
}
-
+config_error:
+ kvm_virtio_pci_vector_config_release(proxy);
assign_error:
/* We get here on assignment failure. Recover by undoing for VQs 0 .. n. */
assert(assign);
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX
2021-07-06 7:20 ` [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX Cindy Lu
@ 2021-07-09 4:04 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 4:04 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> In order to support configure interrupt for vhost-vdpa
> introduce VIRTIO_CONFIG_IRQ_IDX -1 as a queue index,
> then we can reuse the function guest_notifier_mask and
> guest_notifier_pending.
> we add the check of queue index, if the driver
> is not support configure interrupt, the function will just return
Typo in the subject.
Thanks
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/display/vhost-user-gpu.c | 6 ++++++
> hw/net/virtio-net.c | 10 +++++++---
> hw/virtio/vhost-user-fs.c | 9 +++++++--
> hw/virtio/vhost-vsock-common.c | 6 ++++++
> hw/virtio/virtio-crypto.c | 6 ++++++
> include/hw/virtio/virtio.h | 2 ++
> 6 files changed, 34 insertions(+), 5 deletions(-)
>
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
> index 6cdaa1c73b..c232d55986 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -483,6 +483,9 @@ vhost_user_gpu_guest_notifier_pending(VirtIODevice *vdev, int idx)
> {
> VhostUserGPU *g = VHOST_USER_GPU(vdev);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return false;
> + }
> return vhost_virtqueue_pending(&g->vhost->dev, idx);
> }
>
> @@ -491,6 +494,9 @@ vhost_user_gpu_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask)
> {
> VhostUserGPU *g = VHOST_USER_GPU(vdev);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return;
> + }
> vhost_virtqueue_mask(&g->vhost->dev, vdev, idx, mask);
> }
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 66b9ff4511..f50235b5d6 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -3052,7 +3052,10 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
> VirtIONet *n = VIRTIO_NET(vdev);
> NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx));
> assert(n->vhost_started);
> - return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
> + if (idx != VIRTIO_CONFIG_IRQ_IDX) {
> + return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
> + }
> + return false;
> }
>
> static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
> @@ -3061,8 +3064,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
> VirtIONet *n = VIRTIO_NET(vdev);
> NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx));
> assert(n->vhost_started);
> - vhost_net_virtqueue_mask(get_vhost_net(nc->peer),
> - vdev, idx, mask);
> + if (idx != VIRTIO_CONFIG_IRQ_IDX) {
> + vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
> + }
> }
>
> static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features)
> diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
> index 6f7f91533d..7e8ca25f71 100644
> --- a/hw/virtio/vhost-user-fs.c
> +++ b/hw/virtio/vhost-user-fs.c
> @@ -156,11 +156,13 @@ static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> */
> }
>
> -static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx,
> - bool mask)
> +static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask)
> {
> VHostUserFS *fs = VHOST_USER_FS(vdev);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return;
> + }
> vhost_virtqueue_mask(&fs->vhost_dev, vdev, idx, mask);
> }
>
> @@ -168,6 +170,9 @@ static bool vuf_guest_notifier_pending(VirtIODevice *vdev, int idx)
> {
> VHostUserFS *fs = VHOST_USER_FS(vdev);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return false;
> + }
> return vhost_virtqueue_pending(&fs->vhost_dev, idx);
> }
>
> diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c
> index 4ad6e234ad..2112b44802 100644
> --- a/hw/virtio/vhost-vsock-common.c
> +++ b/hw/virtio/vhost-vsock-common.c
> @@ -101,6 +101,9 @@ static void vhost_vsock_common_guest_notifier_mask(VirtIODevice *vdev, int idx,
> {
> VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return;
> + }
> vhost_virtqueue_mask(&vvc->vhost_dev, vdev, idx, mask);
> }
>
> @@ -109,6 +112,9 @@ static bool vhost_vsock_common_guest_notifier_pending(VirtIODevice *vdev,
> {
> VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return false;
> + }
> return vhost_virtqueue_pending(&vvc->vhost_dev, idx);
> }
>
> diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
> index 54f9bbb789..1d5192f8b4 100644
> --- a/hw/virtio/virtio-crypto.c
> +++ b/hw/virtio/virtio-crypto.c
> @@ -948,6 +948,9 @@ static void virtio_crypto_guest_notifier_mask(VirtIODevice *vdev, int idx,
>
> assert(vcrypto->vhost_started);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return;
> + }
> cryptodev_vhost_virtqueue_mask(vdev, queue, idx, mask);
> }
>
> @@ -958,6 +961,9 @@ static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx)
>
> assert(vcrypto->vhost_started);
>
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return false;
> + }
> return cryptodev_vhost_virtqueue_pending(vdev, queue, idx);
> }
>
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index b7ece7a6a8..63cb9455ed 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -67,6 +67,8 @@ typedef struct VirtQueueElement
>
> #define VIRTIO_NO_VECTOR 0xffff
>
> +#define VIRTIO_CONFIG_IRQ_IDX -1
> +
> #define TYPE_VIRTIO_DEVICE "virtio-device"
> OBJECT_DECLARE_TYPE(VirtIODevice, VirtioDeviceClass, VIRTIO_DEVICE)
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 2/9] virtio-pci:decouple virtqueue from interrupt setting process
2021-07-06 7:20 ` [PATCH v8 2/9] virtio-pci:decouple virtqueue from interrupt setting process Cindy Lu
@ 2021-07-09 5:22 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:22 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> Decouple virtqueue from interrupt setting process to support config interrupt
> Now the code for interrupt/vector are coupling
> with the vq number, this patch will decouple the vritqueue
> numbers from these functions
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 55 ++++++++++++++++++++++++------------------
> 1 file changed, 31 insertions(+), 24 deletions(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index b321604d9b..2fe5b1f5aa 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -693,23 +693,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;
>
> @@ -724,7 +718,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;
> @@ -741,7 +736,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);
I see some similar logic below, let's introduce helper for them.
> + ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
> if (ret < 0) {
> kvm_virtio_pci_vq_vector_release(proxy, vector);
> goto undo;
> @@ -757,7 +754,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);
> }
> @@ -771,7 +770,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;
> @@ -784,21 +784,22 @@ 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);
> }
> }
>
> -static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,
> +static int virtio_pci_one_vector_unmask(VirtIOPCIProxy *proxy,
> unsigned int queue_no,
> unsigned int vector,
> - MSIMessage msg)
> + MSIMessage msg,
> + EventNotifier *n)
> {
> 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;
>
> @@ -825,14 +826,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,
> +static void virtio_pci_one_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);
> @@ -843,7 +845,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);
> }
> }
>
> @@ -853,6 +855,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) {
> @@ -861,7 +864,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_one_vector_unmask(proxy, index, vector, msg, n);
> if (ret < 0) {
> goto undo;
> }
> @@ -877,7 +881,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_one_vector_mask(proxy, index, vector, n);
> --unmasked;
> }
> vq = virtio_vector_next_queue(vq);
> @@ -890,15 +895,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);
Indentation looks odd.
Thanks
> if (!virtio_queue_get_num(vdev, index)) {
> break;
> }
> if (index < proxy->nvqs_with_notifiers) {
> - virtio_pci_vq_vector_mask(proxy, index, vector);
> + virtio_pci_one_vector_mask(proxy, index, vector, n);
> }
> vq = virtio_vector_next_queue(vq);
> }
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 3/9] vhost: add new call back function for config interrupt
2021-07-06 7:20 ` [PATCH v8 3/9] vhost: add new call back function for config interrupt Cindy Lu
@ 2021-07-09 5:23 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:23 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> To support configure interrupt, we need to
> add a new call back function for config interrupt.
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> include/hw/virtio/vhost-backend.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
> index 8a6f8e2a7a..8ade8e0bd2 100644
> --- a/include/hw/virtio/vhost-backend.h
> +++ b/include/hw/virtio/vhost-backend.h
> @@ -125,6 +125,8 @@ typedef int (*vhost_get_device_id_op)(struct vhost_dev *dev, uint32_t *dev_id);
>
> typedef bool (*vhost_force_iommu_op)(struct vhost_dev *dev);
>
> +typedef int (*vhost_set_config_call_op)(struct vhost_dev *dev,
> + int fd);
> typedef struct VhostOps {
> VhostBackendType backend_type;
> vhost_backend_init vhost_backend_init;
> @@ -170,6 +172,7 @@ typedef struct VhostOps {
> vhost_vq_get_addr_op vhost_vq_get_addr;
> vhost_get_device_id_op vhost_get_device_id;
> vhost_force_iommu_op vhost_force_iommu;
> + vhost_set_config_call_op vhost_set_config_call;
> } VhostOps;
>
> extern const VhostOps user_ops;
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 4/9] vhost-vdpa: add support for config interrupt call back
2021-07-06 7:20 ` [PATCH v8 4/9] vhost-vdpa: add support for config interrupt call back Cindy Lu
@ 2021-07-09 5:24 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:24 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> Add new call back function in vhost-vdpa, this call back function only
> supported in vhost-vdpa backend
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> hw/virtio/trace-events | 2 ++
> hw/virtio/vhost-vdpa.c | 7 +++++++
> 2 files changed, 9 insertions(+)
>
> diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
> index c62727f879..152db5917d 100644
> --- a/hw/virtio/trace-events
> +++ b/hw/virtio/trace-events
> @@ -52,6 +52,8 @@ vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p index:
> vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64
> vhost_vdpa_set_owner(void *dev) "dev: %p"
> vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64
> +vhost_vdpa_set_config_call(void *dev, int fd)"dev: %p fd: %d"
> +
>
> # virtio.c
> virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u"
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 01d2101d09..58075da9d9 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -545,6 +545,12 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev,
> trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd);
> return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file);
> }
> +static int vhost_vdpa_set_config_call(struct vhost_dev *dev,
> + int fd)
> +{
> + trace_vhost_vdpa_set_config_call(dev, fd);
> + return vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG_CALL, &fd);
> +}
>
> static int vhost_vdpa_get_features(struct vhost_dev *dev,
> uint64_t *features)
> @@ -611,4 +617,5 @@ const VhostOps vdpa_ops = {
> .vhost_get_device_id = vhost_vdpa_get_device_id,
> .vhost_vq_get_addr = vhost_vdpa_vq_get_addr,
> .vhost_force_iommu = vhost_vdpa_force_iommu,
> + .vhost_set_config_call = vhost_vdpa_set_config_call,
> };
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 5/9] vhost-net:add support for configure interrupt
2021-07-06 7:20 ` [PATCH v8 5/9] vhost-net:add support for configure interrupt Cindy Lu
@ 2021-07-09 5:41 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:41 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> Add configure notifier support in vhost and virtio driver
> When backend support VIRTIO_NET_F_STATUS,setup the configure
> interrupt function in vhost_net_start and release the related
> resource when vhost_net_stop
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/net/vhost_net.c | 36 +++++++++++++++++++++++++++++++
> hw/net/virtio-net.c | 6 ++++++
> hw/virtio/vhost.c | 44 ++++++++++++++++++++++++++++++++++++++
> hw/virtio/virtio.c | 33 ++++++++++++++++++++++++++--
> include/hw/virtio/vhost.h | 2 ++
> include/hw/virtio/virtio.h | 5 +++++
> include/net/vhost_net.h | 3 +++
> 7 files changed, 127 insertions(+), 2 deletions(-)
>
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index 24d555e764..be453717c4 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -310,6 +310,31 @@ static void vhost_net_stop_one(struct vhost_net *net,
> vhost_dev_disable_notifiers(&net->dev, dev);
> }
>
> +static void vhost_net_stop_config_intr(struct vhost_net *net)
> +{
> + struct vhost_dev *dev = &net->dev;
> + if (dev->features & (0x1ULL << VIRTIO_NET_F_STATUS)) {
> + if (dev->vhost_ops->vhost_set_config_call) {
> + int fd = -1;
> + dev->vhost_ops->vhost_set_config_call(dev, fd);
> + }
> + }
> +}
> +
> +static void vhost_net_start_config_intr(struct vhost_net *net)
> +{
> + struct vhost_dev *dev = &net->dev;
> + if (!(dev->features & (0x1ULL << VIRTIO_NET_F_STATUS))) {
> + return;
> + }
Rethink about this, I don't think we need such whitelist. Config
interrupt works like a basic device facility.
> + if (dev->vhost_ops->vhost_set_config_call) {
> + int fd = event_notifier_get_fd(&dev->vdev->config_notifier);
> + int r = dev->vhost_ops->vhost_set_config_call(dev, fd);
> + if (!r) {
> + event_notifier_set(&dev->vdev->config_notifier);
> + }
> + }
> +}
> int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
> int total_queues)
> {
> @@ -364,6 +389,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
> }
> }
>
> + vhost_net_start_config_intr(get_vhost_net(ncs[0].peer));
I think we can reuse vhost_vdpa_dev_start()?
> return 0;
>
> err_start:
> @@ -397,6 +423,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
> fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", r);
> fflush(stderr);
> }
> + vhost_net_stop_config_intr(get_vhost_net(ncs[0].peer));
> assert(r >= 0);
> }
>
> @@ -426,6 +453,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);
> +}
Blank line is needed.
> +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 f50235b5d6..02033be748 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -3055,6 +3055,9 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
> if (idx != VIRTIO_CONFIG_IRQ_IDX) {
> return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
> }
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + return vhost_net_config_pending(get_vhost_net(nc->peer), idx);
I think there's no need to pass idx to vhost_net_config_pending.
> + }
> return false;
> }
>
> @@ -3067,6 +3070,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
> if (idx != VIRTIO_CONFIG_IRQ_IDX) {
> vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
> }
> + if (idx == VIRTIO_CONFIG_IRQ_IDX) {
> + 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 e2163a0d63..6716109448 100644
> --- a/hw/virtio/vhost.c
> +++ b/hw/virtio/vhost.c
> @@ -1505,6 +1505,16 @@ 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)
> +{
> + assert(hdev->vhost_ops);
> + VirtIODevice *vdev = hdev->vdev;
> + if ((hdev->started == false) ||
> + (hdev->vhost_ops->vhost_set_config_call == NULL)) {
> + return false;
> + }
> + return event_notifier_test_and_clear(&vdev->masked_config_notifier);
n is not used.
> +}
> /* Mask/unmask events from this vq. */
> void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
> bool mask)
> @@ -1529,6 +1539,30 @@ 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 = &vdev->masked_config_notifier;
> + EventNotifier *config_notifier = &vdev->config_notifier;
> + assert(hdev->vhost_ops);
> +
> + if ((hdev->started == false) ||
We don't check this in vhost_virtqueue_mask(), any reason for doing this?
> + (hdev->vhost_ops->vhost_set_config_call == NULL)) {
> + return ;
> + }
> + if (mask) {
> + assert(vdev->use_guest_notifier_mask);
> + fd = event_notifier_get_fd(masked_config_notifier);
> + } else {
> + fd = event_notifier_get_fd(config_notifier);
> + }
Please check the indentation above.
> + r = hdev->vhost_ops->vhost_set_config_call(hdev, fd);
> + if (r < 0) {
> + VHOST_OPS_DEBUG("vhost_set_config_call failed");
> + }
> +}
>
> uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
> uint64_t features)
> @@ -1740,6 +1774,14 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
> }
> }
>
> + r = event_notifier_init(&vdev->masked_config_notifier, 0);
> + if (r < 0) {
> + return r;
> + }
> + event_notifier_test_and_clear(&vdev->masked_config_notifier);
This wont' work in the case of multiqueue. And it's kind of layer
violation if you initialize the VirtioDevice stuff in the vhost layer.
Note that the virtqueue mask notifiers is embed in structure
vhost_virtqueue, it means you probably need to embed the
masked_config_notifier to be embed in struct vhost_dev.
And deal with the multiqueue stuffs, (e.g we will only use the notifier
for the first queue pair).
> + if (!vdev->use_guest_notifier_mask) {
> + vhost_config_mask(hdev, vdev, true);
> + }
> if (hdev->log_enabled) {
> uint64_t log_base;
>
> @@ -1798,6 +1840,8 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev)
>
> /* should only be called after backend is connected */
> assert(hdev->vhost_ops);
> + event_notifier_test_and_clear(&vdev->masked_config_notifier);
> + event_notifier_test_and_clear(&vdev->config_notifier);
>
> if (hdev->vhost_ops->vhost_dev_start) {
> hdev->vhost_ops->vhost_dev_start(hdev, false);
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 07f4e60b30..dbd2e36403 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -3504,10 +3504,18 @@ static void virtio_queue_guest_notifier_read(EventNotifier *n)
> virtio_irq(vq);
> }
> }
> +static void virtio_config_read(EventNotifier *n)
> +{
> + VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
>
> + if (event_notifier_test_and_clear(n)) {
> + virtio_notify_config(vdev);
> + }
> +}
This (the changes in virtio.c) need to be done via an separate patch, it
belongs to the abstraction layer of guest notifier.
And we need rename this as virtio_config_guest_notifier_read().
> void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
> bool with_irqfd)
> {
> +
Unnecessary change.
> if (assign && !with_irqfd) {
> event_notifier_set_handler(&vq->guest_notifier,
> virtio_queue_guest_notifier_read);
> @@ -3515,12 +3523,29 @@ void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
> event_notifier_set_handler(&vq->guest_notifier, NULL);
> }
> if (!assign) {
> - /* Test and clear notifier before closing it,
> - * in case poll callback didn't have time to run. */
> + /* Test and clear notifier before closing it,*/
> + /* in case poll callback didn't have time to run. */
Unnecessary changes?
> virtio_queue_guest_notifier_read(&vq->guest_notifier);
> }
> }
>
> +void virtio_set_config_notifier_fd_handler(VirtIODevice *vdev, bool assign,
> + bool with_irqfd)
Let's use "virtio_config_set_guest_notifier_fd_handler()
> +{
> + EventNotifier *n;
> + n = &vdev->config_notifier;
> + if (assign && !with_irqfd) {
> + event_notifier_set_handler(n, virtio_config_read);
> + } else {
> + event_notifier_set_handler(n, NULL);
> + }
> + if (!assign) {
> + /* Test and clear notifier before closing it,*/
> + /* in case poll callback didn't have time to run. */
> + virtio_config_read(n);
> + }
> +}
> +
> EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq)
> {
> return &vq->guest_notifier;
> @@ -3594,6 +3619,10 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq)
> return &vq->host_notifier;
> }
>
> +EventNotifier *virtio_get_config_notifier(VirtIODevice *vdev)
Let's use "virtio_config_get_guest_notifier" to be consistent with the
guest notifier abstraction.
Thanks
> +{
> + 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..b8814ece32 100644
> --- a/include/hw/virtio/vhost.h
> +++ b/include/hw/virtio/vhost.h
> @@ -108,6 +108,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 63cb9455ed..3bfd0692a4 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -110,6 +110,8 @@ struct VirtIODevice
> bool use_guest_notifier_mask;
> AddressSpace *dma_as;
> QLIST_HEAD(, VirtQueue) *vector_queues;
> + EventNotifier config_notifier;
> + EventNotifier masked_config_notifier;
> };
>
> struct VirtioDeviceClass {
> @@ -312,11 +314,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);
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 6/9] virtio-mmio: add support for configure interrupt
2021-07-06 7:20 ` [PATCH v8 6/9] virtio-mmio: add " Cindy Lu
@ 2021-07-09 5:43 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:43 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> Add configure interrupt support for virtio-mmio bus. This
> interrupt will working while backend is vhost-vdpa
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/virtio/virtio-mmio.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
> index 342c918ea7..6c786db071 100644
> --- a/hw/virtio/virtio-mmio.c
> +++ b/hw/virtio/virtio-mmio.c
> @@ -670,7 +670,29 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign,
>
> return 0;
> }
> +static int virtio_mmio_set_config_notifier(DeviceState *d, bool assign)
> +{
We had similar issue as previous patch.
We need use "virtio_mmio_set_config_guest_notifier()."
Thanks
> + VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d);
> + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
> + VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
>
> + EventNotifier *notifier = virtio_get_config_notifier(vdev);
> + int r = 0;
> + if (assign) {
> + r = event_notifier_init(notifier, 0);
> + if (r < 0) {
> + return r;
> + }
> + virtio_set_config_notifier_fd_handler(vdev, true, false);
> + } else {
> + virtio_set_config_notifier_fd_handler(vdev, false, false);
> + event_notifier_cleanup(notifier);
> + }
> + if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) {
> + vdc->guest_notifier_mask(vdev, VIRTIO_CONFIG_IRQ_IDX, !assign);
> + }
> + return r;
> +}
> static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs,
> bool assign)
> {
> @@ -692,6 +714,10 @@ static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs,
> goto assign_error;
> }
> }
> + r = virtio_mmio_set_config_notifier(d, assign);
> + if (r < 0) {
> + goto assign_error;
> + }
>
> return 0;
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 7/9] virtio-pci: decouple notifier from interrupt process
2021-07-06 7:20 ` [PATCH v8 7/9] virtio-pci: decouple notifier from interrupt process Cindy Lu
@ 2021-07-09 5:53 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:53 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> use the virtio_pci_get_notifier function to
> get the notifer, the input of the function
> will is the idx, the output is notifier and
> vector
You need to describe why such decoupling is needed.
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
I think we need move this patch as patch 3.
> ---
> hw/virtio/virtio-pci.c | 45 ++++++++++++++++++++++++++++++++----------
> 1 file changed, 35 insertions(+), 10 deletions(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 2fe5b1f5aa..fe06847b62 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -710,6 +710,28 @@ static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy,
> ret = kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, irqfd->virq);
> assert(ret == 0);
> }
> +static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy, int queue_no,
> + EventNotifier **n, unsigned int *vector)
> +{
> + PCIDevice *dev = &proxy->pci_dev;
> + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
> + VirtQueue *vq;
> +
> + if (queue_no == VIRTIO_CONFIG_IRQ_IDX) {
> + return -1;
> + } else {
> + if (!virtio_queue_get_num(vdev, queue_no)) {
> + return -1;
> + }
> + *vector = virtio_queue_vector(vdev, queue_no);
> + vq = virtio_get_queue(vdev, queue_no);
> + *n = virtio_queue_get_guest_notifier(vq);
> + }
> + if (*vector >= msix_nr_vectors_allocated(dev)) {
> + return -1;
> + }
> + return 0;
> +}
>
> static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
> {
> @@ -718,13 +740,15 @@ 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;
> }
> - vector = virtio_queue_vector(vdev, queue_no);
> + ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> + if (ret < 0) {
> + break;
So this suppresses the check below? (you had a similar check that is
done in virtio_pci_get_notifier).
Thanks
> + }
> if (vector >= msix_nr_vectors_allocated(dev)) {
> continue;
> }
> @@ -736,8 +760,6 @@ 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) {
> - 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);
> @@ -754,8 +776,10 @@ undo:
> continue;
> }
> if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
> - vq = virtio_get_queue(vdev, queue_no);
> - n = virtio_queue_get_guest_notifier(vq);
> + ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> + if (ret < 0) {
> + break;
> + }
> kvm_virtio_pci_irqfd_release(proxy, n, vector);
> }
> kvm_virtio_pci_vq_vector_release(proxy, vector);
> @@ -770,13 +794,16 @@ 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;
> + int ret ;
> for (queue_no = 0; queue_no < nvqs; queue_no++) {
> if (!virtio_queue_get_num(vdev, queue_no)) {
> break;
> }
> - vector = virtio_queue_vector(vdev, queue_no);
> + ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> + if (ret < 0) {
> + break;
> + }
> if (vector >= msix_nr_vectors_allocated(dev)) {
> continue;
> }
> @@ -784,8 +811,6 @@ 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) {
> - 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);
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 8/9] virtio-pci:decouple the single vector from the interrupt process
2021-07-06 7:20 ` [PATCH v8 8/9] virtio-pci:decouple the single vector from the " Cindy Lu
@ 2021-07-09 5:54 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 5:54 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> use the kvm_virtio_pci_vector_use_one and _release_one
> these funtion is to deal with the single vector, the
> whole process will finish in a loop with vq number.
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 109 ++++++++++++++++-------------------------
> 1 file changed, 42 insertions(+), 67 deletions(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index fe06847b62..e43d5760ee 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -666,7 +666,6 @@ static uint32_t virtio_read_config(PCIDevice *pci_dev,
> }
>
> static int kvm_virtio_pci_vq_vector_use(VirtIOPCIProxy *proxy,
> - unsigned int queue_no,
> unsigned int vector)
> {
> VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];
> @@ -733,87 +732,63 @@ static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy, int queue_no,
> return 0;
> }
>
> -static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
> +static int kvm_virtio_pci_vector_use_one(VirtIOPCIProxy *proxy, int queue_no)
> {
> - PCIDevice *dev = &proxy->pci_dev;
> - VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
> - VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
> unsigned int vector;
> - int ret, queue_no;
> + int ret;
> EventNotifier *n;
> - for (queue_no = 0; queue_no < nvqs; queue_no++) {
> - if (!virtio_queue_get_num(vdev, queue_no)) {
> - break;
> - }
So this check is not moved but deleted, is this intentional?
> - ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> - if (ret < 0) {
> - break;
> - }
> - if (vector >= msix_nr_vectors_allocated(dev)) {
> - continue;
> - }
So did this?
> - ret = kvm_virtio_pci_vq_vector_use(proxy, queue_no, vector);
> - if (ret < 0) {
> - goto undo;
> - }
> - /* If guest supports masking, set up irqfd now.
> - * Otherwise, delay until unmasked in the frontend.
> - */
> - if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
> - ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
> - if (ret < 0) {
> - kvm_virtio_pci_vq_vector_release(proxy, vector);
> - goto undo;
> - }
> - }
> + ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> + if (ret < 0) {
> + return ret;
> + }
> + ret = kvm_virtio_pci_vq_vector_use(proxy, vector);
> + if (ret < 0) {
> + goto undo;
> + }
> + ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
> + if (ret < 0) {
> + goto undo;
> }
> return 0;
> -
> undo:
> - while (--queue_no >= 0) {
> - vector = virtio_queue_vector(vdev, queue_no);
> - if (vector >= msix_nr_vectors_allocated(dev)) {
> - continue;
> - }
> - if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
> - ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> - if (ret < 0) {
> - break;
> - }
> - kvm_virtio_pci_irqfd_release(proxy, n, vector);
> - }
> - kvm_virtio_pci_vq_vector_release(proxy, vector);
> + kvm_virtio_pci_irqfd_release(proxy, n, vector);
> + return ret;
> +}
> +static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
> +{
> + int queue_no;
> + int ret = 0;
> + for (queue_no = 0; queue_no < nvqs; queue_no++) {
> + ret = kvm_virtio_pci_vector_use_one(proxy, queue_no);
> }
> return ret;
> }
>
> -static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
> +
> +static void kvm_virtio_pci_vector_release_one(VirtIOPCIProxy *proxy,
> + int queue_no)
> {
> - PCIDevice *dev = &proxy->pci_dev;
> VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
> unsigned int vector;
> - int queue_no;
> - VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
> EventNotifier *n;
> - int ret ;
> + int ret;
> + VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
> + ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> + if (ret < 0) {
> + return;
> + }
> +
> + if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
> + kvm_virtio_pci_irqfd_release(proxy, n, vector);
> + }
> + kvm_virtio_pci_vq_vector_release(proxy, vector);
> +}
> +static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
> +{
> + int queue_no;
> +
> for (queue_no = 0; queue_no < nvqs; queue_no++) {
> - if (!virtio_queue_get_num(vdev, queue_no)) {
> - break;
> - }
This is deleted by not removed.
> - ret = virtio_pci_get_notifier(proxy, queue_no, &n, &vector);
> - if (ret < 0) {
> - break;
> - }
> - if (vector >= msix_nr_vectors_allocated(dev)) {
> - continue;
> - }
So did this.
Thanks
> - /* If guest supports masking, clean up irqfd now.
> - * 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, n, vector);
> - }
> - kvm_virtio_pci_vq_vector_release(proxy, vector);
> + kvm_virtio_pci_vector_release_one(proxy, queue_no);
> }
> }
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v8 9/9] virtio-pci: add support for configure interrupt
2021-07-06 7:20 ` [PATCH v8 9/9] virtio-pci: add support for configure interrupt Cindy Lu
@ 2021-07-09 6:03 ` Jason Wang
0 siblings, 0 replies; 19+ messages in thread
From: Jason Wang @ 2021-07-09 6:03 UTC (permalink / raw)
To: Cindy Lu, mst, qemu-devel
在 2021/7/6 下午3:20, Cindy Lu 写道:
> Add support for configure interrupt, use kvm_irqfd_assign and set the
> gsi to kernel. When the configure notifier was eventfd_signal by host
> kernel, this will finally inject an msix interrupt to guest
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 60 +++++++++++++++++++++++++++++++++++-------
> 1 file changed, 50 insertions(+), 10 deletions(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e43d5760ee..73b5ffd1b8 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -717,7 +717,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_get_config_notifier(vdev);
> + *vector = vdev->config_vector;
Is there a case that the vector is not vdev->config_vector? If not, we
probably don't need this.
> } else {
> if (!virtio_queue_get_num(vdev, queue_no)) {
> return -1;
> @@ -764,6 +765,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)
> @@ -792,6 +797,30 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
> }
> }
>
> +static void kvm_virtio_pci_vector_config_release(VirtIOPCIProxy *proxy)
"kvm_virtio_pci_config_vector_relase" please, consider we've already had:
kvm_virtio_pci_vq_vector_release().
Thanks
> +{
> + kvm_virtio_pci_vector_release_one(proxy, VIRTIO_CONFIG_IRQ_IDX);
> +}
Blank line is needed.
> +static int virtio_pci_set_config_notifier(DeviceState *d, bool assign)
> +{
> + VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d);
> + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
> + EventNotifier *notifier = virtio_get_config_notifier(vdev);
> + int r = 0;
> + if (assign) {
> + r = event_notifier_init(notifier, 0);
> + if (r < 0) {
> + return r;
> + }
> + virtio_set_config_notifier_fd_handler(vdev, true, true);
> + kvm_virtio_pci_vector_config_use(proxy);
> + } else {
> + virtio_set_config_notifier_fd_handler(vdev, false, true);
> + kvm_virtio_pci_vector_config_release(proxy);
> + event_notifier_cleanup(notifier);
> + }
We check MSIX in virtio_pci_set_guest_notifier but not here, any reason
for this?
And I think we need consider to reuse the code in
virtio_pci_set_guest_notifier().
> + return r;
> +}
> static int virtio_pci_one_vector_unmask(VirtIOPCIProxy *proxy,
> unsigned int queue_no,
> unsigned int vector,
> @@ -873,7 +902,12 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector,
> }
> vq = virtio_vector_next_queue(vq);
> }
> -
> + n = virtio_get_config_notifier(vdev);
> + ret = virtio_pci_one_vector_unmask(proxy, VIRTIO_CONFIG_IRQ_IDX,
> + vector, msg, n);
> + if (ret < 0) {
> + goto undo;
> + }
> return 0;
>
> undo:
> @@ -909,6 +943,8 @@ static void virtio_pci_vector_mask(PCIDevice *dev, unsigned vector)
> }
> vq = virtio_vector_next_queue(vq);
> }
> + n = virtio_get_config_notifier(vdev);
> + virtio_pci_one_vector_mask(proxy, VIRTIO_CONFIG_IRQ_IDX, vector, n);
> }
>
> static void virtio_pci_vector_poll(PCIDevice *dev,
> @@ -921,19 +957,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++) {
> + 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);
> @@ -1002,6 +1036,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;
> }
> @@ -1029,6 +1064,10 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign)
> goto assign_error;
> }
> }
> + r = virtio_pci_set_config_notifier(d, assign);
> + if (r < 0) {
> + goto config_error;
> + }
> r = msix_set_vector_notifiers(&proxy->pci_dev,
> virtio_pci_vector_unmask,
> virtio_pci_vector_mask,
> @@ -1045,7 +1084,8 @@ notifiers_error:
> assert(assign);
> kvm_virtio_pci_vector_release(proxy, nvqs);
> }
> -
> +config_error:
> + kvm_virtio_pci_vector_config_release(proxy);
> assign_error:
> /* We get here on assignment failure. Recover by undoing for VQs 0 .. n. */
> assert(assign);
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2021-07-09 6:04 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 7:20 [PATCH v8 0/9] vhost-vdpa: add support for configure interrupt Cindy Lu
2021-07-06 7:20 ` [PATCH v8 1/9] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX Cindy Lu
2021-07-09 4:04 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 2/9] virtio-pci:decouple virtqueue from interrupt setting process Cindy Lu
2021-07-09 5:22 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 3/9] vhost: add new call back function for config interrupt Cindy Lu
2021-07-09 5:23 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 4/9] vhost-vdpa: add support for config interrupt call back Cindy Lu
2021-07-09 5:24 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 5/9] vhost-net:add support for configure interrupt Cindy Lu
2021-07-09 5:41 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 6/9] virtio-mmio: add " Cindy Lu
2021-07-09 5:43 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 7/9] virtio-pci: decouple notifier from interrupt process Cindy Lu
2021-07-09 5:53 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 8/9] virtio-pci:decouple the single vector from the " Cindy Lu
2021-07-09 5:54 ` Jason Wang
2021-07-06 7:20 ` [PATCH v8 9/9] virtio-pci: add support for configure interrupt Cindy Lu
2021-07-09 6:03 ` Jason Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.