virtio_net: Do DIM update for specified queue only

Since we no longer have to hold the RTNL lock here just do updates for
the specified queue.

Signed-off-by: Daniel Jurgens <danielj@nvidia.com>
Reviewed-by: Heng Qi <hengqi@linux.alibaba.com>
Tested-by: Heng Qi <hengqi@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index d7bad74a395ff8cf0b75785492766bd2ecf1f6c3..386ded936bf1c891ce60077fbac4f26cbacb1fac 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -4383,38 +4383,28 @@ static void virtnet_rx_dim_work(struct work_struct *work)
        struct virtnet_info *vi = rq->vq->vdev->priv;
        struct net_device *dev = vi->dev;
        struct dim_cq_moder update_moder;
-       int i, qnum, err;
+       int qnum, err;
 
        if (!rtnl_trylock())
                return;
 
-       /* Each rxq's work is queued by "net_dim()->schedule_work()"
-        * in response to NAPI traffic changes. Note that dim->profile_ix
-        * for each rxq is updated prior to the queuing action.
-        * So we only need to traverse and update profiles for all rxqs
-        * in the work which is holding rtnl_lock.
-        */
-       for (i = 0; i < vi->curr_queue_pairs; i++) {
-               rq = &vi->rq[i];
-               dim = &rq->dim;
-               qnum = rq - vi->rq;
+       qnum = rq - vi->rq;
 
-               if (!rq->dim_enabled)
-                       continue;
+       if (!rq->dim_enabled)
+               goto out;
 
-               update_moder = net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
-               if (update_moder.usec != rq->intr_coal.max_usecs ||
-                   update_moder.pkts != rq->intr_coal.max_packets) {
-                       err = virtnet_send_rx_ctrl_coal_vq_cmd(vi, qnum,
-                                                              update_moder.usec,
-                                                              update_moder.pkts);
-                       if (err)
-                               pr_debug("%s: Failed to send dim parameters on rxq%d\n",
-                                        dev->name, qnum);
-                       dim->state = DIM_START_MEASURE;
-               }
+       update_moder = net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
+       if (update_moder.usec != rq->intr_coal.max_usecs ||
+           update_moder.pkts != rq->intr_coal.max_packets) {
+               err = virtnet_send_rx_ctrl_coal_vq_cmd(vi, qnum,
+                                                      update_moder.usec,
+                                                      update_moder.pkts);
+               if (err)
+                       pr_debug("%s: Failed to send dim parameters on rxq%d\n",
+                                dev->name, qnum);
+               dim->state = DIM_START_MEASURE;
        }
-
+out:
        rtnl_unlock();
 }