Skip to content

Commit 274a2ee

Browse files
torvaldstorvalds
committed
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin: "Most notably this drops the commits that trip up google cloud (turns out, any legacy device). Plus a kerneldoc patch" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: kerneldocs fixes and enhancements virtio: Revert "virtio: find_vqs() add arg sizes" virtio_vdpa: Revert "virtio_vdpa: support the arg sizes of find_vqs()" virtio_pci: Revert "virtio_pci: support the arg sizes of find_vqs()" virtio-mmio: Revert "virtio_mmio: support the arg sizes of find_vqs()" virtio: Revert "virtio: add helper virtio_find_vqs_ctx_size()" virtio_net: Revert "virtio_net: set the default max ring size by find_vqs()"
2 parents 3cc40a4 + 5c669c4 commit 274a2ee

15 files changed

Lines changed: 59 additions & 121 deletions

File tree

‎arch/um/drivers/virtio_uml.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,
10111011

10121012
static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs,
10131013
struct virtqueue *vqs[], vq_callback_t *callbacks[],
1014-
const char * const names[], u32 sizes[], const bool *ctx,
1014+
const char * const names[], const bool *ctx,
10151015
struct irq_affinity *desc)
10161016
{
10171017
struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev);

‎drivers/net/virtio_net.c‎

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3432,37 +3432,13 @@ static unsigned int mergeable_min_buf_len(struct virtnet_info *vi, struct virtqu
34323432
(unsigned int)GOOD_PACKET_LEN);
34333433
}
34343434

3435-
static void virtnet_config_sizes(struct virtnet_info *vi, u32 *sizes)
3436-
{
3437-
u32 i, rx_size, tx_size;
3438-
3439-
if (vi->speed == SPEED_UNKNOWN || vi->speed < SPEED_10000) {
3440-
rx_size = 1024;
3441-
tx_size = 1024;
3442-
3443-
} else if (vi->speed < SPEED_40000) {
3444-
rx_size = 1024 * 4;
3445-
tx_size = 1024 * 4;
3446-
3447-
} else {
3448-
rx_size = 1024 * 8;
3449-
tx_size = 1024 * 8;
3450-
}
3451-
3452-
for (i = 0; i < vi->max_queue_pairs; i++) {
3453-
sizes[rxq2vq(i)] = rx_size;
3454-
sizes[txq2vq(i)] = tx_size;
3455-
}
3456-
}
3457-
34583435
static int virtnet_find_vqs(struct virtnet_info *vi)
34593436
{
34603437
vq_callback_t **callbacks;
34613438
struct virtqueue **vqs;
34623439
int ret = -ENOMEM;
34633440
int i, total_vqs;
34643441
const char **names;
3465-
u32 *sizes;
34663442
bool *ctx;
34673443

34683444
/* 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)
34903466
ctx = NULL;
34913467
}
34923468

3493-
sizes = kmalloc_array(total_vqs, sizeof(*sizes), GFP_KERNEL);
3494-
if (!sizes)
3495-
goto err_sizes;
3496-
34973469
/* Parameters for control virtqueue, if any */
34983470
if (vi->has_cvq) {
34993471
callbacks[total_vqs - 1] = NULL;
35003472
names[total_vqs - 1] = "control";
3501-
sizes[total_vqs - 1] = 64;
35023473
}
35033474

35043475
/* Allocate/initialize parameters for send/receive virtqueues */
@@ -3513,10 +3484,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
35133484
ctx[rxq2vq(i)] = true;
35143485
}
35153486

3516-
virtnet_config_sizes(vi, sizes);
3517-
3518-
ret = virtio_find_vqs_ctx_size(vi->vdev, total_vqs, vqs, callbacks,
3519-
names, sizes, ctx, NULL);
3487+
ret = virtio_find_vqs_ctx(vi->vdev, total_vqs, vqs, callbacks,
3488+
names, ctx, NULL);
35203489
if (ret)
35213490
goto err_find;
35223491

@@ -3536,8 +3505,6 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
35363505

35373506

35383507
err_find:
3539-
kfree(sizes);
3540-
err_sizes:
35413508
kfree(ctx);
35423509
err_ctx:
35433510
kfree(names);
@@ -3897,9 +3864,6 @@ static int virtnet_probe(struct virtio_device *vdev)
38973864
vi->curr_queue_pairs = num_online_cpus();
38983865
vi->max_queue_pairs = max_queue_pairs;
38993866

3900-
virtnet_init_settings(dev);
3901-
virtnet_update_settings(vi);
3902-
39033867
/* Allocate/initialize the rx/tx queues, and invoke find_vqs */
39043868
err = init_vqs(vi);
39053869
if (err)
@@ -3912,6 +3876,8 @@ static int virtnet_probe(struct virtio_device *vdev)
39123876
netif_set_real_num_tx_queues(dev, vi->curr_queue_pairs);
39133877
netif_set_real_num_rx_queues(dev, vi->curr_queue_pairs);
39143878

3879+
virtnet_init_settings(dev);
3880+
39153881
if (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) {
39163882
vi->failover = net_failover_create(vi->dev);
39173883
if (IS_ERR(vi->failover)) {

‎drivers/platform/mellanox/mlxbf-tmfifo.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,6 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
928928
struct virtqueue *vqs[],
929929
vq_callback_t *callbacks[],
930930
const char * const names[],
931-
u32 sizes[],
932931
const bool *ctx,
933932
struct irq_affinity *desc)
934933
{

‎drivers/remoteproc/remoteproc_virtio.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
158158
struct virtqueue *vqs[],
159159
vq_callback_t *callbacks[],
160160
const char * const names[],
161-
u32 sizes[],
162161
const bool * ctx,
163162
struct irq_affinity *desc)
164163
{

‎drivers/s390/virtio/virtio_ccw.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
637637
struct virtqueue *vqs[],
638638
vq_callback_t *callbacks[],
639639
const char * const names[],
640-
u32 sizes[],
641640
const bool *ctx,
642641
struct irq_affinity *desc)
643642
{

‎drivers/virtio/virtio_mmio.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static void vm_synchronize_cbs(struct virtio_device *vdev)
360360

361361
static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int index,
362362
void (*callback)(struct virtqueue *vq),
363-
const char *name, u32 size, bool ctx)
363+
const char *name, bool ctx)
364364
{
365365
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
366366
struct virtio_mmio_vq_info *info;
@@ -395,11 +395,8 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in
395395
goto error_new_virtqueue;
396396
}
397397

398-
if (!size || size > num)
399-
size = num;
400-
401398
/* Create the vring */
402-
vq = vring_create_virtqueue(index, size, VIRTIO_MMIO_VRING_ALIGN, vdev,
399+
vq = vring_create_virtqueue(index, num, VIRTIO_MMIO_VRING_ALIGN, vdev,
403400
true, true, ctx, vm_notify, callback, name);
404401
if (!vq) {
405402
err = -ENOMEM;
@@ -477,7 +474,6 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
477474
struct virtqueue *vqs[],
478475
vq_callback_t *callbacks[],
479476
const char * const names[],
480-
u32 sizes[],
481477
const bool *ctx,
482478
struct irq_affinity *desc)
483479
{
@@ -503,7 +499,6 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
503499
}
504500

505501
vqs[i] = vm_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
506-
sizes ? sizes[i] : 0,
507502
ctx ? ctx[i] : false);
508503
if (IS_ERR(vqs[i])) {
509504
vm_del_vqs(vdev);

‎drivers/virtio/virtio_pci_common.c‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
174174
static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int index,
175175
void (*callback)(struct virtqueue *vq),
176176
const char *name,
177-
u32 size,
178177
bool ctx,
179178
u16 msix_vec)
180179
{
@@ -187,7 +186,7 @@ static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int in
187186
if (!info)
188187
return ERR_PTR(-ENOMEM);
189188

190-
vq = vp_dev->setup_vq(vp_dev, info, index, callback, name, size, ctx,
189+
vq = vp_dev->setup_vq(vp_dev, info, index, callback, name, ctx,
191190
msix_vec);
192191
if (IS_ERR(vq))
193192
goto out_info;
@@ -284,7 +283,7 @@ void vp_del_vqs(struct virtio_device *vdev)
284283

285284
static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,
286285
struct virtqueue *vqs[], vq_callback_t *callbacks[],
287-
const char * const names[], u32 sizes[], bool per_vq_vectors,
286+
const char * const names[], bool per_vq_vectors,
288287
const bool *ctx,
289288
struct irq_affinity *desc)
290289
{
@@ -327,8 +326,8 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,
327326
else
328327
msix_vec = VP_MSIX_VQ_VECTOR;
329328
vqs[i] = vp_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
330-
sizes ? sizes[i] : 0,
331-
ctx ? ctx[i] : false, msix_vec);
329+
ctx ? ctx[i] : false,
330+
msix_vec);
332331
if (IS_ERR(vqs[i])) {
333332
err = PTR_ERR(vqs[i]);
334333
goto error_find;
@@ -358,7 +357,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,
358357

359358
static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,
360359
struct virtqueue *vqs[], vq_callback_t *callbacks[],
361-
const char * const names[], u32 sizes[], const bool *ctx)
360+
const char * const names[], const bool *ctx)
362361
{
363362
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
364363
int i, err, queue_idx = 0;
@@ -380,7 +379,6 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,
380379
continue;
381380
}
382381
vqs[i] = vp_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
383-
sizes ? sizes[i] : 0,
384382
ctx ? ctx[i] : false,
385383
VIRTIO_MSI_NO_VECTOR);
386384
if (IS_ERR(vqs[i])) {
@@ -398,21 +396,21 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,
398396
/* the config->find_vqs() implementation */
399397
int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
400398
struct virtqueue *vqs[], vq_callback_t *callbacks[],
401-
const char * const names[], u32 sizes[], const bool *ctx,
399+
const char * const names[], const bool *ctx,
402400
struct irq_affinity *desc)
403401
{
404402
int err;
405403

406404
/* Try MSI-X with one vector per queue. */
407-
err = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, sizes, true, ctx, desc);
405+
err = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, true, ctx, desc);
408406
if (!err)
409407
return 0;
410408
/* Fallback: MSI-X with one vector for config, one shared for queues. */
411-
err = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, sizes, false, ctx, desc);
409+
err = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, false, ctx, desc);
412410
if (!err)
413411
return 0;
414412
/* Finally fall back to regular interrupts. */
415-
return vp_find_vqs_intx(vdev, nvqs, vqs, callbacks, names, sizes, ctx);
413+
return vp_find_vqs_intx(vdev, nvqs, vqs, callbacks, names, ctx);
416414
}
417415

418416
const char *vp_bus_name(struct virtio_device *vdev)

‎drivers/virtio/virtio_pci_common.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ struct virtio_pci_device {
8080
unsigned int idx,
8181
void (*callback)(struct virtqueue *vq),
8282
const char *name,
83-
u32 size,
8483
bool ctx,
8584
u16 msix_vec);
8685
void (*del_vq)(struct virtio_pci_vq_info *info);
@@ -111,7 +110,7 @@ void vp_del_vqs(struct virtio_device *vdev);
111110
/* the config->find_vqs() implementation */
112111
int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
113112
struct virtqueue *vqs[], vq_callback_t *callbacks[],
114-
const char * const names[], u32 sizes[], const bool *ctx,
113+
const char * const names[], const bool *ctx,
115114
struct irq_affinity *desc);
116115
const char *vp_bus_name(struct virtio_device *vdev);
117116

‎drivers/virtio/virtio_pci_legacy.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
112112
unsigned int index,
113113
void (*callback)(struct virtqueue *vq),
114114
const char *name,
115-
u32 size,
116115
bool ctx,
117116
u16 msix_vec)
118117
{
@@ -126,13 +125,10 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
126125
if (!num || vp_legacy_get_queue_enable(&vp_dev->ldev, index))
127126
return ERR_PTR(-ENOENT);
128127

129-
if (!size || size > num)
130-
size = num;
131-
132128
info->msix_vector = msix_vec;
133129

134130
/* create the vring */
135-
vq = vring_create_virtqueue(index, size,
131+
vq = vring_create_virtqueue(index, num,
136132
VIRTIO_PCI_VRING_ALIGN, &vp_dev->vdev,
137133
true, false, ctx,
138134
vp_notify, callback, name);

‎drivers/virtio/virtio_pci_modern.c‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
293293
unsigned int index,
294294
void (*callback)(struct virtqueue *vq),
295295
const char *name,
296-
u32 size,
297296
bool ctx,
298297
u16 msix_vec)
299298
{
@@ -311,18 +310,15 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
311310
if (!num || vp_modern_get_queue_enable(mdev, index))
312311
return ERR_PTR(-ENOENT);
313312

314-
if (!size || size > num)
315-
size = num;
316-
317-
if (size & (size - 1)) {
318-
dev_warn(&vp_dev->pci_dev->dev, "bad queue size %u", size);
313+
if (num & (num - 1)) {
314+
dev_warn(&vp_dev->pci_dev->dev, "bad queue size %u", num);
319315
return ERR_PTR(-EINVAL);
320316
}
321317

322318
info->msix_vector = msix_vec;
323319

324320
/* create the vring */
325-
vq = vring_create_virtqueue(index, size,
321+
vq = vring_create_virtqueue(index, num,
326322
SMP_CACHE_BYTES, &vp_dev->vdev,
327323
true, true, ctx,
328324
vp_notify, callback, name);
@@ -351,15 +347,12 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
351347
static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
352348
struct virtqueue *vqs[],
353349
vq_callback_t *callbacks[],
354-
const char * const names[],
355-
u32 sizes[],
356-
const bool *ctx,
350+
const char * const names[], const bool *ctx,
357351
struct irq_affinity *desc)
358352
{
359353
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
360354
struct virtqueue *vq;
361-
int rc = vp_find_vqs(vdev, nvqs, vqs, callbacks, names, sizes, ctx,
362-
desc);
355+
int rc = vp_find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, desc);
363356

364357
if (rc)
365358
return rc;

0 commit comments

Comments
 (0)