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

Commit 1756ac3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)
  drivers/char: Eliminate use after free
  virtio: console: Accept console size along with resize control message
  virtio: console: Store each console's size in the console structure
  virtio: console: Resize console port 0 on config intr only if multiport is off
  virtio: console: Add support for nonblocking write()s
  virtio: console: Rename wait_is_over() to will_read_block()
  virtio: console: Don't always create a port 0 if using multiport
  virtio: console: Use a control message to add ports
  virtio: console: Move code around for future patches
  virtio: console: Remove config work handler
  virtio: console: Don't call hvc_remove() on unplugging console ports
  virtio: console: Return -EPIPE to hvc_console if we lost the connection
  virtio: console: Let host know of port or device add failures
  virtio: console: Add a __send_control_msg() that can send messages without a valid port
  virtio: Revert "virtio: disable multiport console support."
  virtio: add_buf_gfp
  trans_virtio: use virtqueue_xxx wrappers
  virtio-rng: use virtqueue_xxx wrappers
  virtio_ring: remove a level of indirection
  virtio_net: use virtqueue_xxx wrappers
  ...

Fix up conflicts in drivers/net/virtio_net.c due to new virtqueue_xxx
wrappers changes conflicting with some other cleanups.
parents 98edb6ca 0643e4c6

drivers/block/virtio_blk.c

+43 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void blk_done(struct virtqueue *vq) 
	unsigned long flags;



	spin_lock_irqsave(&vblk->lock, flags);

	while ((vbr = vblk->vq->vq_ops->get_buf(vblk->vq, &len)) != NULL) {

	while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) {

		int error;



		switch (vbr->status) {
@@ -70,6 +70,8 @@ static void blk_done(struct virtqueue *vq) 
			vbr->req->sense_len = vbr->in_hdr.sense_len;

			vbr->req->errors = vbr->in_hdr.errors;

		}

		if (blk_special_request(vbr->req))

			vbr->req->errors = (error != 0);



		__blk_end_request_all(vbr->req, error);

		list_del(&vbr->list);
@@ -103,6 +105,11 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, 
		vbr->out_hdr.sector = 0;

		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);

		break;

	case REQ_TYPE_SPECIAL:

		vbr->out_hdr.type = VIRTIO_BLK_T_GET_ID;

		vbr->out_hdr.sector = 0;

		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);

		break;

	case REQ_TYPE_LINUX_BLOCK:

		if (req->cmd[0] == REQ_LB_OP_FLUSH) {

			vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;
@@ -151,7 +158,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, 
		}

	}



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

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

		mempool_free(vbr, vblk->pool);

		return false;

	}
@@ -180,7 +187,7 @@ static void do_virtblk_request(struct request_queue *q) 
	}



	if (issued)

		vblk->vq->vq_ops->kick(vblk->vq);

		virtqueue_kick(vblk->vq);

}



static void virtblk_prepare_flush(struct request_queue *q, struct request *req)
@@ -189,12 +196,45 @@ static void virtblk_prepare_flush(struct request_queue *q, struct request *req) 
	req->cmd[0] = REQ_LB_OP_FLUSH;

}



/* return id (s/n) string for *disk to *id_str

 */

static int virtblk_get_id(struct gendisk *disk, char *id_str)

{

	struct virtio_blk *vblk = disk->private_data;

	struct request *req;

	struct bio *bio;



	bio = bio_map_kern(vblk->disk->queue, id_str, VIRTIO_BLK_ID_BYTES,

			   GFP_KERNEL);

	if (IS_ERR(bio))

		return PTR_ERR(bio);



	req = blk_make_request(vblk->disk->queue, bio, GFP_KERNEL);

	if (IS_ERR(req)) {

		bio_put(bio);

		return PTR_ERR(req);

	}



	req->cmd_type = REQ_TYPE_SPECIAL;

	return blk_execute_rq(vblk->disk->queue, vblk->disk, req, false);

}



static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,

			 unsigned cmd, unsigned long data)

{

	struct gendisk *disk = bdev->bd_disk;

	struct virtio_blk *vblk = disk->private_data;



	if (cmd == 0x56424944) { /* 'VBID' */

		void __user *usr_data = (void __user *)data;

		char id_str[VIRTIO_BLK_ID_BYTES];

		int err;



		err = virtblk_get_id(disk, id_str);

		if (!err && copy_to_user(usr_data, id_str, VIRTIO_BLK_ID_BYTES))

			err = -EFAULT;

		return err;

	}

	/*

	 * Only allow the generic SCSI ioctls if the host can support it.

	 */

drivers/char/hw_random/virtio-rng.c

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static bool busy; 
static void random_recv_done(struct virtqueue *vq)

{

	/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */

	if (!vq->vq_ops->get_buf(vq, &data_avail))

	if (!virtqueue_get_buf(vq, &data_avail))

		return;



	complete(&have_data);
@@ -46,10 +46,10 @@ static void register_buffer(u8 *buf, size_t size) 
	sg_init_one(&sg, buf, size);



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

	if (vq->vq_ops->add_buf(vq, &sg, 0, 1, buf) < 0)

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

		BUG();



	vq->vq_ops->kick(vq);

	virtqueue_kick(vq);

}



static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)