Net Control VQ support with asid in vDPA SVQ
v2 cover Net Control VQ support with asid in vDPA SVQ
Control virtqueue is used by networking device for accepting various commands from the driver. It's a must to support multiqueue and other configurations.
Shadow VirtQueue (SVQ) already makes possible migration of virtqueue states, effectively intercepting them so qemu can track what regions of memory are dirty because device action and needs migration. However, this does not solve networking device state seen by the driver because CVQ messages, like changes on MAC addresses from the driver.
To solve that, this series uses SVQ infraestructure proposed at SVQ to intercept networking control messages used by the device. This way, qemu is able to update VirtIONet device model and to migrate it.
You can run qemu in two modes after applying this series: only intercepting cvq with x-cvq-svq=on or intercept all the virtqueues adding cmdline x-svq=on:
-netdev type=vhost-vdpa,vhostdev=/dev/vhost-vdpa-0,id=vhost-vdpa0,x-cvq-svq=on,x-svq=on
The most updated kernel part of ASID is proposed at [1].
Other modes without x-cvq-svq have been not tested with this series. Other vq cmd commands than set mac are not tested. Some details like error control are not 100% tested neither.
Comments are welcomed on every aspect of the patch.
Changes from rfc v1:
* Rebase to latest master
* Configure ASID instead of assuming cvq asid != data vqs asid
* Update device model so (MAC) state can be migrated too.
[1] https://lkml.kernel.org/kvm/[email protected]/
Eugenio Pérez (18):
vdpa: Add x-svq to NetdevVhostVDPAOptions
vhost: move descriptor translation to vhost_svq_vring_write_descs
vdpa: Fix index calculus at vhost_vdpa_svqs_start
virtio-net: use g_memdup2() instead of unsafe g_memdup()
virtio-net: Expose ctrl virtqueue logic
vdpa: Extract get geatures part from vhost_vdpa_get_max_queue_pairs
virtio: Make virtqueue_alloc_element non-static
vhost: Add SVQElement
vhost: Add custom used buffer callback
vdpa: control virtqueue support on shadow virtqueue
vhost: Add vhost_iova_tree_find
vdpa: Add map/unmap operation callback to SVQ
vhost: Add vhost_svq_inject
vdpa: add NetClientState->start() callback
vdpa: Add vhost_vdpa_start_control_svq
vhost: Update kernel headers
vdpa: Add asid attribute to vdpa device
vdpa: Add x-cvq-svq
qapi/net.json | 13 +- hw/virtio/vhost-iova-tree.h | 2 + hw/virtio/vhost-shadow-virtqueue.h | 46 ++- include/hw/virtio/vhost-vdpa.h | 5 + include/hw/virtio/virtio-net.h | 3 + include/hw/virtio/virtio.h | 1 + include/net/net.h | 2 + include/standard-headers/linux/vhost_types.h | 11 +- linux-headers/linux/vhost.h | 25 +- hw/net/vhost_net.c | 4 + hw/net/virtio-net.c | 82 +++-- hw/virtio/vhost-iova-tree.c | 14 + hw/virtio/vhost-shadow-virtqueue.c | 236 +++++++++--- hw/virtio/vhost-vdpa.c | 70 +++- hw/virtio/virtio.c | 2 +- net/vhost-vdpa.c | 368 +++++++++++++++++-- 16 files changed, 760 insertions(+), 124 deletions(-)
Signature · 1 line
2.27.0
RFC PATCH v2 1/18 vdpa: Add x-svq to NetdevVhostVDPAOptions
Finally offering the possibility to enable SVQ from the command line.
--- qapi/net.json | 9 ++++++++- net/vhost-vdpa.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 9 deletions(-)
qapi/net.json +8 -1
@@ -445,12 +445,19 @@ # @queues: number of queues to be created for multiqueue vhost-vdpa # (default: 1) # +# @x-svq: Start device with (experimental) shadow virtqueue. (Since 7.1) +# (default: false) +# +# Features: +# @unstable: Member @x-svq is experimental. +# # Since: 5.1 ## { 'struct': 'NetdevVhostVDPAOptions', 'data': { '*vhostdev': 'str', - '*queues': 'int' } } + '*queues': 'int', + '*x-svq': {'type': 'bool', 'features' : [ 'unstable'] } } } ## # @NetClientDriver:
net/vhost-vdpa.c +40 -8
101 lines not on this page · raw message
Signature · 1 line
2.27.0
RFC PATCH v2 2/18 vhost: move descriptor translation to vhost_svq_vring_write_descs
In reply to Eugenio PérezIt's done for both in and out descriptors so it's better placed here.
--- hw/virtio/vhost-shadow-virtqueue.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
hw/virtio/vhost-shadow-virtqueue.c +15 -11
@@ -122,17 +122,23 @@ static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq,return true; } -static void vhost_vring_write_descs (VhostShadowVirtqueue *svq,hwaddr *sg, -const struct iovec *iovec,size_t num, -bool more_descs,bool write) +static bool vhost_svq_vring_write_descs (VhostShadowVirtqueue *svq,hwaddr *sg, +const struct iovec *iovec,size_t num, +bool more_descs,bool write) {uint16_t i = svq->free_head, last = svq->free_head;unsigned n;uint16_t flags = write ?cpu_to_le16 (VRING_DESC_F_WRITE ) :0 ;vring_desc_t *descs = svq->vring.desc; +bool ok;if (num ==0 ) { -return ; +return true; + } + + ok =vhost_svq_translate_addr (svq, sg, iovec, num); +if (unlikely (!ok)) { +return false; }for (n =0 ; n < num; n++) {
@@ -149,6 +155,7 @@ static void vhost_vring_write_descs(VhostShadowVirtqueue *svq, hwaddr *sg, } svq->free_head =le16_to_cpu (descs[last].next); +return true; } static bool vhost_svq_add_split(VhostShadowVirtqueue *svq,
@@ -168,21 +175,18 @@ static bool vhost_svq_add_split(VhostShadowVirtqueue *svq,return false; } - ok =vhost_svq_translate_addr (svq, sgs, elem->out_sg, elem->out_num); + ok =vhost_svq_vring_write_descs (svq, sgs, elem->out_sg, elem->out_num, + elem->in_num >0 , false);if (unlikely (!ok)) {return false; } -vhost_vring_write_descs (svq, sgs, elem->out_sg, elem->out_num, - elem->in_num >0 , false); - - ok =vhost_svq_translate_addr (svq, sgs, elem->in_sg, elem->in_num); + ok =vhost_svq_vring_write_descs (svq, sgs, elem->in_sg, elem->in_num, false, + true);if (unlikely (!ok)) {return false; } -vhost_vring_write_descs (svq, sgs, elem->in_sg, elem->in_num, false, true); -/* * Put the entry in the available array (but don't update avail->idx until * they do sync).
Signature · 1 line
2.27.0
RFC PATCH v2 3/18 vdpa: Fix index calculus at vhost_vdpa_svqs_start
In reply to Eugenio Pérez--- hw/virtio/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/vhost-vdpa.c +1 -1
@@ -1016,7 +1016,7 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *dev)VirtQueue *vq =virtio_get_queue (dev->vdev, dev->vq_index + i);VhostShadowVirtqueue *svq =g_ptr_array_index (v->shadow_vqs, i);struct vhost_vring_addr addr = { - .index = i, + .index = dev->vq_index + i, };int r;bool ok =vhost_vdpa_svq_setup (dev, svq, i, &err);
Signature · 1 line
2.27.0
RFC PATCH v2 4/18 virtio-net: use g_memdup2() instead of unsafe g_memdup()
In reply to Eugenio PérezFixing that literal checkpatch.pl because it will complain when we modify the file
--- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/net/virtio-net.c +1 -1
@@ -1443,7 +1443,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) } iov_cnt = elem->out_num; - iov2 = iov =g_memdup (elem->out_sg,sizeof (struct iovec ) * elem->out_num); + iov2 = iov =g_memdup2 (elem->out_sg,sizeof (struct iovec ) * elem->out_num); s =iov_to_buf (iov, iov_cnt,0 , &ctrl,sizeof (ctrl));iov_discard_front (&iov, &iov_cnt,sizeof (ctrl));if (s !=sizeof (ctrl)) {
Signature · 1 line
2.27.0
RFC PATCH v2 5/18 virtio-net: Expose ctrl virtqueue logic
In reply to Eugenio PérezThis allows external vhost-net devices to modify the state of the VirtIO device model once vhost-vdpa device has acknowledge the control commands.
--- include/hw/virtio/virtio-net.h | 3 ++ hw/net/virtio-net.c | 82 ++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 34 deletions(-)
include/hw/virtio/virtio-net.h +3 -0
@@ -218,6 +218,9 @@ struct VirtIONet {struct EBPFRSSContext ebpf_rss; }; +unsigned virtio_net_handle_ctrl_iov (VirtIODevice *vdev, +const struct iovec *in_sg,size_t in_num, +struct iovec *out_sg,unsigned out_num);void virtio_net_set_netclient_name (VirtIONet *n,const char *name,const char *type);
hw/net/virtio-net.c +48 -34
104 lines not on this page · raw message
Signature · 1 line
2.27.0
RFC PATCH v2 6/18 vdpa: Extract get geatures part from vhost_vdpa_get_max_queue_pairs
In reply to Eugenio PérezTo know the device features is also needed for CVQ SVQ. Extract from vhost_vdpa_get_max_queue_pairs so we can reuse it.
Report errno in case of failure getting them while we're at it.
--- net/vhost-vdpa.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
net/vhost-vdpa.c +20 -10
@@ -235,20 +235,24 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,return nc; } -static int vhost_vdpa_get_max_queue_pairs (int fd,int *has_cvq,Error **errp) +static int vhost_vdpa_get_features (int fd,uint64_t *features,Error **errp) +{ +int ret =ioctl (fd,VHOST_GET_FEATURES , features); +if (ret) { +error_setg_errno (errp, errno, +"Fail to query features from vhost-vDPA device" ); + } +return ret; +} + +static int vhost_vdpa_get_max_queue_pairs (int fd,uint64_t features, +int *has_cvq,Error **errp) {unsigned long config_size = offsetof(struct vhost_vdpa_config , buf); g_autofree struct vhost_vdpa_config *config = NULL;__virtio16 *max_queue_pairs; -uint64_t features;int ret; - ret =ioctl (fd,VHOST_GET_FEATURES , &features); -if (ret) { -error_setg (errp,"Fail to query features from vhost-vDPA device" ); -return ret; - } -if (features & (1 <<VIRTIO_NET_F_CTRL_VQ )) { *has_cvq =1 ; }else {
@@ -278,10 +282,11 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) {const NetdevVhostVDPAOptions *opts; +uint64_t features;int vdpa_device_fd; g_autofree NetClientState **ncs = NULL;NetClientState *nc; -int queue_pairs, i, has_cvq =0 ; +int queue_pairs, r, i, has_cvq =0 ;g_autoptr (VhostIOVATree) iova_tree =NULL ;assert (netdev->type ==NET_CLIENT_DRIVER_VHOST_VDPA );
@@ -296,7 +301,12 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,return -errno; } - queue_pairs =vhost_vdpa_get_max_queue_pairs (vdpa_device_fd, + r =vhost_vdpa_get_features (vdpa_device_fd, &features, errp); +if (r) { +return r; + } + + queue_pairs =vhost_vdpa_get_max_queue_pairs (vdpa_device_fd, features, &has_cvq, errp);if (queue_pairs <0 ) {qemu_close (vdpa_device_fd);
Signature · 1 line
2.27.0
RFC PATCH v2 7/18 virtio: Make virtqueue_alloc_element non-static
In reply to Eugenio PérezSo SVQ can allocate elements using it
--- include/hw/virtio/virtio.h | 1 + hw/virtio/virtio.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
include/hw/virtio/virtio.h +1 -0
@@ -195,6 +195,7 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, unsigned int len, unsigned int idx);void virtqueue_map (VirtIODevice *vdev,VirtQueueElement *elem); +void *virtqueue_alloc_element (size_t sz,unsigned out_num,unsigned in_num);void *virtqueue_pop (VirtQueue *vq,size_t sz);unsigned int virtqueue_drop_all (VirtQueue *vq);void *qemu_get_virtqueue_element (VirtIODevice *vdev,QEMUFile *f,size_t sz);
hw/virtio/virtio.c +1 -1
@@ -1376,7 +1376,7 @@ void virtqueue_map(VirtIODevice *vdev, VirtQueueElement *elem) false); } -static void *virtqueue_alloc_element (size_t sz,unsigned out_num,unsigned in_num) +void *virtqueue_alloc_element (size_t sz,unsigned out_num,unsigned in_num) {VirtQueueElement *elem; size_t in_addr_ofs = QEMU_ALIGN_UP(sz, __alignof__(elem->in_addr[0]));
Signature · 1 line
2.27.0
RFC PATCH v2 8/18 vhost: Add SVQElement
In reply to Eugenio PérezThis allows SVQ to add metadata to the different queue elements
--- hw/virtio/vhost-shadow-virtqueue.h | 8 ++++-- hw/virtio/vhost-shadow-virtqueue.c | 42 ++++++++++++++++-------------- 2 files changed, 29 insertions(+), 21 deletions(-)
hw/virtio/vhost-shadow-virtqueue.h +6 -2
@@ -15,6 +15,10 @@#include "standard-headers/linux/vhost_types.h" #include "hw/virtio/vhost-iova-tree.h" +typedef struct SVQElement { +VirtQueueElement elem; +}SVQElement ; +/* Shadow virtqueue to relay notifications */ typedef struct VhostShadowVirtqueue { /* Shadow vring */
@@ -48,10 +52,10 @@ typedef struct VhostShadowVirtqueue {VhostIOVATree *iova_tree;/* Map for use the guest's descriptors */ -VirtQueueElement **ring_id_maps; +SVQElement **ring_id_maps;/* Next VirtQueue element that guest made available */ -VirtQueueElement *next_guest_avail_elem; +SVQElement *next_guest_avail_elem;/* Next head to expose to the device */ uint16_t shadow_avail_idx;
hw/virtio/vhost-shadow-virtqueue.c +23 -19
118 lines not on this page · raw message
Signature · 1 line
2.27.0
RFC PATCH v2 9/18 vhost: Add custom used buffer callback
In reply to Eugenio PérezThe callback allows SVQ users to know the VirtQueue requests and responses. QEMU can use this to synchronize virtio device model state, allowing to migrate it with minimum changes to the migration code.
In the case of networking, this will be used to inspect control virtqueue messages.
--- hw/virtio/vhost-shadow-virtqueue.h | 16 +++++++++++++++- include/hw/virtio/vhost-vdpa.h | 2 ++ hw/virtio/vhost-shadow-virtqueue.c | 9 ++++++++- hw/virtio/vhost-vdpa.c | 3 ++- 4 files changed, 27 insertions(+), 3 deletions(-)
hw/virtio/vhost-shadow-virtqueue.h +15 -1
@@ -19,6 +19,13 @@ typedef struct SVQElement {VirtQueueElement elem; } SVQElement; +typedef void (*VirtQueueElementCallback )(VirtIODevice *vdev, +const VirtQueueElement *elem); + +typedef struct VhostShadowVirtqueueOps { +VirtQueueElementCallback used_elem_handler; +}VhostShadowVirtqueueOps ; +/* Shadow virtqueue to relay notifications */ typedef struct VhostShadowVirtqueue { /* Shadow vring */
@@ -57,6 +64,12 @@ typedef struct VhostShadowVirtqueue {/* Next VirtQueue element that guest made available */ SVQElement *next_guest_avail_elem; +/* Optional callbacks */ +const VhostShadowVirtqueueOps *ops; + +/* Optional custom used virtqueue element handler */ +VirtQueueElementCallback used_elem_cb; +/* Next head to expose to the device */ uint16_t shadow_avail_idx;
@@ -83,7 +96,8 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev, VirtQueue *vq);void vhost_svq_stop (VhostShadowVirtqueue *svq); -VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_tree); +VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_tree, +const VhostShadowVirtqueueOps *ops);void vhost_svq_free (gpointer vq);G_DEFINE_AUTOPTR_CLEANUP_FUNC (VhostShadowVirtqueue, vhost_svq_free);
include/hw/virtio/vhost-vdpa.h +2 -0
@@ -17,6 +17,7 @@#include "hw/virtio/vhost-iova-tree.h" #include "hw/virtio/virtio.h" #include "standard-headers/linux/vhost_types.h" +#include "hw/virtio/vhost-shadow-virtqueue.h" typedef struct VhostVDPAHostNotifier { MemoryRegion mr;
@@ -35,6 +36,7 @@ typedef struct vhost_vdpa {/* IOVA mapping used by the Shadow Virtqueue */ VhostIOVATree *iova_tree;GPtrArray *shadow_vqs; +const VhostShadowVirtqueueOps *shadow_vq_ops;struct vhost_dev *dev;VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX ]; } VhostVDPA;
hw/virtio/vhost-shadow-virtqueue.c +8 -1
@@ -406,6 +406,10 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq,return ; }virtqueue_fill (vq, elem, len, i++); + +if (svq->ops && svq->ops->used_elem_handler) { + svq->ops->used_elem_handler (svq->vdev, elem); + } }virtqueue_flush (vq, i);
@@ -592,12 +596,14 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)* shadow methods and file descriptors. * * @iova_tree: Tree to perform descriptors translations +* @ops: SVQ operations hooks * * Returns the new virtqueue or NULL. * * In case of error, reason is reported through error_report. */ -VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_tree) +VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_tree, +const VhostShadowVirtqueueOps *ops) { g_autofree VhostShadowVirtqueue *svq = g_new0(VhostShadowVirtqueue, 1);int r;
@@ -619,6 +625,7 @@ VhostShadowVirtqueue *vhost_svq_new(VhostIOVATree *iova_tree)event_notifier_init_fd (&svq->svq_kick,VHOST_FILE_UNBIND );event_notifier_set_handler (&svq->hdev_call, vhost_svq_handle_call); svq->iova_tree = iova_tree; + svq->ops = ops;return g_steal_pointer (&svq); err_init_hdev_call:
hw/virtio/vhost-vdpa.c +2 -1
@@ -409,7 +409,8 @@ static int vhost_vdpa_init_svq(struct vhost_dev *hdev, struct vhost_vdpa *v, shadow_vqs =g_ptr_array_new_full (hdev->nvqs, vhost_svq_free);for (unsigned n =0 ; n < hdev->nvqs; ++n) { -g_autoptr (VhostShadowVirtqueue) svq =vhost_svq_new (v->iova_tree); +g_autoptr (VhostShadowVirtqueue) svq =vhost_svq_new (v->iova_tree, + v->shadow_vq_ops);if (unlikely (!svq)) {error_setg (errp,"Cannot create svq %u" , n);
Signature · 1 line
2.27.0
RFC PATCH v2 10/18 vdpa: control virtqueue support on shadow virtqueue
In reply to Eugenio PérezIntroduce the control virtqueue support for vDPA shadow virtqueue. This is needed for advanced networking features like multiqueue.
To demonstrate command handling, VIRTIO_NET_F_CTROL_MACADDR is implemented. If vDPA device is started with SVQ support and virtio-net driver changes MAC, virtio-net device model will be updated with the new one.
--- net/vhost-vdpa.c | 70 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 3 deletions(-)
net/vhost-vdpa.c +67 -3
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "clients.h" +#include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "net/vhost-vdpa.h" #include "hw/virtio/vhost-vdpa.h"
@@ -69,6 +70,29 @@ const int vdpa_feature_bits[] = {VHOST_INVALID_FEATURE_BIT }; +/** Supported device specific feature bits with SVQ */ +static const uint64_t vdpa_svq_device_features = +BIT_ULL (VIRTIO_NET_F_CSUM ) | +BIT_ULL (VIRTIO_NET_F_GUEST_CSUM ) | +BIT_ULL (VIRTIO_NET_F_CTRL_GUEST_OFFLOADS ) | +BIT_ULL (VIRTIO_NET_F_MTU ) | +BIT_ULL (VIRTIO_NET_F_MAC ) | +BIT_ULL (VIRTIO_NET_F_GUEST_TSO4 ) | +BIT_ULL (VIRTIO_NET_F_GUEST_TSO6 ) | +BIT_ULL (VIRTIO_NET_F_GUEST_ECN ) | +BIT_ULL (VIRTIO_NET_F_GUEST_UFO ) | +BIT_ULL (VIRTIO_NET_F_HOST_TSO4 ) | +BIT_ULL (VIRTIO_NET_F_HOST_TSO6 ) | +BIT_ULL (VIRTIO_NET_F_HOST_ECN ) | +BIT_ULL (VIRTIO_NET_F_HOST_UFO ) | +BIT_ULL (VIRTIO_NET_F_MRG_RXBUF ) | +BIT_ULL (VIRTIO_NET_F_STATUS ) | +BIT_ULL (VIRTIO_NET_F_CTRL_VQ ) | +BIT_ULL (VIRTIO_F_ANY_LAYOUT ) | +BIT_ULL (VIRTIO_NET_F_CTRL_MAC_ADDR ) | +BIT_ULL (VIRTIO_NET_F_RSC_EXT ) | +BIT_ULL (VIRTIO_NET_F_STANDBY ); +VHostNetState *vhost_vdpa_get_vhost_net (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc);
@@ -199,6 +223,37 @@ static int vhost_vdpa_get_iova_range(int fd,return ret <0 ? -errno :0 ; } +static void vhost_vdpa_net_handle_ctrl (VirtIODevice *vdev, +const VirtQueueElement *elem) +{ +struct virtio_net_ctrl_hdr ctrl; +virtio_net_ctrl_ack status =VIRTIO_NET_ERR ; +size_t s; +struct iovec in = { + .iov_base = &status, + .iov_len =sizeof (status), + }; + + s =iov_to_buf (elem->out_sg, elem->out_num,0 , &ctrl,sizeof (ctrl.class)); +if (s !=sizeof (ctrl.class) || ctrl.class !=VIRTIO_NET_CTRL_MAC_ADDR_SET ) { +return ; + } + s =iov_to_buf (elem->in_sg, elem->in_num,0 , &status,sizeof (status)); +if (s !=sizeof (status) || status !=VIRTIO_NET_OK ) { +return ; + } + + status =VIRTIO_NET_ERR ; +virtio_net_handle_ctrl_iov (vdev, &in,1 , elem->out_sg, elem->out_num); +if (status !=VIRTIO_NET_OK ) { +error_report ("Bad CVQ processing in model" ); + } +} + +static const VhostShadowVirtqueueOps vhost_vdpa_net_svq_ops = { + .used_elem_handler = vhost_vdpa_net_handle_ctrl, +}; + static NetClientState *net_vhost_vdpa_init(NetClientState *peer, const char *device, const char *name,
@@ -226,6 +281,9 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer, s->vhost_vdpa.device_fd = vdpa_device_fd; s->vhost_vdpa.index = queue_pair_index; s->vhost_vdpa.shadow_vqs_enabled = svq; +if (!is_datapath) { + s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops; + } s->vhost_vdpa.iova_tree = iova_tree; ret =vhost_vdpa_add (nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs);if (ret) {
@@ -314,9 +372,15 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, }if (opts->x_svq) {struct vhost_vdpa_iova_range iova_range; - -if (has_cvq) { -error_setg (errp,"vdpa svq does not work with cvq" ); +uint64_t invalid_dev_features = + features & ~vdpa_svq_device_features & +/* Transport are all accepted at this point */ + ~MAKE_64BIT_MASK (VIRTIO_TRANSPORT_F_START , +VIRTIO_TRANSPORT_F_END -VIRTIO_TRANSPORT_F_START ); + +if (invalid_dev_features) { +error_setg (errp,"vdpa svq does not work with features 0x%" PRIx64, + invalid_dev_features); goto err_svq; }vhost_vdpa_get_iova_range (vdpa_device_fd, &iova_range);
Signature · 1 line
2.27.0
RFC PATCH v2 11/18 vhost: Add vhost_iova_tree_find
In reply to Eugenio PérezJust a simple wrapper so we can find DMAMap entries based on iova
--- hw/virtio/vhost-iova-tree.h | 2 ++ hw/virtio/vhost-iova-tree.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
hw/virtio/vhost-iova-tree.h +2 -0
@@ -19,6 +19,8 @@ VhostIOVATree *vhost_iova_tree_new(uint64_t iova_first, uint64_t iova_last);void vhost_iova_tree_delete (VhostIOVATree *iova_tree);G_DEFINE_AUTOPTR_CLEANUP_FUNC (VhostIOVATree, vhost_iova_tree_delete); +const DMAMap *vhost_iova_tree_find (const VhostIOVATree *iova_tree, +const DMAMap *map);const DMAMap *vhost_iova_tree_find_iova (const VhostIOVATree *iova_tree,const DMAMap *map);int vhost_iova_tree_map_alloc (VhostIOVATree *iova_tree,DMAMap *map);
hw/virtio/vhost-iova-tree.c +14 -0
@@ -56,6 +56,20 @@ void vhost_iova_tree_delete(VhostIOVATree *iova_tree)g_free (iova_tree); } +/** +* Find a mapping in the tree that matches map +* +* @iova_tree The iova tree +* @map The map +* +* Return a matching map that contains argument map or NULL +*/ +const DMAMap *vhost_iova_tree_find (const VhostIOVATree *iova_tree, +const DMAMap *map) +{ +return iova_tree_find (iova_tree->iova_taddr_map, map); +} +/** * Find the IOVA address stored from a memory address *
Signature · 1 line
2.27.0
RFC PATCH v2 12/18 vdpa: Add map/unmap operation callback to SVQ
In reply to Eugenio Pérez--- hw/virtio/vhost-shadow-virtqueue.h | 21 +++++++++++++++++++-- hw/virtio/vhost-shadow-virtqueue.c | 8 +++++++- hw/virtio/vhost-vdpa.c | 20 +++++++++++++++++++- 3 files changed, 45 insertions(+), 4 deletions(-)
hw/virtio/vhost-shadow-virtqueue.h +19 -2
@@ -26,6 +26,15 @@ typedef struct VhostShadowVirtqueueOps {VirtQueueElementCallback used_elem_handler; } VhostShadowVirtqueueOps; +typedef int (*vhost_svq_map_op )(hwaddr iova,hwaddr size,void *vaddr, +bool readonly,void *opaque); +typedef int (*vhost_svq_unmap_op )(hwaddr iova,hwaddr size,void *opaque); + +typedef struct VhostShadowVirtqueueMapOps { +vhost_svq_map_op map; +vhost_svq_unmap_op unmap; +}VhostShadowVirtqueueMapOps ; +/* Shadow virtqueue to relay notifications */ typedef struct VhostShadowVirtqueue { /* Shadow vring */
@@ -67,6 +76,12 @@ typedef struct VhostShadowVirtqueue {/* Optional callbacks */ const VhostShadowVirtqueueOps *ops; +/* Device memory mapping callbacks */ +const VhostShadowVirtqueueMapOps *map_ops; + +/* Device memory mapping callbacks opaque */ +void *map_ops_opaque; +/* Optional custom used virtqueue element handler */ VirtQueueElementCallback used_elem_cb;
@@ -96,8 +111,10 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev, VirtQueue *vq);void vhost_svq_stop (VhostShadowVirtqueue *svq); -VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_tree, -const VhostShadowVirtqueueOps *ops); +VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_map, +const VhostShadowVirtqueueOps *ops, +const VhostShadowVirtqueueMapOps *map_ops, +void *map_ops_opaque);void vhost_svq_free (gpointer vq);G_DEFINE_AUTOPTR_CLEANUP_FUNC (VhostShadowVirtqueue, vhost_svq_free);
hw/virtio/vhost-shadow-virtqueue.c +7 -1
@@ -597,13 +597,17 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)* * @iova_tree: Tree to perform descriptors translations * @ops: SVQ operations hooks +* @map_ops: SVQ mapping operation hooks +* @map_ops_opaque: Opaque data to pass to mapping operations * * Returns the new virtqueue or NULL. * * In case of error, reason is reported through error_report. */ VhostShadowVirtqueue *vhost_svq_new (VhostIOVATree *iova_tree, -const VhostShadowVirtqueueOps *ops) +const VhostShadowVirtqueueOps *ops, +const VhostShadowVirtqueueMapOps *map_ops, +void *map_ops_opaque) { g_autofree VhostShadowVirtqueue *svq = g_new0(VhostShadowVirtqueue, 1);int r;
@@ -626,6 +630,8 @@ VhostShadowVirtqueue *vhost_svq_new(VhostIOVATree *iova_tree,event_notifier_set_handler (&svq->hdev_call, vhost_svq_handle_call); svq->iova_tree = iova_tree; svq->ops = ops; + svq->map_ops = map_ops; + svq->map_ops_opaque = map_ops_opaque;return g_steal_pointer (&svq); err_init_hdev_call:
hw/virtio/vhost-vdpa.c +19 -1
@@ -383,6 +383,22 @@ static int vhost_vdpa_get_dev_features(struct vhost_dev *dev,return ret; } +static int vhost_vdpa_svq_map (hwaddr iova,hwaddr size,void *vaddr, +bool readonly,void *opaque) +{ +return vhost_vdpa_dma_map (opaque, iova, size, vaddr, readonly); +} + +static int vhost_vdpa_svq_unmap (hwaddr iova,hwaddr size,void *opaque) +{ +return vhost_vdpa_dma_unmap (opaque, iova, size); +} + +static const VhostShadowVirtqueueMapOps vhost_vdpa_svq_map_ops = { + .map = vhost_vdpa_svq_map, + .unmap = vhost_vdpa_svq_unmap, +}; +static int vhost_vdpa_init_svq (struct vhost_dev *hdev,struct vhost_vdpa *v,Error **errp) {
@@ -410,7 +426,9 @@ static int vhost_vdpa_init_svq(struct vhost_dev *hdev, struct vhost_vdpa *v, shadow_vqs =g_ptr_array_new_full (hdev->nvqs, vhost_svq_free);for (unsigned n =0 ; n < hdev->nvqs; ++n) {g_autoptr (VhostShadowVirtqueue) svq =vhost_svq_new (v->iova_tree, - v->shadow_vq_ops); + v->shadow_vq_ops, + &vhost_vdpa_svq_map_ops, + v);if (unlikely (!svq)) {error_setg (errp,"Cannot create svq %u" , n);
Signature · 1 line
2.27.0
RFC PATCH v2 13/18 vhost: Add vhost_svq_inject
In reply to Eugenio PérezThis allows qemu to inject packets to the device without guest's notice.
This will be use to inject net CVQ messages to restore status in the destination
--- hw/virtio/vhost-shadow-virtqueue.h | 5 + hw/virtio/vhost-shadow-virtqueue.c | 177 +++++++++++++++++++++++++---- 2 files changed, 158 insertions(+), 24 deletions(-)
hw/virtio/vhost-shadow-virtqueue.h +5 -0
@@ -17,6 +17,9 @@typedef struct SVQElement {VirtQueueElement elem; +hwaddr in_iova; +hwaddr out_iova; +bool not_from_guest; }SVQElement ; typedef void (*VirtQueueElementCallback)(VirtIODevice *vdev,
@@ -100,6 +103,8 @@ typedef struct VhostShadowVirtqueue {bool vhost_svq_valid_features (uint64_t features,Error **errp); +bool vhost_svq_inject (VhostShadowVirtqueue *svq,const struct iovec *iov, +size_t out_num,size_t in_num);void vhost_svq_set_svq_kick_fd (VhostShadowVirtqueue *svq,int svq_kick_fd);void vhost_svq_set_svq_call_fd (VhostShadowVirtqueue *svq,int call_fd); void vhost_svq_get_vring_addr(const VhostShadowVirtqueue *svq,
hw/virtio/vhost-shadow-virtqueue.c +153 -24
257 lines not on this page · raw message
Signature · 1 line
2.27.0
RFC PATCH v2 14/18 vdpa: add NetClientState->start() callback
In reply to Eugenio PérezIt allows to inject custom code on device success start, right before release lock.
--- include/net/net.h | 2 ++ hw/net/vhost_net.c | 4 ++++ 2 files changed, 6 insertions(+)
include/net/net.h +2 -0
@@ -44,6 +44,7 @@ typedef struct NICConf {typedef void (NetPoll )(NetClientState *,bool enable);typedef bool (NetCanReceive )(NetClientState *); +typedef void (NetStart )(NetClientState *);typedef ssize_t (NetReceive )(NetClientState *,const uint8_t *,size_t );typedef ssize_t (NetReceiveIOV )(NetClientState *,const struct iovec *,int );typedef void (NetCleanup ) (NetClientState *);
@@ -71,6 +72,7 @@ typedef struct NetClientInfo {NetReceive *receive_raw;NetReceiveIOV *receive_iov;NetCanReceive *can_receive; +NetStart *start;NetCleanup *cleanup;LinkStatusChanged *link_status_changed;QueryRxFilter *query_rx_filter;
hw/net/vhost_net.c +4 -0
@@ -274,6 +274,10 @@ static int vhost_net_start_one(struct vhost_net *net, } } } + +if (net->nc->info->start) { + net->nc->info->start (net->nc); + }return 0 ; fail: file.fd =-1 ;
Signature · 1 line
2.27.0
RFC PATCH v2 15/18 vdpa: Add vhost_vdpa_start_control_svq
In reply to Eugenio PérezThis will send CVQ commands in the destination machine, seting up everything o there is no guest-visible change.
--- net/vhost-vdpa.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
net/vhost-vdpa.c +63 -0
@@ -205,10 +205,73 @@ static ssize_t vhost_vdpa_receive(NetClientState *nc, const uint8_t *buf,return 0 ; } +static bool vhost_vdpa_start_control_svq (VhostShadowVirtqueue *svq, +VirtIODevice *vdev) +{ +VirtIONet *n =VIRTIO_NET (vdev); +uint64_t features = vdev->host_features; + +if (features &BIT_ULL (VIRTIO_NET_F_CTRL_MAC_ADDR )) { +const struct virtio_net_ctrl_hdr ctrl = { + .class =VIRTIO_NET_CTRL_MAC , + .cmd =VIRTIO_NET_CTRL_MAC_ADDR_SET , + }; +uint8_t mac[6 ]; +const struct iovec data[] = { + { + .iov_base = (void *)&ctrl, + .iov_len =sizeof (ctrl), + },{ + .iov_base = mac, + .iov_len =sizeof (mac), + },{ + .iov_base =NULL , + .iov_len =sizeof (virtio_net_ctrl_ack), + } + }; +bool ret; + +/* TODO: Only best effort? */ +memcpy (mac, n->mac,sizeof (mac)); + ret =vhost_svq_inject (svq, data,2 ,1 ); +if (!ret) { +return false; + } + } + +return true; +} + +static void vhost_vdpa_start (NetClientState *nc) +{ +assert (nc->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ); +VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc); +struct vhost_vdpa *v = &s->vhost_vdpa; +struct vhost_dev *dev = &s->vhost_net->dev; +VhostShadowVirtqueue *svq; + +if (nc->is_datapath) { +/* This is not the cvq dev */ +return ; + } + +if (dev->vq_index + dev->nvqs != dev->vq_index_end) { +return ; + } + +if (!v->shadow_vqs_enabled) { +return ; + } + + svq =g_ptr_array_index (v->shadow_vqs,0 ); +vhost_vdpa_start_control_svq (svq, dev->vdev); +} +static NetClientInfo net_vhost_vdpa_info = { .type =NET_CLIENT_DRIVER_VHOST_VDPA , .size =sizeof (VhostVDPAState), .receive = vhost_vdpa_receive, + .start = vhost_vdpa_start, .cleanup = vhost_vdpa_cleanup, .has_vnet_hdr = vhost_vdpa_has_vnet_hdr, .has_ufo = vhost_vdpa_has_ufo,
Signature · 1 line
2.27.0
RFC PATCH v2 16/18 vhost: Update kernel headers
In reply to Eugenio Pérez--- include/standard-headers/linux/vhost_types.h | 11 ++++++++- linux-headers/linux/vhost.h | 25 ++++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-)
include/standard-headers/linux/vhost_types.h +10 -1
@@ -87,7 +87,7 @@ struct vhost_msg {struct vhost_msg_v2 {uint32_t type; -uint32_t reserved; +uint32_t asid;union {struct vhost_iotlb_msg iotlb;uint8_t padding[64 ];
@@ -153,4 +153,13 @@ struct vhost_vdpa_iova_range {/* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */ #define VHOST_NET_F_VIRTIO_NET_HDR 27 +/* Use message type V2 */ +#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 +/* IOTLB can accept batching hints */ +#define VHOST_BACKEND_F_IOTLB_BATCH 0x2 +/* IOTLB can accept address space identifier through V2 type of IOTLB +* message +*/ +#define VHOST_BACKEND_F_IOTLB_ASID 0x3 +#endif
linux-headers/linux/vhost.h +20 -5
@@ -89,11 +89,6 @@/* Set or get vhost backend capability */ -/* Use message type V2 */ -#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 -/* IOTLB can accept batching hints */ -#define VHOST_BACKEND_F_IOTLB_BATCH 0x2 -#define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
@@ -150,4 +145,24 @@/* Get the valid iova range */ #define VHOST_VDPA_GET_IOVA_RANGE _IOR(VHOST_VIRTIO, 0x78, \ struct vhost_vdpa_iova_range) +/* Get the number of virtqueue groups. */ +#define VHOST_VDPA_GET_GROUP_NUM _IOR(VHOST_VIRTIO, 0x79, unsigned int) + +/* Get the number of address spaces. */ +#define VHOST_VDPA_GET_AS_NUM _IOR(VHOST_VIRTIO, 0x7A, unsigned int) + +/* Get the group for a virtqueue: read index, write group in num, +* The virtqueue index is stored in the index field of +* vhost_vring_state. The group for this specific virtqueue is +* returned via num field of vhost_vring_state. +*/ +#define VHOST_VDPA_GET_VRING_GROUP _IOWR(VHOST_VIRTIO, 0x7B, \ + struct vhost_vring_state) +/* Set the ASID for a virtqueue group. The group index is stored in +* the index field of vhost_vring_state, the ASID associated with this +* group is stored at num field of vhost_vring_state. +*/ +#define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, \ + struct vhost_vring_state) +#endif
Signature · 1 line
2.27.0
RFC PATCH v2 17/18 vdpa: Add asid attribute to vdpa device
In reply to Eugenio PérezWe can configure ASID per group, but we still use asid 0 for every vdpa device. Multiple asid support for cvq will be introduced in next patches.
--- include/hw/virtio/vhost-vdpa.h | 3 +++ hw/virtio/vhost-vdpa.c | 47 ++++++++++++++++++++++++---------- net/vhost-vdpa.c | 10 ++++++-- 3 files changed, 45 insertions(+), 15 deletions(-)
include/hw/virtio/vhost-vdpa.h +3 -0
@@ -28,10 +28,13 @@ typedef struct vhost_vdpa {int device_fd;int index;uint32_t msg_type; +uint32_t asid;bool iotlb_batch_begin_sent;MemoryListener listener;struct vhost_vdpa_iova_range iova_range;uint64_t acked_features; +/* one past the last vq index of this virtqueue group */ +int vq_group_index_end;bool shadow_vqs_enabled;/* IOVA mapping used by the Shadow Virtqueue */ VhostIOVATree *iova_tree;
hw/virtio/vhost-vdpa.c +34 -13
93 lines not on this page · raw message
net/vhost-vdpa.c +8 -2
@@ -323,6 +323,8 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,int vdpa_device_fd, int queue_pair_index, int nvqs, + uint32_t asid, + int vq_group_end, bool is_datapath, bool svq, VhostIOVATree *iova_tree)
@@ -344,6 +346,8 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer, s->vhost_vdpa.device_fd = vdpa_device_fd; s->vhost_vdpa.index = queue_pair_index; s->vhost_vdpa.shadow_vqs_enabled = svq; + s->vhost_vdpa.vq_group_index_end = vq_group_end; + s->vhost_vdpa.asid = asid;if (!is_datapath) { s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops; }
@@ -454,7 +458,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,for (i =0 ; i < queue_pairs; i++) { ncs[i] =net_vhost_vdpa_init (peer,TYPE_VHOST_VDPA , name, - vdpa_device_fd, i,2 , true, opts->x_svq, + vdpa_device_fd, i,2 ,0 , + queue_pairs + has_cvq, true, opts->x_svq, iova_tree);if (!ncs[i]) goto err;
@@ -462,7 +467,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,if (has_cvq) { nc =net_vhost_vdpa_init (peer,TYPE_VHOST_VDPA , name, - vdpa_device_fd, i,1 , false, opts->x_svq, + vdpa_device_fd, i,1 ,0 , + queue_pairs + has_cvq, false, opts->x_svq, iova_tree);if (!nc) goto err;
Signature · 1 line
2.27.0
RFC PATCH v2 18/18 vdpa: Add x-cvq-svq
In reply to Eugenio PérezThis isolates shadow cvq in its own group.
--- qapi/net.json | 8 ++- net/vhost-vdpa.c | 179 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 171 insertions(+), 16 deletions(-)
qapi/net.json +6 -2
@@ -447,9 +447,12 @@ # # @x-svq: Start device with (experimental) shadow virtqueue. (Since 7.1) # (default: false) +# @x-cvq-svq: Start device with (experimental) shadow virtqueue in its own +# virtqueue group. (Since 7.1) +# (default: false) # # Features: -# @unstable: Member @x-svq is experimental. +# @unstable: Members @x-svq and x-cvq-svq are experimental. # # Since: 5.1 ##
@@ -457,7 +460,8 @@ 'data': { '*vhostdev': 'str', '*queues': 'int', - '*x-svq': {'type': 'bool', 'features' : [ 'unstable'] } } } + '*x-svq': {'type': 'bool', 'features' : [ 'unstable'] }, + '*x-cvq-svq': {'type': 'bool', 'features' : [ 'unstable'] } } } ## # @NetClientDriver:
net/vhost-vdpa.c +165 -14
245 lines not on this page · raw message
Signature · 1 line
2.27.0