From: Jason Wang <jasowang@redhat.com>
To: Cindy Lu <lulu@redhat.com>, mst@redhat.com, qemu-devel@nongnu.org
Subject: Re: [PATCH v7 03/10] virtio: decouple virtqueue from set notifier fd handler
Date: Thu, 3 Jun 2021 14:01:35 +0800 [thread overview]
Message-ID: <1e90824a-297b-a3f2-c34b-1230ffbc386b@redhat.com> (raw)
In-Reply-To: <20210602034750.23377-4-lulu@redhat.com>
在 2021/6/2 上午11:47, Cindy Lu 写道:
> To support config interrupt.we need to decouple virtqueue number
s/we/ We/
> from virtio_queue_set_guest_notifier_fd_handler,
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
> hw/s390x/virtio-ccw.c | 6 +++---
> hw/virtio/virtio-mmio.c | 4 ++--
> hw/virtio/virtio-pci.c | 4 ++--
> hw/virtio/virtio.c | 17 +++++++++++------
> include/hw/virtio/virtio.h | 2 +-
> 5 files changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 8195f3546e..58bb5232fd 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1028,11 +1028,11 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n,
> if (r < 0) {
> return r;
> }
> - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd);
> + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd);
> if (with_irqfd) {
> r = virtio_ccw_add_irqfd(dev, n);
> if (r) {
> - virtio_queue_set_guest_notifier_fd_handler(vq, false,
> + virtio_set_notifier_fd_handler(vdev, n, false,
> with_irqfd);
> return r;
> }
> @@ -1056,7 +1056,7 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n,
> if (with_irqfd) {
> virtio_ccw_remove_irqfd(dev, n);
> }
> - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd);
> + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd);
> event_notifier_cleanup(notifier);
> }
> return 0;
> diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
> index 342c918ea7..13772d52bb 100644
> --- a/hw/virtio/virtio-mmio.c
> +++ b/hw/virtio/virtio-mmio.c
> @@ -658,9 +658,9 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign,
> if (r < 0) {
> return r;
> }
> - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd);
> + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd);
> } else {
> - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd);
> + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd);
> event_notifier_cleanup(notifier);
> }
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index c5c080ec94..6a4ef413a4 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -958,9 +958,9 @@ static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign,
> if (r < 0) {
> return r;
> }
> - virtio_queue_set_guest_notifier_fd_handler(vq, true, with_irqfd);
> + virtio_set_notifier_fd_handler(vdev, n, true, with_irqfd);
> } else {
> - virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd);
> + virtio_set_notifier_fd_handler(vdev, n, false, with_irqfd);
> event_notifier_cleanup(notifier);
> }
>
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 07f4e60b30..c5d786bb5e 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -3505,19 +3505,24 @@ static void virtio_queue_guest_notifier_read(EventNotifier *n)
> }
> }
>
> -void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
> - bool with_irqfd)
> +
> +void virtio_set_notifier_fd_handler(VirtIODevice *vdev, int queue_no,
> + bool assign, bool with_irqfd)
Let's use "virtio_set_guest_notifier_fd_handler()".
> {
> + EventNotifier *e ;
> + EventNotifierHandler *handler;
> + VirtQueue *vq = virtio_get_queue(vdev, queue_no);
> + e = &vq->guest_notifier;
So you still depends on the vq implicitly.
How about keep virtio_queue_set_guest_notifier_fd_handler() and factor
its core logic to
virtio_set_guest_notifier_fd_handler() by passing the EventNotifier to
this new helper?
> + handler = virtio_queue_guest_notifier_read;
> if (assign && !with_irqfd) {
> - event_notifier_set_handler(&vq->guest_notifier,
> - virtio_queue_guest_notifier_read);
> + event_notifier_set_handler(e, handler);
> } else {
> - event_notifier_set_handler(&vq->guest_notifier, NULL);
> + event_notifier_set_handler(e, NULL);
> }
> if (!assign) {
> /* 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);
> + handler(e);
Any reason for this change?
Thanks
> }
> }
>
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index 63cb9455ed..447899dea5 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -310,7 +310,7 @@ void virtio_queue_update_used_idx(VirtIODevice *vdev, int n);
> VirtQueue *virtio_get_queue(VirtIODevice *vdev, int n);
> 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,
> +void virtio_set_notifier_fd_handler(VirtIODevice *vdev, int n, bool assign,
> bool with_irqfd);
> int virtio_device_start_ioeventfd(VirtIODevice *vdev);
> int virtio_device_grab_ioeventfd(VirtIODevice *vdev);
next prev parent reply other threads:[~2021-06-03 6:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 3:47 [PATCH v7 00/10] vhost-vdpa: add support for configure interrupt Cindy Lu
2021-06-02 3:47 ` [PATCH v7 01/10] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX 聽 Cindy Lu
2021-06-02 3:47 ` [PATCH v7 02/10] virtio-pci:decouple virtqueue from interrupt setting process Cindy Lu
2021-06-03 5:51 ` Jason Wang
2021-06-02 3:47 ` [PATCH v7 03/10] virtio: decouple virtqueue from set notifier fd handler Cindy Lu
2021-06-03 6:01 ` Jason Wang [this message]
2021-06-02 3:47 ` [PATCH v7 04/10] vhost: add new call back function for config interrupt Cindy Lu
2021-06-03 6:04 ` Jason Wang
2021-06-02 3:47 ` [PATCH v7 05/10] vhost-vdpa: add support for config interrupt call back Cindy Lu
2021-06-03 6:06 ` Jason Wang
2021-06-07 6:34 ` Cindy Lu
2021-06-02 3:47 ` [PATCH v7 06/10] vhost:add support for configure interrupt Cindy Lu
2021-06-03 6:28 ` Jason Wang
2021-06-08 3:20 ` Cindy Lu
2021-06-02 3:47 ` [PATCH v7 07/10] virtio-mmio: add " Cindy Lu
2021-06-03 6:35 ` Jason Wang
2021-06-07 6:35 ` Cindy Lu
2021-06-02 3:47 ` [PATCH v7 08/10] virtio-pci: decouple virtqueue from kvm_virtio_pci_vector_use Cindy Lu
2021-06-03 6:39 ` Jason Wang
2021-06-07 6:36 ` Cindy Lu
2021-06-02 3:47 ` [PATCH v7 09/10] virtio-pci: add support for configure interrupt Cindy Lu
2021-06-03 6:45 ` Jason Wang
2021-06-07 6:44 ` Cindy Lu
2021-06-02 3:47 ` [PATCH v7 10/10] virtio-net: add peer_deleted check in virtio_net_handle_rx Cindy Lu
2021-06-03 6:58 ` Jason Wang
2021-06-07 6:20 ` Cindy Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1e90824a-297b-a3f2-c34b-1230ffbc386b@redhat.com \
--to=jasowang@redhat.com \
--cc=lulu@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).