[PATCH net-next v2 07/21] virtio_net: separate virtnet_tx_resize()

[Xuan Zhuo]

This patch separates two sub-functions from virtnet_tx_resize():

* virtnet_tx_pause
* virtnet_tx_resume

Then the subsequent virtnet_tx_reset() can share these two functions.

Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
Acked-by: Jason Wang <jasow...@redhat.com>
---
 drivers/net/virtio/main.c       | 35 +++++++++++++++++++++++++++------
 drivers/net/virtio/virtio_net.h |  2 ++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
index c9f8294153e2..16e75c08639e 100644
--- a/drivers/net/virtio/main.c
+++ b/drivers/net/virtio/main.c
@@ -2222,12 +2222,11 @@ static int virtnet_rx_resize(struct virtnet_info *vi,
        return err;
 }
 
-static int virtnet_tx_resize(struct virtnet_info *vi,
-                            struct virtnet_sq *sq, u32 ring_num)
+void virtnet_tx_pause(struct virtnet_info *vi, struct virtnet_sq *sq)
 {
        bool running = netif_running(vi->dev);
        struct netdev_queue *txq;
-       int err, qindex;
+       int qindex;
 
        qindex = sq - vi->sq;
 
@@ -2248,10 +2247,17 @@ static int virtnet_tx_resize(struct virtnet_info *vi,
        netif_stop_subqueue(vi->dev, qindex);
 
        __netif_tx_unlock_bh(txq);
+}
 
-       err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf);
-       if (err)
-               netdev_err(vi->dev, "resize tx fail: tx queue index: %d err: 
%d\n", qindex, err);
+void virtnet_tx_resume(struct virtnet_info *vi, struct virtnet_sq *sq)
+{
+       bool running = netif_running(vi->dev);
+       struct netdev_queue *txq;
+       int qindex;
+
+       qindex = sq - vi->sq;
+
+       txq = netdev_get_tx_queue(vi->dev, qindex);
 
        __netif_tx_lock_bh(txq);
        sq->reset = false;
@@ -2260,6 +2266,23 @@ static int virtnet_tx_resize(struct virtnet_info *vi,
 
        if (running)
                virtnet_napi_tx_enable(vi, sq->vq, &sq->napi);
+}
+
+static int virtnet_tx_resize(struct virtnet_info *vi, struct virtnet_sq *sq,
+                            u32 ring_num)
+{
+       int qindex, err;
+
+       qindex = sq - vi->sq;
+
+       virtnet_tx_pause(vi, sq);
+
+       err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf);
+       if (err)
+               netdev_err(vi->dev, "resize tx fail: tx queue index: %d err: 
%d\n", qindex, err);
+
+       virtnet_tx_resume(vi, sq);
+
        return err;
 }
 
diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h
index 693ca166fc93..d814341d9f97 100644
--- a/drivers/net/virtio/virtio_net.h
+++ b/drivers/net/virtio/virtio_net.h
@@ -193,4 +193,6 @@ struct virtnet_info {
 
 void virtnet_rx_pause(struct virtnet_info *vi, struct virtnet_rq *rq);
 void virtnet_rx_resume(struct virtnet_info *vi, struct virtnet_rq *rq);
+void virtnet_tx_pause(struct virtnet_info *vi, struct virtnet_sq *sq);
+void virtnet_tx_resume(struct virtnet_info *vi, struct virtnet_sq *sq);
 #endif
-- 
2.32.0.3.g01195cf9f

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization