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

Commit 45ba8d5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio updates from Michael Tsirkin:
 "Several fixes, most notably fix for virtio on swiotlb systems"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: silence an unused-variable warning
  virtio: hint if callbacks surprisingly might sleep
  virtio-ccw: wire up ->bus_name callback
  s390/virtio: handle find on invalid queue gracefully
  virtio-ccw: diag 500 may return a negative cookie
  virtio_balloon: remove the unnecessary 0-initialization
  virtio-balloon: improve update_balloon_size_func
  virtio-blk: Consider virtio_max_dma_size() for maximum segment size
  virtio: Introduce virtio_max_dma_size()
  dma: Introduce dma_max_mapping_size()
  swiotlb: Add is_swiotlb_active() function
  swiotlb: Introduce swiotlb_max_mapping_size()
parents bb97be23 cfdbb4ed

Documentation/DMA-API.txt

+8 −0
Original line number Diff line number Diff line
@@ -195,6 +195,14 @@ Requesting the required mask does not alter the current mask. If you 
wish to take advantage of it, you should issue a dma_set_mask()

call to set the mask to the value returned.



::



	size_t

	dma_direct_max_mapping_size(struct device *dev);



Returns the maximum size of a mapping for the device. The size parameter

of the mapping functions like dma_map_single(), dma_map_page() and

others should not be larger than the returned value.



Part Id - Streaming DMA mappings

--------------------------------

Documentation/virtual/kvm/s390-diag.txt

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ Subcode 3 - virtio-ccw notification 
    identifier, it is ignored.



    After completion of the DIAGNOSE call, general register 2 may contain

    a 64bit identifier (in the kvm_io_bus cookie case).

    a 64bit identifier (in the kvm_io_bus cookie case), or a negative

    error value, if an internal error occurred.



    See also the virtio standard for a discussion of this hypercall.

drivers/block/virtio_blk.c

+6 −4
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static int virtblk_probe(struct virtio_device *vdev) 
	struct request_queue *q;

	int err, index;



	u32 v, blk_size, sg_elems, opt_io_size;

	u32 v, blk_size, max_size, sg_elems, opt_io_size;

	u16 min_io_size;

	u8 physical_block_exp, alignment_offset;
@@ -826,14 +826,16 @@ static int virtblk_probe(struct virtio_device *vdev) 
	/* No real sector limit. */

	blk_queue_max_hw_sectors(q, -1U);



	max_size = virtio_max_dma_size(vdev);



	/* Host can optionally specify maximum segment size and number of

	 * segments. */

	err = virtio_cread_feature(vdev, VIRTIO_BLK_F_SIZE_MAX,

				   struct virtio_blk_config, size_max, &v);

	if (!err)

		blk_queue_max_segment_size(q, v);

	else

		blk_queue_max_segment_size(q, -1U);

		max_size = min(max_size, v);



	blk_queue_max_segment_size(q, max_size);



	/* Host can optionally specify the block size of the device */

	err = virtio_cread_feature(vdev, VIRTIO_BLK_F_BLK_SIZE,

drivers/s390/virtio/virtio_ccw.c

+11 −1
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ static void virtio_ccw_drop_indicators(struct virtio_ccw_device *vcdev) 
{

	struct virtio_ccw_vq_info *info;



	if (!vcdev->airq_info)

		return;

	list_for_each_entry(info, &vcdev->virtqueues, node)

		drop_airq_indicator(info->vq, vcdev->airq_info);

}
@@ -413,7 +415,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, 
	ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF);

	if (ret)

		return ret;

	return vcdev->config_block->num;

	return vcdev->config_block->num ?: -ENOENT;

}



static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw)
@@ -973,6 +975,13 @@ static void virtio_ccw_set_status(struct virtio_device *vdev, u8 status) 
	kfree(ccw);

}



static const char *virtio_ccw_bus_name(struct virtio_device *vdev)

{

	struct virtio_ccw_device *vcdev = to_vc_device(vdev);



	return dev_name(&vcdev->cdev->dev);

}



static const struct virtio_config_ops virtio_ccw_config_ops = {

	.get_features = virtio_ccw_get_features,

	.finalize_features = virtio_ccw_finalize_features,
@@ -983,6 +992,7 @@ static const struct virtio_config_ops virtio_ccw_config_ops = { 
	.reset = virtio_ccw_reset,

	.find_vqs = virtio_ccw_find_vqs,

	.del_vqs = virtio_ccw_del_vqs,

	.bus_name = virtio_ccw_bus_name,

};

drivers/vhost/vhost.c

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ static bool vq_access_ok(struct vhost_virtqueue *vq, unsigned int num, 
			 struct vring_used __user *used)



{

	size_t s = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;

	size_t s __maybe_unused = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;



	return access_ok(desc, num * sizeof *desc) &&

	       access_ok(avail,