[RFC net-next 05/13] virtio-net: rq submits premapped buffer per buffer

[Xuan Zhuo]

virtio-net rq submits premapped buffer per buffer.
And removes the call of the virtnet_rq_set_premapped().

Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
---
 drivers/net/virtio_net.c | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index af474cc191d0..ce83826df90f 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -539,6 +539,13 @@ static struct sk_buff *ptr_to_skb(void *ptr)
        return (struct sk_buff *)((unsigned long)ptr & ~VIRTIO_ORPHAN_FLAG);
 }
 
+static void sg_fill_dma(struct scatterlist *sg, dma_addr_t addr, u32 len)
+{
+       sg_assign_page(sg, NULL);
+       sg->dma_address = addr;
+       sg->length = len;
+}
+
 static void __free_old_xmit(struct send_queue *sq, struct netdev_queue *txq,
                            bool in_napi, struct virtnet_sq_free_stats *stats)
 {
@@ -907,8 +914,7 @@ static void virtnet_rq_init_one_sg(struct receive_queue 
*rq, void *buf, u32 len)
        addr = dma->addr - sizeof(*dma) + offset;
 
        sg_init_table(rq->sg, 1);
-       rq->sg[0].dma_address = addr;
-       rq->sg[0].length = len;
+       sg_fill_dma(&rq->sg[0], addr, len);
 }
 
 static void *virtnet_rq_alloc(struct receive_queue *rq, u32 size, gfp_t gfp)
@@ -967,19 +973,6 @@ static void *virtnet_rq_alloc(struct receive_queue *rq, 
u32 size, gfp_t gfp)
        return buf;
 }
 
-static void virtnet_rq_set_premapped(struct virtnet_info *vi)
-{
-       int i;
-
-       /* disable for big mode */
-       if (!vi->mergeable_rx_bufs && vi->big_packets)
-               return;
-
-       for (i = 0; i < vi->max_queue_pairs; i++)
-               /* error should never happen */
-               BUG_ON(virtqueue_set_dma_premapped(vi->rq[i].vq));
-}
-
 static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf)
 {
        struct virtnet_info *vi = vq->vdev->priv;
@@ -1071,12 +1064,6 @@ static void check_sq_full_and_disable(struct 
virtnet_info *vi,
        }
 }
 
-static void sg_fill_dma(struct scatterlist *sg, dma_addr_t addr, u32 len)
-{
-       sg->dma_address = addr;
-       sg->length = len;
-}
-
 static struct xdp_buff *buf_to_xdp(struct virtnet_info *vi,
                                   struct receive_queue *rq, void *buf, u32 len)
 {
@@ -6088,8 +6075,6 @@ static int init_vqs(struct virtnet_info *vi)
        if (ret)
                goto err_free;
 
-       virtnet_rq_set_premapped(vi);
-
        cpus_read_lock();
        virtnet_set_affinity(vi);
        cpus_read_unlock();
-- 
2.32.0.3.g01195cf9f