From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Lars Ganrot <lars.ganrot@gmail.com>,
virtualization@lists.linux-foundation.org,
Salil Mehta <mehta.salil.lnk@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Liran Alon <liralon@gmail.com>,
Rob Miller <rob.miller@broadcom.com>,
Max Gurtovoy <maxgu14@gmail.com>,
Alex Barba <alex.barba@broadcom.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Jim Harford <jim.harford@broadcom.com>,
Jason Wang <jasowang@redhat.com>,
Harpreet Singh Anand <hanand@xilinx.com>,
Christophe Fontaine <cfontain@redhat.com>,
vm <vmireyno@marvell.com>, Daniel Daly <dandaly0@gmail.com>,
Michael Lilja <ml@napatech.com>,
Stefano Garzarella <sgarzare@redhat.com>,
Nitin Shrivastav <nitin.shrivastav@broadcom.com>,
Lee Ballard <ballle98@gmail.com>,
Dmytro Kazantsev <dmytro.kazantsev@gmail.com>,
Juan Quintela <quintela@redhat.com>,
kvm@vger.kernel.org, Howard Cai <howard.cai@gmail.com>,
Xiao W Wang <xiao.w.wang@intel.com>,
Sean Mooney <smooney@redhat.com>,
Parav Pandit <parav@mellanox.com>, Eli Cohen <eli@mellanox.com>,
Siwei Liu <loseweigh@gmail.com>,
Stephen Finucane <stephenfin@redhat.com>
Subject: [RFC PATCH 05/27] vhost: Add hdev->dev.sw_lm_vq_handler
Date: Fri, 20 Nov 2020 19:50:43 +0100 [thread overview]
Message-ID: <20201120185105.279030-6-eperezma@redhat.com> (raw)
In-Reply-To: <20201120185105.279030-1-eperezma@redhat.com>
Only virtio-net honors it.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
include/hw/virtio/vhost.h | 1 +
hw/net/virtio-net.c | 39 ++++++++++++++++++++++++++++-----------
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 4a8bc75415..b5b7496537 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -83,6 +83,7 @@ struct vhost_dev {
bool started;
bool log_enabled;
uint64_t log_size;
+ VirtIOHandleOutput sw_lm_vq_handler;
Error *migration_blocker;
const VhostOps *vhost_ops;
void *opaque;
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 9179013ac4..9a69ae3598 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -2628,24 +2628,32 @@ static void virtio_net_tx_bh(void *opaque)
}
}
-static void virtio_net_add_queue(VirtIONet *n, int index)
+static void virtio_net_add_queue(VirtIONet *n, int index,
+ VirtIOHandleOutput custom_handler)
{
VirtIODevice *vdev = VIRTIO_DEVICE(n);
+ VirtIOHandleOutput rx_vq_handler = virtio_net_handle_rx;
+ VirtIOHandleOutput tx_vq_handler;
+ bool tx_timer = n->net_conf.tx && !strcmp(n->net_conf.tx, "timer");
+
+ if (custom_handler) {
+ rx_vq_handler = tx_vq_handler = custom_handler;
+ } else if (tx_timer) {
+ tx_vq_handler = virtio_net_handle_tx_timer;
+ } else {
+ tx_vq_handler = virtio_net_handle_tx_bh;
+ }
n->vqs[index].rx_vq = virtio_add_queue(vdev, n->net_conf.rx_queue_size,
- virtio_net_handle_rx);
+ rx_vq_handler);
+ n->vqs[index].tx_vq = virtio_add_queue(vdev, n->net_conf.tx_queue_size,
+ tx_vq_handler);
- if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
- n->vqs[index].tx_vq =
- virtio_add_queue(vdev, n->net_conf.tx_queue_size,
- virtio_net_handle_tx_timer);
+ if (tx_timer) {
n->vqs[index].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
virtio_net_tx_timer,
&n->vqs[index]);
} else {
- n->vqs[index].tx_vq =
- virtio_add_queue(vdev, n->net_conf.tx_queue_size,
- virtio_net_handle_tx_bh);
n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
}
@@ -2677,6 +2685,10 @@ static void virtio_net_del_queue(VirtIONet *n, int index)
static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
{
VirtIODevice *vdev = VIRTIO_DEVICE(n);
+ NetClientState *nc = n->nic->conf->peers.ncs[0];
+ struct vhost_net *hdev = get_vhost_net(nc);
+ VirtIOHandleOutput custom_handler = hdev ? hdev->dev.sw_lm_vq_handler
+ : NULL;
int old_num_queues = virtio_get_num_queues(vdev);
int new_num_queues = new_max_queues * 2 + 1;
int i;
@@ -2702,7 +2714,7 @@ static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
for (i = old_num_queues - 1; i < new_num_queues - 1; i += 2) {
/* new_num_queues > old_num_queues */
- virtio_net_add_queue(n, i / 2);
+ virtio_net_add_queue(n, i / 2, custom_handler);
}
/* add ctrl_vq last */
@@ -3256,6 +3268,8 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIONet *n = VIRTIO_NET(dev);
NetClientState *nc;
+ struct vhost_net *hdev;
+ VirtIOHandleOutput custom_handler;
int i;
if (n->net_conf.mtu) {
@@ -3347,8 +3361,11 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
n->net_conf.tx_queue_size = MIN(virtio_net_max_tx_queue_size(n),
n->net_conf.tx_queue_size);
+ nc = n->nic_conf.peers.ncs[0];
+ hdev = get_vhost_net(nc);
+ custom_handler = hdev ? hdev->dev.sw_lm_vq_handler : NULL;
for (i = 0; i < n->max_queues; i++) {
- virtio_net_add_queue(n, i);
+ virtio_net_add_queue(n, i, custom_handler);
}
n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
--
2.18.4
next prev parent reply other threads:[~2020-11-20 18:52 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 18:50 [RFC PATCH 00/27] vDPA software assisted live migration Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 01/27] vhost: Add vhost_dev_can_log Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 02/27] vhost: Add device callback in vhost_migration_log Eugenio Pérez
2020-12-07 16:19 ` Stefan Hajnoczi
2020-12-09 12:20 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 03/27] vhost: Move log resize/put to vhost_dev_set_log Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 04/27] vhost: add vhost_kernel_set_vring_enable Eugenio Pérez
2020-12-07 16:43 ` Stefan Hajnoczi
2020-12-09 12:00 ` Eugenio Perez Martin
2020-12-09 16:08 ` Stefan Hajnoczi
2020-11-20 18:50 ` Eugenio Pérez [this message]
2020-12-07 16:52 ` [RFC PATCH 05/27] vhost: Add hdev->dev.sw_lm_vq_handler Stefan Hajnoczi
2020-12-09 15:02 ` Eugenio Perez Martin
2020-12-10 11:30 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 06/27] virtio: Add virtio_queue_get_used_notify_split Eugenio Pérez
2020-12-07 16:58 ` Stefan Hajnoczi
2021-01-12 18:21 ` Eugenio Perez Martin
2021-03-02 11:22 ` Stefan Hajnoczi
2021-03-02 18:34 ` Eugenio Perez Martin
2021-03-08 10:46 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 07/27] vhost: Route guest->host notification through qemu Eugenio Pérez
2020-12-07 17:42 ` Stefan Hajnoczi
2020-12-09 17:08 ` Eugenio Perez Martin
2020-12-10 11:50 ` Stefan Hajnoczi
2021-01-21 20:10 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 08/27] vhost: Add a flag for software assisted Live Migration Eugenio Pérez
2020-12-08 7:20 ` Stefan Hajnoczi
2020-12-09 17:57 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 09/27] vhost: Route host->guest notification through qemu Eugenio Pérez
2020-12-08 7:34 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 10/27] vhost: Allocate shadow vring Eugenio Pérez
2020-12-08 7:49 ` Stefan Hajnoczi
2020-12-08 8:17 ` Stefan Hajnoczi
2020-12-09 18:15 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 11/27] virtio: const-ify all virtio_tswap* functions Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 12/27] virtio: Add virtio_queue_full Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 13/27] vhost: Send buffers to device Eugenio Pérez
2020-12-08 8:16 ` Stefan Hajnoczi
2020-12-09 18:41 ` Eugenio Perez Martin
2020-12-10 11:55 ` Stefan Hajnoczi
2021-01-22 18:18 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 14/27] virtio: Remove virtio_queue_get_used_notify_split Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 15/27] vhost: Do not invalidate signalled used Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 16/27] virtio: Expose virtqueue_alloc_element Eugenio Pérez
2020-12-08 8:25 ` Stefan Hajnoczi
2020-12-09 18:46 ` Eugenio Perez Martin
2020-12-10 11:57 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 17/27] vhost: add vhost_vring_set_notification_rcu Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 18/27] vhost: add vhost_vring_poll_rcu Eugenio Pérez
2020-12-08 8:41 ` Stefan Hajnoczi
2020-12-09 18:48 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 19/27] vhost: add vhost_vring_get_buf_rcu Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 20/27] vhost: Return used buffers Eugenio Pérez
2020-12-08 8:50 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 21/27] vhost: Add vhost_virtqueue_memory_unmap Eugenio Pérez
2020-11-20 18:51 ` [RFC PATCH 22/27] vhost: Add vhost_virtqueue_memory_map Eugenio Pérez
2020-11-20 18:51 ` [RFC PATCH 23/27] vhost: unmap qemu's shadow virtqueues on sw live migration Eugenio Pérez
2020-11-27 15:29 ` Stefano Garzarella
2020-11-30 7:54 ` Eugenio Perez Martin
2020-11-20 18:51 ` [RFC PATCH 24/27] vhost: iommu changes Eugenio Pérez
2020-12-08 9:02 ` Stefan Hajnoczi
2020-11-20 18:51 ` [RFC PATCH 25/27] vhost: Do not commit vhost used idx on vhost_virtqueue_stop Eugenio Pérez
2020-11-20 19:35 ` Eugenio Perez Martin
2020-11-20 18:51 ` [RFC PATCH 26/27] vhost: Add vhost_hdev_can_sw_lm Eugenio Pérez
2020-11-20 18:51 ` [RFC PATCH 27/27] vhost: forbid vhost devices logging Eugenio Pérez
2020-11-20 19:03 ` [RFC PATCH 00/27] vDPA software assisted live migration Eugenio Perez Martin
2020-11-20 19:30 ` no-reply
2020-11-25 7:08 ` Jason Wang
2020-11-25 12:03 ` Eugenio Perez Martin
2020-11-25 12:14 ` Eugenio Perez Martin
2020-11-26 3:07 ` Jason Wang
2020-11-27 15:44 ` Stefano Garzarella
2020-12-08 9:37 ` Stefan Hajnoczi
2020-12-09 9:26 ` Jason Wang
2020-12-09 15:57 ` Stefan Hajnoczi
2020-12-10 9:12 ` Jason Wang
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=20201120185105.279030-6-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=alex.barba@broadcom.com \
--cc=ballle98@gmail.com \
--cc=cfontain@redhat.com \
--cc=dandaly0@gmail.com \
--cc=dmytro.kazantsev@gmail.com \
--cc=eli@mellanox.com \
--cc=hanand@xilinx.com \
--cc=howard.cai@gmail.com \
--cc=jasowang@redhat.com \
--cc=jim.harford@broadcom.com \
--cc=kvm@vger.kernel.org \
--cc=lars.ganrot@gmail.com \
--cc=liralon@gmail.com \
--cc=loseweigh@gmail.com \
--cc=maxgu14@gmail.com \
--cc=mehta.salil.lnk@gmail.com \
--cc=ml@napatech.com \
--cc=mst@redhat.com \
--cc=nitin.shrivastav@broadcom.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rob.miller@broadcom.com \
--cc=sgarzare@redhat.com \
--cc=smooney@redhat.com \
--cc=stefanha@redhat.com \
--cc=stephenfin@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vmireyno@marvell.com \
--cc=xiao.w.wang@intel.com \
/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).