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

Pull virtio updates from Michael Tsirkin:
 "Just fixes and cleanups this time around. The mapping cleanups are
  preparing the ground for new features, though"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio-vdpa: Drop redundant conversion to bool
  vduse: Use fixed 4KB bounce pages for non-4KB page size
  vduse: switch to use virtio map API instead of DMA API
  vdpa: introduce map ops
  vdpa: support virtio_map
  virtio: introduce map ops in virtio core
  virtio_ring: rename dma_handle to map_handle
  virtio: introduce virtio_map container union
  virtio: rename dma helpers
  virtio_ring: switch to use dma_{map|unmap}_page()
  virtio_ring: constify virtqueue pointer for DMA helpers
  virtio_balloon: Remove redundant __GFP_NOWARN
  vhost: vringh: Fix copy_to_iter return value check
  vhost: vringh: Modify the return value check

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/virtio/virtio_balloon.c
Simple merge

diff --cc drivers/virtio/virtio_ring.c
index c147145a65930bca9d12f8a31ee32d7cc03f8836,f91a432b3e534f547f1dc44f0132c4b8d8b19dee..7b6205253b46b3235ce81cc823a5c8431b466068
--- 1/drivers/virtio/virtio_ring.c
--- 2/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@@ -3147,17 -3249,17 +3249,17 @@@ EXPORT_SYMBOL_GPL(virtqueue_unmap_page_
   * The caller calls this to do dma mapping in advance. The DMA address can be
   * passed to this _vq when it is in pre-mapped mode.
   *
-  * return DMA address. Caller should check that by virtqueue_dma_mapping_error().
+  * return mapped address. Caller should check that by virtqueue_mapping_error().
   */
- dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr,
-                                         size_t size,
-                                         enum dma_data_direction dir,
-                                         unsigned long attrs)
+ dma_addr_t virtqueue_map_single_attrs(const struct virtqueue *_vq, void *ptr,
+                                     size_t size,
+                                     enum dma_data_direction dir,
+                                     unsigned long attrs)
  {
-       struct vring_virtqueue *vq = to_vvq(_vq);
+       const struct vring_virtqueue *vq = to_vvq(_vq);
  
-       if (!vq->use_dma_api) {
+       if (!vq->use_map_api) {
 -              kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir);
 +              kmsan_handle_dma(virt_to_phys(ptr), size, dir);
                return (dma_addr_t)virt_to_phys(ptr);
        }