Net Control VQ support with asid in vDPA SVQ
v6 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 or mq are not tested. Some details like error control are not 100% tested neither.
The firsts 5 patches will be or have already been proposed sepratedly. Patch 6 enables cmdline parameter to shadow all virtqueues. The rest of commits introduce the actual functionality.
Comments are welcomed.
Changes from rfc v5:
* Fixes bad calculus of cvq end group when MQ is not acked by the guest.
Changes from rfc v4:
* Add missing tracing
* Add multiqueue support
* Use already sent version for replacing g_memdup
* Care with memory management
Changes from rfc v3:
* Fix bad returning of descriptors to SVQ list.
Changes from rfc v2:
* Fix use-after-free.
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 (22):
vdpa: Add missing tracing to batch mapping functions
vdpa: Fix bad index calculus at vhost_vdpa_get_vring_base
util: Return void on iova_tree_remove
vhost: Fix bad return of descriptors to SVQ
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: Expose ctrl virtqueue logic
vdpa: Extract get features 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
vhost: Make possible to check for device exclusive vq group
vdpa: Add asid attribute to vdpa device
vdpa: Add x-cvq-svq
Philippe Mathieu-Daudé (1):
hw/virtio: Replace g_memdup() by g_memdup2()
qapi/net.json | 13 +- hw/virtio/vhost-iova-tree.h | 2 + hw/virtio/vhost-shadow-virtqueue.h | 46 ++- include/hw/virtio/vhost-vdpa.h | 2 + include/hw/virtio/vhost.h | 6 + include/hw/virtio/virtio-net.h | 3 + include/hw/virtio/virtio.h | 1 + include/net/net.h | 2 + include/qemu/iova-tree.h | 4 +- include/standard-headers/linux/vhost_types.h | 11 +- linux-headers/linux/vhost.h | 25 +- hw/net/vhost_net.c | 13 +- hw/net/virtio-net.c | 82 ++--- hw/virtio/vhost-iova-tree.c | 14 + hw/virtio/vhost-shadow-virtqueue.c | 255 +++++++++++++--- hw/virtio/vhost-vdpa.c | 201 ++++++++++-- hw/virtio/virtio-crypto.c | 6 +- hw/virtio/virtio.c | 2 +- net/vhost-vdpa.c | 306 +++++++++++++++++-- util/iova-tree.c | 4 +- hw/virtio/trace-events | 8 +- 21 files changed, 866 insertions(+), 140 deletions(-)
Signature · 1 line
2.27.0
RFC PATCH v6 1/23 vdpa: Add missing tracing to batch mapping functions
These functions were not traced properly.
--- hw/virtio/vhost-vdpa.c | 2 ++ hw/virtio/trace-events | 2 ++ 2 files changed, 4 insertions(+)
hw/virtio/vhost-vdpa.c +2 -0
@@ -129,6 +129,7 @@ static void vhost_vdpa_listener_begin_batch(struct vhost_vdpa *v) .iotlb.type = VHOST_IOTLB_BATCH_BEGIN, }; +trace_vhost_vdpa_listener_begin_batch (v, fd, msg.type, msg.iotlb.type);if (write (fd, &msg,sizeof (msg)) !=sizeof (msg)) {error_report ("failed to write, fd=%d, errno=%d (%s)" , fd, errno,strerror (errno));
@@ -163,6 +164,7 @@ static void vhost_vdpa_listener_commit(MemoryListener *listener) msg.type = v->msg_type; msg.iotlb.type =VHOST_IOTLB_BATCH_END ; +trace_vhost_vdpa_listener_commit (v, fd, msg.type, msg.iotlb.type);if (write (fd, &msg,sizeof (msg)) !=sizeof (msg)) {error_report ("failed to write, fd=%d, errno=%d (%s)" , fd, errno,strerror (errno));
hw/virtio/trace-events +2 -0
@@ -25,6 +25,8 @@ vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%s + 0x%" # vhost-vdpa.c vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8 vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 +vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 +vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend, void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" vaddr: %p read-only: %d" vhost_vdpa_listener_region_del(void *vdpa, uint64_t iova, uint64_t llend) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64 vhost_vdpa_add_status(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8
Signature · 1 line
2.27.0
RFC PATCH v6 2/23 vdpa: Fix bad index calculus at vhost_vdpa_get_vring_base
In reply to Eugenio Pérez--- hw/virtio/vhost-vdpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/virtio/vhost-vdpa.c +2 -2
@@ -1172,11 +1172,11 @@ static int vhost_vdpa_get_vring_base(struct vhost_dev *dev, struct vhost_vring_state *ring) {struct vhost_vdpa *v = dev->opaque; +int vdpa_idx = ring->index - dev->vq_index;int ret;if (v->shadow_vqs_enabled) { -VhostShadowVirtqueue *svq =g_ptr_array_index (v->shadow_vqs, - ring->index); +VhostShadowVirtqueue *svq =g_ptr_array_index (v->shadow_vqs, vdpa_idx);/* * Setting base as last used idx, so destination will see as available
Signature · 1 line
2.27.0
RFC PATCH v6 3/23 util: Return void on iova_tree_remove
In reply to Eugenio PérezIt always returns IOVA_OK so nobody uses it.
--- include/qemu/iova-tree.h | 4 +--- util/iova-tree.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
include/qemu/iova-tree.h +1 -3
@@ -72,10 +72,8 @@ int iova_tree_insert(IOVATree *tree, const DMAMap *map);* provided. The range does not need to be exactly what has inserted, * all the mappings that are included in the provided range will be * removed from the tree. Here map->translated_addr is meaningless. -* -* Return: 0 if succeeded, or <0 if error. */ -int iova_tree_remove (IOVATree *tree,const DMAMap *map); +void iova_tree_remove (IOVATree *tree,const DMAMap *map);/** * iova_tree_find:
util/iova-tree.c +1 -3
@@ -164,15 +164,13 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator)g_tree_foreach (tree->tree, iova_tree_traverse, iterator); } -int iova_tree_remove (IOVATree *tree,const DMAMap *map) +void iova_tree_remove (IOVATree *tree,const DMAMap *map) {const DMAMap *overlap;while ((overlap =iova_tree_find (tree, map))) {g_tree_remove (tree->tree, overlap); } - -return IOVA_OK ; }/**
Signature · 1 line
2.27.0
RFC PATCH v6 4/23 hw/virtio: Replace g_memdup() by g_memdup2()
In reply to Eugenio PérezFrom: Philippe Mathieu-Daudé <[email protected]>
Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
The old API took the size of the memory to duplicate as a guint, whereas most memory functions take memory sizes as a gsize. This made it easy to accidentally pass a gsize to g_memdup(). For large values, that would lead to a silent truncation of the size from 64 to 32 bits, and result in a heap area being returned which is significantly smaller than what the caller expects. This can likely be exploited in various modules to cause a heap buffer overflow.
Replace g_memdup() by the safer g_memdup2() wrapper.
--- hw/net/virtio-net.c | 3 ++- hw/virtio/virtio-crypto.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
hw/net/virtio-net.c +2 -1
@@ -1443,7 +1443,8 @@ 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)) {
hw/virtio/virtio-crypto.c +3 -3
@@ -242,7 +242,7 @@ static void virtio_crypto_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) } out_num = elem->out_num; - out_iov_copy =g_memdup (elem->out_sg,sizeof (out_iov[0 ]) * out_num); + out_iov_copy =g_memdup2 (elem->out_sg,sizeof (out_iov[0 ]) * out_num); out_iov = out_iov_copy; in_num = elem->in_num;
@@ -605,11 +605,11 @@ virtio_crypto_handle_request(VirtIOCryptoReq *request) } out_num = elem->out_num; - out_iov_copy =g_memdup (elem->out_sg,sizeof (out_iov[0 ]) * out_num); + out_iov_copy =g_memdup2 (elem->out_sg,sizeof (out_iov[0 ]) * out_num); out_iov = out_iov_copy; in_num = elem->in_num; - in_iov_copy =g_memdup (elem->in_sg,sizeof (in_iov[0 ]) * in_num); + in_iov_copy =g_memdup2 (elem->in_sg,sizeof (in_iov[0 ]) * in_num); in_iov = in_iov_copy; if (unlikely(iov_to_buf(out_iov, out_num, 0, &req, sizeof(req))
Signature · 1 line
2.27.0
RFC PATCH v6 5/23 vhost: Fix bad return of descriptors to SVQ
In reply to Eugenio PérezOnly the first one of them were properly enqueued back.
--- hw/virtio/vhost-shadow-virtqueue.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
hw/virtio/vhost-shadow-virtqueue.c +15 -2
@@ -333,13 +333,25 @@ static void vhost_svq_disable_notification(VhostShadowVirtqueue *svq) svq->vring.avail->flags |=cpu_to_le16 (VRING_AVAIL_F_NO_INTERRUPT ); } +static uint16_t vhost_svq_last_desc_of_chain (VhostShadowVirtqueue *svq, +uint16_t i) +{ +vring_desc_t *descs = svq->vring.desc; + +while (le16_to_cpu (descs[i].flags) &VRING_DESC_F_NEXT ) { + i =le16_to_cpu (descs[i].next); + } + +return i; +} +static VirtQueueElement *vhost_svq_get_buf (VhostShadowVirtqueue *svq,uint32_t *len) {vring_desc_t *descs = svq->vring.desc;const vring_used_t *used = svq->vring.used;vring_used_elem_t used_elem; -uint16_t last_used; +uint16_t last_used, last_used_chain;if (!vhost_svq_more_used (svq)) {return NULL ;
@@ -365,7 +377,8 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq,return NULL ; } - descs[used_elem.id].next = svq->free_head; + last_used_chain =vhost_svq_last_desc_of_chain (svq, used_elem.id); + descs[last_used_chain].next = svq->free_head; svq->free_head = used_elem.id; *len = used_elem.len;
Signature · 1 line
2.27.0
RFC PATCH v6 6/23 vdpa: Add x-svq to NetdevVhostVDPAOptions
In reply to Eugenio PérezFinally 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 v6 7/23 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 v6 8/23 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
@@ -1018,7 +1018,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 v6 9/23 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 | 83 ++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 35 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 -35
105 lines not on this page · raw message
Signature · 1 line
2.27.0
RFC PATCH v6 10/23 vdpa: Extract get features 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 v6 11/23 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 v6 12/23 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 v6 13/23 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
@@ -419,6 +419,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);
@@ -605,12 +609,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;
@@ -632,6 +638,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
@@ -411,7 +411,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 v6 14/23 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_CTRL_MACADDR and VIRTIO_NET_CTRL_MQ are implemented. If vDPA device is started with SVQ support and virtio-net driver changes MAC or the number of queues virtio-net device model will be updated with the new one.
Others cvq commands could be added here straightforwardly but they have been not tested.
--- net/vhost-vdpa.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-)
net/vhost-vdpa.c +77 -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,30 @@ 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_NET_F_MQ ) | +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 +224,46 @@ 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)) { +return ; + } + +switch (ctrl.class) { +case VIRTIO_NET_CTRL_MAC_ADDR_SET : +case VIRTIO_NET_CTRL_MQ : +break ; +default : +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 +291,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 +382,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 v6 15/23 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 v6 16/23 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
@@ -610,13 +610,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;
@@ -639,6 +643,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
@@ -385,6 +385,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) {
@@ -412,7 +428,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 v6 17/23 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 | 179 +++++++++++++++++++++++++---- 2 files changed, 160 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 +155 -24
259 lines not on this page · raw message
Signature · 1 line
2.27.0
RFC PATCH v6 18/23 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 v6 19/23 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
@@ -206,10 +206,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 v6 20/23 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 v6 21/23 vhost: Make possible to check for device exclusive vq group
In reply to Eugenio PérezCVQ needs to be in its own group, not shared with any data vq. Enable the checking of it here, before introducing address space id concepts.
--- include/hw/virtio/vhost.h | 2 + hw/net/vhost_net.c | 4 +- hw/virtio/vhost-vdpa.c | 79 ++++++++++++++++++++++++++++++++++++++- hw/virtio/trace-events | 1 + 4 files changed, 84 insertions(+), 2 deletions(-)
include/hw/virtio/vhost.h +2 -0
@@ -78,6 +78,8 @@ struct vhost_dev {int vq_index_end;/* if non-zero, minimum required value for max_queues */ int num_queues; +/* Must be a vq group different than any other vhost dev */ +bool independent_vq_group;uint64_t features;uint64_t acked_features;uint64_t backend_features;
hw/net/vhost_net.c +3 -1
@@ -343,14 +343,16 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, }for (i =0 ; i < nvhosts; i++) { +bool cvq_idx = i >= data_queue_pairs; -if (i < data_queue_pairs) { +if (!cvq_idx) { peer =qemu_get_peer (ncs, i); }else {/* Control Virtqueue */ peer =qemu_get_peer (ncs, n->max_queue_pairs); } net =get_vhost_net (peer); + net->dev.independent_vq_group = !!cvq_idx;vhost_net_set_vq_index (net, i *2 , index_end);/* Suppress the masking guest notifiers on vhost user
hw/virtio/vhost-vdpa.c +78 -1
97 lines not on this page · raw message
hw/virtio/trace-events +1 -0
@@ -43,6 +43,7 @@ vhost_vdpa_set_vring_ready(void *dev) "dev: %p" vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s" vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32 vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32 +vhost_vdpa_get_vring_group(void *dev, unsigned int index, unsigned int num) "dev: %p index: %u num: %u" vhost_vdpa_dev_start(void *dev, bool started) "dev: %p started: %d" vhost_vdpa_set_log_base(void *dev, uint64_t base, unsigned long long size, int refcnt, int fd, void *log) "dev: %p base: 0x%"PRIx64" size: %llu refcnt: %d fd: %d log: %p" vhost_vdpa_set_vring_addr(void *dev, unsigned int index, unsigned int flags, uint64_t desc_user_addr, uint64_t used_user_addr, uint64_t avail_user_addr, uint64_t log_guest_addr) "dev: %p index: %u flags: 0x%x desc_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" log_guest_addr: 0x%"PRIx64
Signature · 1 line
2.27.0
RFC PATCH v6 22/23 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.h | 4 ++ hw/net/vhost_net.c | 5 ++ hw/virtio/vhost-vdpa.c | 97 ++++++++++++++++++++++++++++++++------- net/vhost-vdpa.c | 9 ++-- hw/virtio/trace-events | 9 ++-- 5 files changed, 99 insertions(+), 25 deletions(-)
include/hw/virtio/vhost.h +4 -0
@@ -76,8 +76,12 @@ struct vhost_dev {int vq_index;/* one past the last vq index for the virtio device (not vhost) */ int vq_index_end; +/* one past the last vq index of this virtqueue group */ +int vq_group_index_end;/* if non-zero, minimum required value for max_queues */ int num_queues; +/* address space id */ +uint32_t address_space_id;/* Must be a vq group different than any other vhost dev */ bool independent_vq_group;uint64_t features;
hw/net/vhost_net.c +5 -0
@@ -344,15 +344,20 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,for (i =0 ; i < nvhosts; i++) {bool cvq_idx = i >= data_queue_pairs; +uint32_t vq_group_end;if (!cvq_idx) { peer =qemu_get_peer (ncs, i); + vq_group_end =2 * data_queue_pairs; }else {/* Control Virtqueue */ peer =qemu_get_peer (ncs, n->max_queue_pairs); + vq_group_end =2 * data_queue_pairs +1 ; } net =get_vhost_net (peer); + net->dev.address_space_id = !!cvq_idx; net->dev.independent_vq_group = !!cvq_idx; + net->dev.vq_group_index_end = vq_group_end;vhost_net_set_vq_index (net, i *2 , index_end);/* Suppress the masking guest notifiers on vhost user
hw/virtio/vhost-vdpa.c +80 -17
159 lines not on this page · raw message
net/vhost-vdpa.c +5 -4
@@ -152,9 +152,10 @@ err_init:static void vhost_vdpa_cleanup (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc); -struct vhost_dev *dev = s->vhost_vdpa.dev; +struct vhost_vdpa *v = &s->vhost_vdpa; +struct vhost_dev *dev = v->dev; -if (dev && dev->vq_index + dev->nvqs == dev->vq_index_end) { +if (dev && dev->vq_index + dev->nvqs == dev->vq_group_index_end) {g_clear_pointer (&s->vhost_vdpa.iova_tree, vhost_iova_tree_delete); }if (s->vhost_net) {
@@ -472,8 +473,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, - iova_tree); + vdpa_device_fd, i,1 , + false, opts->x_svq, iova_tree);if (!nc) goto err; }
hw/virtio/trace-events +5 -4
@@ -23,10 +23,10 @@ vhost_user_postcopy_waker_found(uint64_t client_addr) "0x%"PRIx64 vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%s + 0x%"PRIx64 # vhost-vdpa.c -vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8 -vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 -vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 -vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 +vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint32_t asid, uint64_t iova, uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" asid: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8 +vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint32_t asid, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" asid: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 +vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, uint32_t asid, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" asid: %"PRIu32" type: %"PRIu8 +vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint32_t asid, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" asid: %"PRIu32" type: %"PRIu8 vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend, void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" vaddr: %p read-only: %d" vhost_vdpa_listener_region_del(void *vdpa, uint64_t iova, uint64_t llend) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64 vhost_vdpa_add_status(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8
@@ -44,6 +44,7 @@ vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s" vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32 vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32 vhost_vdpa_get_vring_group(void *dev, unsigned int index, unsigned int num) "dev: %p index: %u num: %u" +vhost_vdpa_set_vq_group_address_space_id(void *dev, unsigned int index, unsigned int num) "dev: %p index: %u num: %u" vhost_vdpa_dev_start(void *dev, bool started) "dev: %p started: %d" vhost_vdpa_set_log_base(void *dev, uint64_t base, unsigned long long size, int refcnt, int fd, void *log) "dev: %p base: 0x%"PRIx64" size: %llu refcnt: %d fd: %d log: %p" vhost_vdpa_set_vring_addr(void *dev, unsigned int index, unsigned int flags, uint64_t desc_user_addr, uint64_t used_user_addr, uint64_t avail_user_addr, uint64_t log_guest_addr) "dev: %p index: %u flags: 0x%x desc_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" log_guest_addr: 0x%"PRIx64
Signature · 1 line
2.27.0
RFC PATCH v6 23/23 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 | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 6 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 +94 -4
142 lines not on this page · raw message
Signature · 1 line
2.27.0