openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virtio-pci: decouple notifier from interrupt process 

To reuse the notifier process in configure interrupt.
Use the virtio_pci_get_notifier function to get the notifier.
the INPUT of this function is the IDX, the OUTPUT is notifier and
the vector

Signed-off-by: Cindy Lu <lulu@redhat.com>
Message-Id: <20211104164827.21911-3-lulu@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Cindy Lu 2021-11-05 00:48:19 +08:00 committed by Michael S. Tsirkin
parent bf1d85c166
commit e3480ef81f
1 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
hw/virtio/virtio-pci.c
View File

@ -704,29 +704,41 @@ static void kvm_virtio_pci_vq_vector_release(VirtIOPCIProxy *proxy,
} }
static int kvm_virtio_pci_irqfd_use(VirtIOPCIProxy *proxy, static int kvm_virtio_pci_irqfd_use(VirtIOPCIProxy *proxy,
unsigned int queue_no, EventNotifier *n,
unsigned int vector) unsigned int vector)
{ {
VirtIOIRQFD *irqfd = &proxy->vector_irqfd[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); return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, irqfd->virq);
} }
static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy, static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy,
unsigned int queue_no, EventNotifier *n ,
unsigned int vector) 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]; VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector];
int ret; int ret;
ret = kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, irqfd->virq); ret = kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, irqfd->virq);
assert(ret == 0); assert(ret == 0);
} }
static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy, int queue_no,
EventNotifier **n, unsigned int *vector)
{
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);
}
return 0;
}
static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs) static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
{ {
@ -735,12 +747,15 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
unsigned int vector; unsigned int vector;
int ret, queue_no; int ret, queue_no;
EventNotifier *n;
for (queue_no = 0; queue_no < nvqs; queue_no++) { for (queue_no = 0; queue_no < nvqs; queue_no++) {
if (!virtio_queue_get_num(vdev, queue_no)) { if (!virtio_queue_get_num(vdev, queue_no)) {
break; 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)) { if (vector >= msix_nr_vectors_allocated(dev)) {
continue; continue;
} }
@ -752,7 +767,7 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs)
* Otherwise, delay until unmasked in the frontend. * Otherwise, delay until unmasked in the frontend.
*/ */
if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
ret = kvm_virtio_pci_irqfd_use(proxy, queue_no, vector); ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
if (ret < 0) { if (ret < 0) {
kvm_virtio_pci_vq_vector_release(proxy, vector); kvm_virtio_pci_vq_vector_release(proxy, vector);
goto undo; goto undo;
@ -768,7 +783,11 @@ undo:
continue; continue;
} }
if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); 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_vq_vector_release(proxy, vector);
} }
@ -782,12 +801,16 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
unsigned int vector; unsigned int vector;
int queue_no; int queue_no;
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
EventNotifier *n;
int ret ;
for (queue_no = 0; queue_no < nvqs; queue_no++) { for (queue_no = 0; queue_no < nvqs; queue_no++) {
if (!virtio_queue_get_num(vdev, queue_no)) { if (!virtio_queue_get_num(vdev, queue_no)) {
break; 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)) { if (vector >= msix_nr_vectors_allocated(dev)) {
continue; continue;
} }
@ -795,21 +818,20 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs)
* Otherwise, it was cleaned when masked in the frontend. * Otherwise, it was cleaned when masked in the frontend.
*/ */
if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); kvm_virtio_pci_irqfd_release(proxy, n, vector);
} }
kvm_virtio_pci_vq_vector_release(proxy, 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 queue_no,
unsigned int vector, unsigned int vector,
MSIMessage msg) MSIMessage msg,
EventNotifier *n)
{ {
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); 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; VirtIOIRQFD *irqfd;
int ret = 0; int ret = 0;
@ -836,14 +858,15 @@ static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,
event_notifier_set(n); event_notifier_set(n);
} }
} else { } else {
ret = kvm_virtio_pci_irqfd_use(proxy, queue_no, vector); ret = kvm_virtio_pci_irqfd_use(proxy, n, vector);
} }
return ret; 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 queue_no,
unsigned int vector) unsigned int vector,
EventNotifier *n)
{ {
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
@ -854,7 +877,7 @@ static void virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy,
if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) {
k->guest_notifier_mask(vdev, queue_no, true); k->guest_notifier_mask(vdev, queue_no, true);
} else { } else {
kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); kvm_virtio_pci_irqfd_release(proxy, n, vector);
} }
} }
@ -864,6 +887,7 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector,
VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev); VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev);
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
VirtQueue *vq = virtio_vector_first_queue(vdev, vector); VirtQueue *vq = virtio_vector_first_queue(vdev, vector);
EventNotifier *n;
int ret, index, unmasked = 0; int ret, index, unmasked = 0;
while (vq) { while (vq) {
@ -872,7 +896,8 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector,
break; break;
} }
if (index < proxy->nvqs_with_notifiers) { 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) { if (ret < 0) {
goto undo; goto undo;
} }
@ -888,7 +913,8 @@ undo:
while (vq && unmasked >= 0) { while (vq && unmasked >= 0) {
index = virtio_get_queue_index(vq); index = virtio_get_queue_index(vq);
if (index < proxy->nvqs_with_notifiers) { 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; --unmasked;
} }
vq = virtio_vector_next_queue(vq); vq = virtio_vector_next_queue(vq);
@ -901,15 +927,17 @@ static void virtio_pci_vector_mask(PCIDevice *dev, unsigned vector)
VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev); VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev);
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
VirtQueue *vq = virtio_vector_first_queue(vdev, vector); VirtQueue *vq = virtio_vector_first_queue(vdev, vector);
EventNotifier *n;
int index; int index;
while (vq) { while (vq) {
index = virtio_get_queue_index(vq); index = virtio_get_queue_index(vq);
n = virtio_queue_get_guest_notifier(vq);
if (!virtio_queue_get_num(vdev, index)) { if (!virtio_queue_get_num(vdev, index)) {
break; break;
} }
if (index < proxy->nvqs_with_notifiers) { 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); vq = virtio_vector_next_queue(vq);
} }
@ -925,19 +953,17 @@ static void virtio_pci_vector_poll(PCIDevice *dev,
int queue_no; int queue_no;
unsigned int vector; unsigned int vector;
EventNotifier *notifier; EventNotifier *notifier;
VirtQueue *vq; int ret;
for (queue_no = 0; queue_no < proxy->nvqs_with_notifiers; queue_no++) { for (queue_no = 0; queue_no < proxy->nvqs_with_notifiers; queue_no++) {
if (!virtio_queue_get_num(vdev, queue_no)) { ret = virtio_pci_get_notifier(proxy, queue_no, &notifier, &vector);
if (ret < 0) {
break; break;
} }
vector = virtio_queue_vector(vdev, queue_no);
if (vector < vector_start || vector >= vector_end || if (vector < vector_start || vector >= vector_end ||
!msix_is_masked(dev, vector)) { !msix_is_masked(dev, vector)) {
continue; 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) {
if (k->guest_notifier_pending(vdev, queue_no)) { if (k->guest_notifier_pending(vdev, queue_no)) {
msix_set_pending(dev, vector); msix_set_pending(dev, vector);