virtio_net: convert to use virtio_find_vqs_info()

Instead of passing separate names and callbacks arrays
to virtio_find_vqs_ctx(), allocate one of virtual_queue_info structs
and pass it to virtio_find_vqs_info().

Suggested-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Message-Id: <20240708074814.1739223-14-jiri@resnulli.us>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index ea10db9a09fa21183b24c1ab7939baec17f2b600..7a0a44216bec24d2351db08e591fab369835294c 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -5293,9 +5293,8 @@ static unsigned int mergeable_min_buf_len(struct virtnet_info *vi, struct virtqu
 
 static int virtnet_find_vqs(struct virtnet_info *vi)
 {
-       vq_callback_t **callbacks;
+       struct virtqueue_info *vqs_info;
        struct virtqueue **vqs;
-       const char **names;
        int ret = -ENOMEM;
        int total_vqs;
        bool *ctx;
@@ -5312,12 +5311,9 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
        vqs = kcalloc(total_vqs, sizeof(*vqs), GFP_KERNEL);
        if (!vqs)
                goto err_vq;
-       callbacks = kmalloc_array(total_vqs, sizeof(*callbacks), GFP_KERNEL);
-       if (!callbacks)
-               goto err_callback;
-       names = kmalloc_array(total_vqs, sizeof(*names), GFP_KERNEL);
-       if (!names)
-               goto err_names;
+       vqs_info = kcalloc(total_vqs, sizeof(*vqs_info), GFP_KERNEL);
+       if (!vqs_info)
+               goto err_vqs_info;
        if (!vi->big_packets || vi->mergeable_rx_bufs) {
                ctx = kcalloc(total_vqs, sizeof(*ctx), GFP_KERNEL);
                if (!ctx)
@@ -5328,24 +5324,22 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
 
        /* Parameters for control virtqueue, if any */
        if (vi->has_cvq) {
-               callbacks[total_vqs - 1] = NULL;
-               names[total_vqs - 1] = "control";
+               vqs_info[total_vqs - 1].name = "control";
        }
 
        /* Allocate/initialize parameters for send/receive virtqueues */
        for (i = 0; i < vi->max_queue_pairs; i++) {
-               callbacks[rxq2vq(i)] = skb_recv_done;
-               callbacks[txq2vq(i)] = skb_xmit_done;
+               vqs_info[rxq2vq(i)].callback = skb_recv_done;
+               vqs_info[txq2vq(i)].callback = skb_xmit_done;
                sprintf(vi->rq[i].name, "input.%u", i);
                sprintf(vi->sq[i].name, "output.%u", i);
-               names[rxq2vq(i)] = vi->rq[i].name;
-               names[txq2vq(i)] = vi->sq[i].name;
+               vqs_info[rxq2vq(i)].name = vi->rq[i].name;
+               vqs_info[txq2vq(i)].name = vi->sq[i].name;
                if (ctx)
-                       ctx[rxq2vq(i)] = true;
+                       vqs_info[rxq2vq(i)].ctx = true;
        }
 
-       ret = virtio_find_vqs_ctx(vi->vdev, total_vqs, vqs, callbacks,
-                                 names, ctx, NULL);
+       ret = virtio_find_vqs_info(vi->vdev, total_vqs, vqs, vqs_info, NULL);
        if (ret)
                goto err_find;
 
@@ -5367,10 +5361,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
 err_find:
        kfree(ctx);
 err_ctx:
-       kfree(names);
-err_names:
-       kfree(callbacks);
-err_callback:
+       kfree(vqs_info);
+err_vqs_info:
        kfree(vqs);
 err_vq:
        return ret;