virtio: drop sizing vqs during init
Subsystems (11)
Michael S. Tsirkin
maintainerv4 cover virtio: drop sizing vqs during init
Supplying size during init does not work for all transports. In fact for legacy pci doing that causes a memory corruption which was reported on Google Cloud.
We might get away with changing size to size_hint so it's safe to ignore and then fixing legacy to ignore the hint.
But the benefit is unclear in any case, so let's revert for now. Any new version will have to come with
- documentation of performance gains
- performance testing showing existing workflows
are not harmed materially. especially ones with bursty traffic
- report of testing on legacy devices
Huge shout out to Andres Freund for the effort spent reproducing and debugging! Thanks to Guenter Roeck for help with testing!
changes from v3
added a vdpa revert
changes from v2
drop unrelated patches
changes from v1
revert the ring size api, it's unused now
Michael S. Tsirkin (5):
virtio_net: Revert "virtio_net: set the default max ring size by
find_vqs()"
Michael S. Tsirkin (6):
virtio_net: Revert "virtio_net: set the default max ring size by
find_vqs()"
Michael S. Tsirkin (6):
virtio_net: Revert "virtio_net: set the default max ring size by
find_vqs()"
virtio: Revert "virtio: add helper virtio_find_vqs_ctx_size()"
virtio-mmio: Revert "virtio_mmio: support the arg sizes of find_vqs()"
virtio_pci: Revert "virtio_pci: support the arg sizes of find_vqs()"
virtio_vdpa: Revert "virtio_vdpa: support the arg sizes of find_vqs()"
virtio: Revert "virtio: find_vqs() add arg sizes"
arch/um/drivers/virtio_uml.c | 2 +- drivers/net/virtio_net.c | 42 +++--------------------- drivers/platform/mellanox/mlxbf-tmfifo.c | 1 - drivers/remoteproc/remoteproc_virtio.c | 1 - drivers/s390/virtio/virtio_ccw.c | 1 - drivers/virtio/virtio_mmio.c | 9 ++--- drivers/virtio/virtio_pci_common.c | 20 +++++------ drivers/virtio/virtio_pci_common.h | 3 +- drivers/virtio/virtio_pci_legacy.c | 6 +--- drivers/virtio/virtio_pci_modern.c | 17 +++------- drivers/virtio/virtio_vdpa.c | 16 ++++----- include/linux/virtio_config.h | 26 +++------------ 12 files changed, 34 insertions(+), 110 deletions(-)
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 1/6 virtio_net: Revert "virtio_net: set the default max ring size by find_vqs()"
This reverts commit 762faee5a2678559d3dc09d95f8f2c54cd0466a7.
This has been reported to trip up guests on GCP (Google Cloud). The reason is that virtio_find_vqs_ctx_size is broken on legacy devices. We can in theory fix virtio_find_vqs_ctx_size but in fact the patch itself has several other issues:
- It treats unknown speed as < 10G
- It leaves userspace no way to find out the ring size set by hypervisor
- It tests speed when link is down
- It ignores the virtio spec advice:
Both \field{speed} and \field{duplex} can change, thus the driver is expected to re-read these values after receiving a configuration change notification.
- It is not clear the performance impact has been tested properly
Revert the patch for now.
--- drivers/net/virtio_net.c | 42 ++++------------------------------------ 1 file changed, 4 insertions(+), 38 deletions(-)
drivers/net/virtio_net.c +4 -38
@@ -3432,29 +3432,6 @@ static unsigned int mergeable_min_buf_len(struct virtnet_info *vi, struct virtqu (unsigned int)GOOD_PACKET_LEN); } -static void virtnet_config_sizes (struct virtnet_info *vi,u32 *sizes) -{ -u32 i, rx_size, tx_size; - -if (vi->speed ==SPEED_UNKNOWN || vi->speed <SPEED_10000 ) { - rx_size =1024 ; - tx_size =1024 ; - - }else if (vi->speed <SPEED_40000 ) { - rx_size =1024 *4 ; - tx_size =1024 *4 ; - - }else { - rx_size =1024 *8 ; - tx_size =1024 *8 ; - } - -for (i =0 ; i < vi->max_queue_pairs; i++) { - sizes[rxq2vq (i)] = rx_size; - sizes[txq2vq (i)] = tx_size; - } -} -static int virtnet_find_vqs (struct virtnet_info *vi) {vq_callback_t **callbacks;
@@ -3462,7 +3439,6 @@ static int virtnet_find_vqs(struct virtnet_info *vi)int ret = -ENOMEM ;int i, total_vqs;const char **names; -u32 *sizes;bool *ctx;/* We expect 1 RX virtqueue followed by 1 TX virtqueue, followed by
@@ -3490,15 +3466,10 @@ static int virtnet_find_vqs(struct virtnet_info *vi) ctx =NULL ; } - sizes =kmalloc_array (total_vqs,sizeof (*sizes),GFP_KERNEL ); -if (!sizes) - goto err_sizes; -/* Parameters for control virtqueue, if any */ if (vi->has_cvq) { callbacks[total_vqs -1 ] =NULL ; names[total_vqs -1 ] ="control" ; - sizes[total_vqs -1 ] =64 ; }/* Allocate/initialize parameters for send/receive virtqueues */
@@ -3513,10 +3484,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi) ctx[rxq2vq (i)] = true; } -virtnet_config_sizes (vi, sizes); - - ret =virtio_find_vqs_ctx_size (vi->vdev, total_vqs, vqs, callbacks, - names, sizes, ctx,NULL ); + ret =virtio_find_vqs_ctx (vi->vdev, total_vqs, vqs, callbacks, + names, ctx,NULL );if (ret) goto err_find;
@@ -3536,8 +3505,6 @@ static int virtnet_find_vqs(struct virtnet_info *vi) err_find: -kfree (sizes); -err_sizes:kfree (ctx); err_ctx:kfree (names);
@@ -3897,9 +3864,6 @@ static int virtnet_probe(struct virtio_device *vdev) vi->curr_queue_pairs =num_online_cpus (); vi->max_queue_pairs = max_queue_pairs; -virtnet_init_settings (dev); -virtnet_update_settings (vi); -/* Allocate/initialize the rx/tx queues, and invoke find_vqs */ err =init_vqs (vi);if (err)
@@ -3912,6 +3876,8 @@ static int virtnet_probe(struct virtio_device *vdev)netif_set_real_num_tx_queues (dev, vi->curr_queue_pairs);netif_set_real_num_rx_queues (dev, vi->curr_queue_pairs); +virtnet_init_settings (dev); +if (virtio_has_feature (vdev,VIRTIO_NET_F_STANDBY )) { vi->failover =net_failover_create (vi->dev);if (IS_ERR (vi->failover)) {
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 2/6 virtio: Revert "virtio: add helper virtio_find_vqs_ctx_size()"
In reply to Michael S. TsirkinThis reverts commit fe3dc04e31aa51f91dc7f741a5f76cc4817eb5b4: the API is now unused and in fact can't be implemented on top of a legacy device.
--- include/linux/virtio_config.h | 12 ------------ 1 file changed, 12 deletions(-)
include/linux/virtio_config.h +0 -12
@@ -241,18 +241,6 @@ int virtio_find_vqs_ctx(struct virtio_device *vdev, unsigned nvqs, ctx, desc); } -static inline -int virtio_find_vqs_ctx_size (struct virtio_device *vdev,u32 nvqs, -struct virtqueue *vqs[], -vq_callback_t *callbacks[], -const char *const names[], -u32 sizes[], -const bool *ctx,struct irq_affinity *desc) -{ -return vdev->config->find_vqs (vdev, nvqs, vqs, callbacks, names, sizes, - ctx, desc); -} -/** * virtio_synchronize_cbs - synchronize with virtqueue callbacks * @vdev: the device
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 3/6 virtio-mmio: Revert "virtio_mmio: support the arg sizes of find_vqs()"
In reply to Michael S. TsirkinThis reverts commit fbed86abba6e0472d98079790e58060e4332608a. The API is now unused, let's not carry dead code around.
--- drivers/virtio/virtio_mmio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/virtio/virtio_mmio.c +2 -6
@@ -360,7 +360,7 @@ static void vm_synchronize_cbs(struct virtio_device *vdev)static struct virtqueue *vm_setup_vq (struct virtio_device *vdev,unsigned int index,void (*callback)(struct virtqueue *vq), -const char *name,u32 size,bool ctx) +const char *name,bool ctx) {struct virtio_mmio_device *vm_dev =to_virtio_mmio_device (vdev);struct virtio_mmio_vq_info *info;
@@ -395,11 +395,8 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in goto error_new_virtqueue; } -if (!size || size > num) - size = num; -/* Create the vring */ - vq =vring_create_virtqueue (index, size,VIRTIO_MMIO_VRING_ALIGN , vdev, + vq =vring_create_virtqueue (index, num,VIRTIO_MMIO_VRING_ALIGN , vdev, true, true, ctx, vm_notify, callback, name);if (!vq) { err = -ENOMEM ;
@@ -503,7 +500,6 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs, } vqs[i] =vm_setup_vq (vdev, queue_idx++, callbacks[i], names[i], - sizes ? sizes[i] :0 , ctx ? ctx[i] : false);if (IS_ERR (vqs[i])) {vm_del_vqs (vdev);
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 4/6 virtio_pci: Revert "virtio_pci: support the arg sizes of find_vqs()"
In reply to Michael S. TsirkinThis reverts commit cdb44806fca2d0ad29ca644cbf1505433902ee0c: the legacy path is wrong and in fact can not support the proposed API since for a legacy device we never communicate the vq size to the hypervisor.
--- drivers/virtio/virtio_pci_common.c | 18 ++++++++---------- drivers/virtio/virtio_pci_common.h | 1 - drivers/virtio/virtio_pci_legacy.c | 6 +----- drivers/virtio/virtio_pci_modern.c | 10 +++------- 4 files changed, 12 insertions(+), 23 deletions(-)
drivers/virtio/virtio_pci_common.c +8 -10
@@ -174,7 +174,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,static struct virtqueue *vp_setup_vq (struct virtio_device *vdev,unsigned int index,void (*callback)(struct virtqueue *vq),const char *name, -u32 size,bool ctx,u16 msix_vec) {
@@ -187,7 +186,7 @@ static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int inif (!info)return ERR_PTR (-ENOMEM ); - vq = vp_dev->setup_vq (vp_dev, info, index, callback, name, size, ctx, + vq = vp_dev->setup_vq (vp_dev, info, index, callback, name, ctx, msix_vec);if (IS_ERR (vq)) goto out_info;
@@ -284,7 +283,7 @@ void vp_del_vqs(struct virtio_device *vdev)static int vp_find_vqs_msix (struct virtio_device *vdev,unsigned int nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[],u32 sizes[],bool per_vq_vectors, +const char *const names[],bool per_vq_vectors,const bool *ctx,struct irq_affinity *desc) {
@@ -327,8 +326,8 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,else msix_vec =VP_MSIX_VQ_VECTOR ; vqs[i] =vp_setup_vq (vdev, queue_idx++, callbacks[i], names[i], - sizes ? sizes[i] :0 , - ctx ? ctx[i] : false, msix_vec); + ctx ? ctx[i] : false, + msix_vec);if (IS_ERR (vqs[i])) { err =PTR_ERR (vqs[i]); goto error_find;
@@ -358,7 +357,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,static int vp_find_vqs_intx (struct virtio_device *vdev,unsigned int nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[],u32 sizes[],const bool *ctx) +const char *const names[],const bool *ctx) {struct virtio_pci_device *vp_dev =to_vp_device (vdev);int i, err, queue_idx =0 ;
@@ -380,7 +379,6 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,continue ; } vqs[i] =vp_setup_vq (vdev, queue_idx++, callbacks[i], names[i], - sizes ? sizes[i] :0 , ctx ? ctx[i] : false,VIRTIO_MSI_NO_VECTOR );if (IS_ERR (vqs[i])) {
@@ -404,15 +402,15 @@ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,int err;/* Try MSI-X with one vector per queue. */ - err =vp_find_vqs_msix (vdev, nvqs, vqs, callbacks, names, sizes, true, ctx, desc); + err =vp_find_vqs_msix (vdev, nvqs, vqs, callbacks, names, true, ctx, desc);if (!err)return 0 ;/* Fallback: MSI-X with one vector for config, one shared for queues. */ - err =vp_find_vqs_msix (vdev, nvqs, vqs, callbacks, names, sizes, false, ctx, desc); + err =vp_find_vqs_msix (vdev, nvqs, vqs, callbacks, names, false, ctx, desc);if (!err)return 0 ;/* Finally fall back to regular interrupts. */ -return vp_find_vqs_intx (vdev, nvqs, vqs, callbacks, names, sizes, ctx); +return vp_find_vqs_intx (vdev, nvqs, vqs, callbacks, names, ctx); }const char *vp_bus_name (struct virtio_device *vdev)
drivers/virtio/virtio_pci_common.h +0 -1
@@ -80,7 +80,6 @@ struct virtio_pci_device {unsigned int idx, void (*callback)(struct virtqueue *vq), const char *name, - u32 size, bool ctx, u16 msix_vec);void (*del_vq)(struct virtio_pci_vq_info *info);
drivers/virtio/virtio_pci_legacy.c +1 -5
@@ -112,7 +112,6 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,unsigned int index, void (*callback)(struct virtqueue *vq), const char *name, - u32 size, bool ctx, u16 msix_vec) {
@@ -126,13 +125,10 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,if (!num ||vp_legacy_get_queue_enable (&vp_dev->ldev, index))return ERR_PTR (-ENOENT ); -if (!size || size > num) - size = num; - info->msix_vector = msix_vec;/* create the vring */ - vq =vring_create_virtqueue (index, size, + vq =vring_create_virtqueue (index, num,VIRTIO_PCI_VRING_ALIGN , &vp_dev->vdev, true, false, ctx, vp_notify, callback, name);
drivers/virtio/virtio_pci_modern.c +3 -7
@@ -293,7 +293,6 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,unsigned int index, void (*callback)(struct virtqueue *vq), const char *name, - u32 size, bool ctx, u16 msix_vec) {
@@ -311,18 +310,15 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,if (!num ||vp_modern_get_queue_enable (mdev, index))return ERR_PTR (-ENOENT ); -if (!size || size > num) - size = num; - -if (size & (size -1 )) { -dev_warn (&vp_dev->pci_dev->dev,"bad queue size %u" , size); +if (num & (num -1 )) { +dev_warn (&vp_dev->pci_dev->dev,"bad queue size %u" , num);return ERR_PTR (-EINVAL ); } info->msix_vector = msix_vec;/* create the vring */ - vq =vring_create_virtqueue (index, size, + vq =vring_create_virtqueue (index, num,SMP_CACHE_BYTES , &vp_dev->vdev, true, true, ctx, vp_notify, callback, name);
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 5/6 virtio_vdpa: Revert "virtio_vdpa: support the arg sizes of find_vqs()"
In reply to Michael S. TsirkinThis reverts commit 99e8927d8a4da8eb8a8a5904dc13a3156be8e7c0:
proposed API isn't supported on all transports but no effort was made to address this.
It might not be hard to fix if we want to: maybe just rename size to size_hint and make sure legacy transports ignore the hint.
But it's not sure what the benefit is in any case, so let's drop it.
--- drivers/virtio/virtio_vdpa.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/virtio/virtio_vdpa.c +6 -9
@@ -131,7 +131,7 @@ static irqreturn_t virtio_vdpa_virtqueue_cb(void *private)static struct virtqueue *virtio_vdpa_setup_vq (struct virtio_device *vdev,unsigned int index,void (*callback)(struct virtqueue *vq), -const char *name,u32 size,bool ctx) +const char *name,bool ctx) {struct virtio_vdpa_device *vd_dev =to_virtio_vdpa_device (vdev);struct vdpa_device *vdpa =vd_get_vdpa (vdev);
@@ -168,17 +168,14 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, goto error_new_virtqueue; } -if (!size || size > max_num) - size = max_num; -if (ops->get_vq_num_min) min_num = ops->get_vq_num_min (vdpa); - may_reduce_num = (size == min_num) ? false : true; + may_reduce_num = (max_num == min_num) ? false : true;/* Create the vring */ align = ops->get_vq_align (vdpa); - vq =vring_create_virtqueue (index, size, align, vdev, + vq =vring_create_virtqueue (index, max_num, align, vdev, true, may_reduce_num, ctx, virtio_vdpa_notify, callback, name);if (!vq) {
@@ -288,9 +285,9 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,continue ; } - vqs[i] =virtio_vdpa_setup_vq (vdev, queue_idx++, callbacks[i], - names[i], sizes ? sizes[i] :0 , - ctx ? ctx[i] : false); + vqs[i] =virtio_vdpa_setup_vq (vdev, queue_idx++, + callbacks[i], names[i], ctx ? + ctx[i] : false);if (IS_ERR (vqs[i])) { err =PTR_ERR (vqs[i]); goto err_setup_vq;
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 5/6 virtio: Revert "virtio_vdpa: support the arg sizes of find_vqs()"
In reply to Michael S. TsirkinThis reverts commit 99e8927d8a4da8eb8a8a5904dc13a3156be8e7c0:
proposed API isn't supported on all transports but no effort was made to address this.
It might not be hard to fix if we want to: maybe just rename size to size_hint and make sure legacy transports ignore the hint.
But it's not sure what the benefit is in any case, so let's drop it.
--- drivers/virtio/virtio_vdpa.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/virtio/virtio_vdpa.c +6 -9
@@ -131,7 +131,7 @@ static irqreturn_t virtio_vdpa_virtqueue_cb(void *private)static struct virtqueue *virtio_vdpa_setup_vq (struct virtio_device *vdev,unsigned int index,void (*callback)(struct virtqueue *vq), -const char *name,u32 size,bool ctx) +const char *name,bool ctx) {struct virtio_vdpa_device *vd_dev =to_virtio_vdpa_device (vdev);struct vdpa_device *vdpa =vd_get_vdpa (vdev);
@@ -168,17 +168,14 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, goto error_new_virtqueue; } -if (!size || size > max_num) - size = max_num; -if (ops->get_vq_num_min) min_num = ops->get_vq_num_min (vdpa); - may_reduce_num = (size == min_num) ? false : true; + may_reduce_num = (max_num == min_num) ? false : true;/* Create the vring */ align = ops->get_vq_align (vdpa); - vq =vring_create_virtqueue (index, size, align, vdev, + vq =vring_create_virtqueue (index, max_num, align, vdev, true, may_reduce_num, ctx, virtio_vdpa_notify, callback, name);if (!vq) {
@@ -288,9 +285,9 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,continue ; } - vqs[i] =virtio_vdpa_setup_vq (vdev, queue_idx++, callbacks[i], - names[i], sizes ? sizes[i] :0 , - ctx ? ctx[i] : false); + vqs[i] =virtio_vdpa_setup_vq (vdev, queue_idx++, + callbacks[i], names[i], ctx ? + ctx[i] : false);if (IS_ERR (vqs[i])) { err =PTR_ERR (vqs[i]); goto err_setup_vq;
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerPATCH v4 6/6 virtio: Revert "virtio: find_vqs() add arg sizes"
In reply to Michael S. TsirkinThis reverts commit a10fba0377145fccefea4dc4dd5915b7ed87e546: the proposed API isn't supported on all transports but no effort was made to address this.
It might not be hard to fix if we want to: maybe just rename size to size_hint and make sure legacy transports ignore the hint.
But it's not sure what the benefit is in any case, so let's drop it.
--- arch/um/drivers/virtio_uml.c | 2 +- drivers/platform/mellanox/mlxbf-tmfifo.c | 1 - drivers/remoteproc/remoteproc_virtio.c | 1 - drivers/s390/virtio/virtio_ccw.c | 1 - drivers/virtio/virtio_mmio.c | 1 - drivers/virtio/virtio_pci_common.c | 2 +- drivers/virtio/virtio_pci_common.h | 2 +- drivers/virtio/virtio_pci_modern.c | 7 ++----- drivers/virtio/virtio_vdpa.c | 1 - include/linux/virtio_config.h | 14 +++++--------- 10 files changed, 10 insertions(+), 22 deletions(-)
arch/um/drivers/virtio_uml.c +1 -1
@@ -1011,7 +1011,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,static int vu_find_vqs (struct virtio_device *vdev,unsigned nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[],u32 sizes[],const bool *ctx, +const char *const names[],const bool *ctx,struct irq_affinity *desc) {struct virtio_uml_device *vu_dev =to_virtio_uml_device (vdev);
drivers/platform/mellanox/mlxbf-tmfifo.c +0 -1
@@ -928,7 +928,6 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[], - u32 sizes[], const bool *ctx, struct irq_affinity *desc) {
drivers/remoteproc/remoteproc_virtio.c +0 -1
@@ -158,7 +158,6 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[], - u32 sizes[], const bool * ctx, struct irq_affinity *desc) {
drivers/s390/virtio/virtio_ccw.c +0 -1
@@ -637,7 +637,6 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[], - u32 sizes[], const bool *ctx, struct irq_affinity *desc) {
drivers/virtio/virtio_mmio.c +0 -1
@@ -474,7 +474,6 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[], - u32 sizes[], const bool *ctx, struct irq_affinity *desc) {
drivers/virtio/virtio_pci_common.c +1 -1
@@ -396,7 +396,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,/* the config->find_vqs() implementation */ int vp_find_vqs (struct virtio_device *vdev,unsigned int nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[],u32 sizes[],const bool *ctx, +const char *const names[],const bool *ctx,struct irq_affinity *desc) {int err;
drivers/virtio/virtio_pci_common.h +1 -1
@@ -110,7 +110,7 @@ void vp_del_vqs(struct virtio_device *vdev);/* the config->find_vqs() implementation */ int vp_find_vqs (struct virtio_device *vdev,unsigned int nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[],u32 sizes[],const bool *ctx, +const char *const names[],const bool *ctx,struct irq_affinity *desc);const char *vp_bus_name (struct virtio_device *vdev);
drivers/virtio/virtio_pci_modern.c +2 -5
@@ -347,15 +347,12 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,static int vp_modern_find_vqs (struct virtio_device *vdev,unsigned int nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[], -u32 sizes[], -const bool *ctx, +const char *const names[],const bool *ctx,struct irq_affinity *desc) {struct virtio_pci_device *vp_dev =to_vp_device (vdev);struct virtqueue *vq; -int rc =vp_find_vqs (vdev, nvqs, vqs, callbacks, names, sizes, ctx, - desc); +int rc =vp_find_vqs (vdev, nvqs, vqs, callbacks, names, ctx, desc);if (rc)return rc;
drivers/virtio/virtio_vdpa.c +0 -1
@@ -269,7 +269,6 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,struct virtqueue *vqs[], vq_callback_t *callbacks[], const char * const names[], - u32 sizes[], const bool *ctx, struct irq_affinity *desc) {
include/linux/virtio_config.h +5 -9
@@ -55,7 +55,6 @@ struct virtio_shm_region {* include a NULL entry for vqs that do not need a callback * names: array of virtqueue names (mainly for debugging) * include a NULL entry for vqs unused by driver -* sizes: array of virtqueue sizes * Returns 0 on success or error status * @del_vqs: free virtqueues found by find_vqs(). * @synchronize_cbs: synchronize with the virtqueue callbacks (optional)
@@ -104,9 +103,7 @@ struct virtio_config_ops {void (*reset)(struct virtio_device *vdev);int (*find_vqs)(struct virtio_device *,unsigned nvqs,struct virtqueue *vqs[],vq_callback_t *callbacks[], -const char *const names[], -u32 sizes[], -const bool *ctx, +const char *const names[],const bool *ctx,struct irq_affinity *desc);void (*del_vqs)(struct virtio_device *);void (*synchronize_cbs)(struct virtio_device *);
@@ -215,7 +212,7 @@ struct virtqueue *virtio_find_single_vq(struct virtio_device *vdev,const char *names[] = { n };struct virtqueue *vq;int err = vdev->config->find_vqs (vdev,1 , &vq, callbacks, names,NULL , -NULL ,NULL ); +NULL );if (err <0 )return ERR_PTR (err);return vq;
@@ -227,8 +224,7 @@ int virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,const char *const names[], struct irq_affinity *desc) { - return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, -NULL ,desc ); + return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, desc); } static inline
@@ -237,8 +233,8 @@ int virtio_find_vqs_ctx(struct virtio_device *vdev, unsigned nvqs, const char * const names[], const bool *ctx, struct irq_affinity *desc) { - return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, -ctx ,desc ); + return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, +desc ); }/**
Signature · 7 lines
MST _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um