Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f96fde41 authored by Rusty Russell's avatar Rusty Russell
Browse files

virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf 



Remove wrapper functions. This makes the allocation type explicit in
all callers; I used GPF_KERNEL where it seemed obvious, left it at
GFP_ATOMIC otherwise.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 5dfc1762

drivers/block/virtio_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, 
		}

	}



	if (virtqueue_add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) {

	if (virtqueue_add_buf(vblk->vq, vblk->sg, out, in, vbr, GFP_ATOMIC)<0) {

		mempool_free(vbr, vblk->pool);

		return false;

	}

drivers/char/hw_random/virtio-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void register_buffer(u8 *buf, size_t size) 
	sg_init_one(&sg, buf, size);



	/* There should always be room for one buffer. */

	if (virtqueue_add_buf(vq, &sg, 0, 1, buf) < 0)

	if (virtqueue_add_buf(vq, &sg, 0, 1, buf, GFP_KERNEL) < 0)

		BUG();



	virtqueue_kick(vq);

drivers/char/virtio_console.c

+3 −3
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int add_inbuf(struct virtqueue *vq, struct port_buffer *buf) 


	sg_init_one(sg, buf->buf, buf->size);



	ret = virtqueue_add_buf(vq, sg, 0, 1, buf);

	ret = virtqueue_add_buf(vq, sg, 0, 1, buf, GFP_ATOMIC);

	virtqueue_kick(vq);

	return ret;

}
@@ -457,7 +457,7 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id, 
	vq = portdev->c_ovq;



	sg_init_one(sg, &cpkt, sizeof(cpkt));

	if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt) >= 0) {

	if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) >= 0) {

		virtqueue_kick(vq);

		while (!virtqueue_get_buf(vq, &len))

			cpu_relax();
@@ -506,7 +506,7 @@ static ssize_t send_buf(struct port *port, void *in_buf, size_t in_count, 
	reclaim_consumed_buffers(port);



	sg_init_one(sg, in_buf, in_count);

	ret = virtqueue_add_buf(out_vq, sg, 1, 0, in_buf);

	ret = virtqueue_add_buf(out_vq, sg, 1, 0, in_buf, GFP_ATOMIC);



	/* Tell Host to go! */

	virtqueue_kick(out_vq);

drivers/net/virtio_net.c

+6 −6
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp) 


	skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len);



	err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);

	err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 2, skb, gfp);

	if (err < 0)

		dev_kfree_skb(skb);
@@ -415,7 +415,7 @@ static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp) 


	/* chain first in list head */

	first->private = (unsigned long)list;

	err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,

	err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2,

				first, gfp);

	if (err < 0)

		give_pages(vi, first);
@@ -434,7 +434,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp) 


	sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE);



	err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 1, page, gfp);

	err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 1, page, gfp);

	if (err < 0)

		give_pages(vi, page);
@@ -609,7 +609,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb) 


	hdr->num_sg = skb_to_sgvec(skb, vi->tx_sg + 1, 0, skb->len) + 1;

	return virtqueue_add_buf(vi->svq, vi->tx_sg, hdr->num_sg,

					0, skb);

				 0, skb, GFP_ATOMIC);

}



static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -767,7 +767,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, 
		sg_set_buf(&sg[i + 1], sg_virt(s), s->length);

	sg_set_buf(&sg[out + in - 1], &status, sizeof(status));



	BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi) < 0);

	BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi, GFP_ATOMIC) < 0);



	virtqueue_kick(vi->cvq);

drivers/virtio/virtio_balloon.c

+4 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq) 
	init_completion(&vb->acked);



	/* We should always be able to add one buffer to an empty queue. */

	if (virtqueue_add_buf(vq, &sg, 1, 0, vb) < 0)

	if (virtqueue_add_buf(vq, &sg, 1, 0, vb, GFP_KERNEL) < 0)

		BUG();

	virtqueue_kick(vq);
@@ -220,7 +220,7 @@ static void stats_handle_request(struct virtio_balloon *vb) 


	vq = vb->stats_vq;

	sg_init_one(&sg, vb->stats, sizeof(vb->stats));

	if (virtqueue_add_buf(vq, &sg, 1, 0, vb) < 0)

	if (virtqueue_add_buf(vq, &sg, 1, 0, vb, GFP_KERNEL) < 0)

		BUG();

	virtqueue_kick(vq);

}
@@ -313,7 +313,8 @@ static int virtballoon_probe(struct virtio_device *vdev) 
		 * use it to signal us later.

		 */

		sg_init_one(&sg, vb->stats, sizeof vb->stats);

		if (virtqueue_add_buf(vb->stats_vq, &sg, 1, 0, vb) < 0)

		if (virtqueue_add_buf(vb->stats_vq, &sg, 1, 0, vb, GFP_KERNEL)

		    < 0)

			BUG();

		virtqueue_kick(vb->stats_vq);

	}