From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Parav Pandit <parav@mellanox.com>,
Juan Quintela <quintela@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
virtualization@lists.linux-foundation.org,
Harpreet Singh Anand <hanand@xilinx.com>,
Xiao W Wang <xiao.w.wang@intel.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Eli Cohen <eli@mellanox.com>, Eric Blake <eblake@redhat.com>,
Michael Lilja <ml@napatech.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [RFC PATCH v4 02/20] virtio-net: Honor VIRTIO_CONFIG_S_DEVICE_STOPPED
Date: Fri, 1 Oct 2021 09:05:45 +0200 [thread overview]
Message-ID: <20211001070603.307037-3-eperezma@redhat.com> (raw)
In-Reply-To: <20211001070603.307037-1-eperezma@redhat.com>
So the guest can stop and start net device. It freely implements the RFC
https://lists.oasis-open.org/archives/virtio-comment/202012/msg00027.html
To stop (as "pause") the device is required to migrate status and vring
addresses between device and SVQ. Once the device is stopped, the driver
can request avail_idx, so it can be assigned to SVQ.
This is a WIP commit: as with VIRTIO_F_QUEUE_STATE, is introduced in
virtio_config.h before of even proposing for the kernel, with no feature
flag, and, with no checking in the device. It also needs a modified
vp_vdpa driver that supports to set and retrieve status.
For virtio-net with qemu device there is no need to restore avail
state: Since every tx and rx operation is entirely done in BQL
regarding virtio, it would be enough with restore last_avail_idx with
used_idx. Doing this way test the vq state part of the rest of the
series.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
include/standard-headers/linux/virtio_config.h | 2 ++
hw/net/virtio-net.c | 6 ++++--
hw/virtio/virtio-pci.c | 7 +++++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/standard-headers/linux/virtio_config.h b/include/standard-headers/linux/virtio_config.h
index 59fad3eb45..b3f6b1365d 100644
--- a/include/standard-headers/linux/virtio_config.h
+++ b/include/standard-headers/linux/virtio_config.h
@@ -40,6 +40,8 @@
#define VIRTIO_CONFIG_S_DRIVER_OK 4
/* Driver has finished configuring features */
#define VIRTIO_CONFIG_S_FEATURES_OK 8
+/* Device is stopped */
+#define VIRTIO_CONFIG_S_DEVICE_STOPPED 32
/* Device entered invalid state, driver must reset it */
#define VIRTIO_CONFIG_S_NEEDS_RESET 0x40
/* We've given up on this device. */
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index bd7958b9f0..e8f55cdeba 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -198,6 +198,7 @@ static bool virtio_net_started(VirtIONet *n, uint8_t status)
{
VirtIODevice *vdev = VIRTIO_DEVICE(n);
return (status & VIRTIO_CONFIG_S_DRIVER_OK) &&
+ (!(status & VIRTIO_CONFIG_S_DEVICE_STOPPED)) &&
(n->status & VIRTIO_NET_S_LINK_UP) && vdev->vm_running;
}
@@ -385,7 +386,7 @@ static void virtio_net_set_status(struct VirtIODevice *vdev, uint8_t status)
qemu_flush_queued_packets(ncs);
}
- if (!q->tx_waiting) {
+ if (!q->tx_waiting && !(status & VIRTIO_CONFIG_S_DEVICE_STOPPED)) {
continue;
}
@@ -1503,7 +1504,8 @@ static bool virtio_net_can_receive(NetClientState *nc)
}
if (!virtio_queue_ready(q->rx_vq) ||
- !(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) {
+ !(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) ||
+ vdev->status == VIRTIO_CONFIG_S_DEVICE_STOPPED) {
return false;
}
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 6f30118c4e..9ed0f62222 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -326,13 +326,15 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)
}
break;
case VIRTIO_PCI_STATUS:
- if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) {
+ if (!(val & VIRTIO_CONFIG_S_DRIVER_OK) ||
+ val & VIRTIO_CONFIG_S_DEVICE_STOPPED) {
virtio_pci_stop_ioeventfd(proxy);
}
virtio_set_status(vdev, val & 0xFF);
- if (val & VIRTIO_CONFIG_S_DRIVER_OK) {
+ if (val & VIRTIO_CONFIG_S_DRIVER_OK &&
+ !(val & VIRTIO_CONFIG_S_DEVICE_STOPPED)) {
virtio_pci_start_ioeventfd(proxy);
}
@@ -1303,6 +1305,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
proxy->vqs[vdev->queue_sel].used[0]);
virtio_queue_set_last_avail_idx(vdev, vdev->queue_sel,
proxy->vqs[vdev->queue_sel].state);
+ virtio_queue_update_used_idx(vdev, vdev->queue_sel);
proxy->vqs[vdev->queue_sel].enabled = 1;
} else {
virtio_error(vdev, "wrong value for queue_enable %"PRIx64, val);
--
2.27.0
next prev parent reply other threads:[~2021-10-01 7:15 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 7:05 [RFC PATCH v4 00/20] vDPA shadow virtqueue Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 01/20] virtio: Add VIRTIO_F_QUEUE_STATE Eugenio Pérez
2021-10-01 7:05 ` Eugenio Pérez [this message]
2021-10-01 7:05 ` [RFC PATCH v4 03/20] virtio: Add virtio_queue_is_host_notifier_enabled Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 04/20] vhost: Make vhost_virtqueue_{start,stop} public Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 05/20] vhost: Add x-vhost-enable-shadow-vq qmp Eugenio Pérez
2021-10-12 5:18 ` Markus Armbruster
2021-10-12 13:08 ` Eugenio Perez Martin
2021-10-12 13:45 ` Markus Armbruster
2021-10-14 12:01 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 06/20] vhost: Add VhostShadowVirtqueue Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 07/20] vdpa: Register vdpa devices in a list Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 08/20] vhost: Route guest->host notification through shadow virtqueue Eugenio Pérez
2021-10-12 5:19 ` Markus Armbruster
2021-10-12 13:09 ` Eugenio Perez Martin
2021-10-13 3:27 ` Jason Wang
2021-10-14 12:00 ` Eugenio Perez Martin
2021-10-15 3:45 ` Jason Wang
2021-10-15 9:08 ` Eugenio Perez Martin
2021-10-15 18:21 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 09/20] vdpa: Save call_fd in vhost-vdpa Eugenio Pérez
2021-10-13 3:43 ` Jason Wang
2021-10-14 12:11 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 10/20] vhost-vdpa: Take into account SVQ in vhost_vdpa_set_vring_call Eugenio Pérez
2021-10-13 3:43 ` Jason Wang
2021-10-14 12:18 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 11/20] vhost: Route host->guest notification through shadow virtqueue Eugenio Pérez
2021-10-13 3:47 ` Jason Wang
2021-10-14 16:39 ` Eugenio Perez Martin
2021-10-15 4:42 ` Jason Wang
2021-10-19 8:39 ` Eugenio Perez Martin
2021-10-20 2:01 ` Jason Wang
2021-10-20 6:36 ` Eugenio Perez Martin
2021-10-13 3:49 ` Jason Wang
2021-10-14 15:58 ` Eugenio Perez Martin
2021-10-15 4:24 ` Jason Wang
2021-10-01 7:05 ` [RFC PATCH v4 12/20] virtio: Add vhost_shadow_vq_get_vring_addr Eugenio Pérez
2021-10-13 3:54 ` Jason Wang
2021-10-14 14:39 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 13/20] vdpa: Save host and guest features Eugenio Pérez
2021-10-13 3:56 ` Jason Wang
2021-10-14 15:03 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 14/20] vhost: Add vhost_svq_valid_device_features to shadow vq Eugenio Pérez
2021-10-01 7:05 ` [RFC PATCH v4 15/20] vhost: Shadow virtqueue buffers forwarding Eugenio Pérez
2021-10-12 5:21 ` Markus Armbruster
2021-10-12 13:28 ` Eugenio Perez Martin
2021-10-12 13:48 ` Markus Armbruster
2021-10-14 15:04 ` Eugenio Perez Martin
2021-10-13 4:31 ` Jason Wang
2021-10-14 17:56 ` Eugenio Perez Martin
2021-10-15 4:23 ` Jason Wang
2021-10-15 9:33 ` Eugenio Perez Martin
2021-10-01 7:05 ` [RFC PATCH v4 16/20] vhost: Check for device VRING_USED_F_NO_NOTIFY at shadow virtqueue kick Eugenio Pérez
2021-10-13 4:35 ` Jason Wang
2021-10-15 6:17 ` Eugenio Perez Martin
2021-10-01 7:06 ` [RFC PATCH v4 17/20] vhost: Use VRING_AVAIL_F_NO_INTERRUPT at device call on shadow virtqueue Eugenio Pérez
2021-10-13 4:36 ` Jason Wang
2021-10-15 6:22 ` Eugenio Perez Martin
2021-10-01 7:06 ` [RFC PATCH v4 18/20] vhost: Add VhostIOVATree Eugenio Pérez
2021-10-19 8:32 ` Jason Wang
2021-10-19 9:22 ` Jason Wang
2021-10-20 7:54 ` Eugenio Perez Martin
2021-10-20 9:01 ` Jason Wang
2021-10-20 12:06 ` Eugenio Perez Martin
2021-10-21 2:34 ` Jason Wang
2021-10-21 7:03 ` Eugenio Perez Martin
2021-10-21 8:12 ` Jason Wang
2021-10-21 14:33 ` Eugenio Perez Martin
2021-10-26 4:29 ` Jason Wang
2021-10-20 7:36 ` Eugenio Perez Martin
2021-10-01 7:06 ` [RFC PATCH v4 19/20] vhost: Use a tree to store memory mappings Eugenio Pérez
2021-10-01 7:06 ` [RFC PATCH v4 20/20] vdpa: Add custom IOTLB translations to SVQ Eugenio Pérez
2021-10-13 5:34 ` Jason Wang
2021-10-15 7:27 ` Eugenio Perez Martin
2021-10-15 7:37 ` Jason Wang
2021-10-15 8:20 ` Eugenio Perez Martin
2021-10-15 8:37 ` Jason Wang
2021-10-15 9:14 ` Eugenio Perez Martin
2021-10-19 9:24 ` Jason Wang
2021-10-19 10:28 ` Eugenio Perez Martin
2021-10-20 2:02 ` Jason Wang
2021-10-20 2:07 ` Jason Wang
2021-10-20 6:51 ` Eugenio Perez Martin
2021-10-20 9:03 ` Jason Wang
2021-10-20 11:56 ` Eugenio Perez Martin
2021-10-21 2:38 ` Jason Wang
2021-10-26 4:32 ` Jason Wang
2021-10-12 3:59 ` [RFC PATCH v4 00/20] vDPA shadow virtqueue Jason Wang
2021-10-12 4:06 ` Jason Wang
2021-10-12 9:09 ` Eugenio Perez Martin
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=20211001070603.307037-3-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=eli@mellanox.com \
--cc=hanand@xilinx.com \
--cc=jasowang@redhat.com \
--cc=ml@napatech.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--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).