Commit 80f50f91 authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Jakub Kicinski
Browse files

virtio_net: separate the logic of freeing the rest mergeable buf 



This patch introduce a new function that frees the rest mergeable buf.
The subsequent patch will reuse this function.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bb2c1e9e

drivers/net/virtio_net.c

+24 −12
Original line number Diff line number Diff line
@@ -1071,6 +1071,28 @@ static struct sk_buff *receive_big(struct net_device *dev, 
	return NULL;

}



static void mergeable_buf_free(struct receive_queue *rq, int num_buf,

			       struct net_device *dev,

			       struct virtnet_rq_stats *stats)

{

	struct page *page;

	void *buf;

	int len;



	while (num_buf-- > 1) {

		buf = virtqueue_get_buf(rq->vq, &len);

		if (unlikely(!buf)) {

			pr_debug("%s: rx error: %d buffers missing\n",

				 dev->name, num_buf);

			dev->stats.rx_length_errors++;

			break;

		}

		stats->bytes += len;

		page = virt_to_head_page(buf);

		put_page(page);

	}

}



/* Why not use xdp_build_skb_from_frame() ?

 * XDP core assumes that xdp frags are PAGE_SIZE in length, while in

 * virtio-net there are 2 points that do not match its requirements:
@@ -1431,18 +1453,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
	stats->xdp_drops++;

err_skb:

	put_page(page);

	while (num_buf-- > 1) {

		buf = virtqueue_get_buf(rq->vq, &len);

		if (unlikely(!buf)) {

			pr_debug("%s: rx error: %d buffers missing\n",

				 dev->name, num_buf);

			dev->stats.rx_length_errors++;

			break;

		}

		stats->bytes += len;

		page = virt_to_head_page(buf);

		put_page(page);

	}

	mergeable_buf_free(rq, num_buf, dev, stats);



err_buf:

	stats->drops++;

	dev_kfree_skb(head_skb);