Merge tag 'dma-mapping-6.10-2024-05-20' of git://git.infradead.org/users/hch/dma...
commitdaa121128a2d2ac6006159e2c47676e4fcd21eab
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 May 2024 17:23:39 +0000 (20 10:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 May 2024 17:23:39 +0000 (20 10:23 -0700)
tree92f5ebb4ebc9be3535c5c3905ba40ab68cbdf964
parent6e51b4b5bbc07e52b226017936874715629932d1
parenta6016aac5252da9d22a4dc0b98121b0acdf6d2f5
Merge tag 'dma-mapping-6.10-2024-05-20' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - optimize DMA sync calls when they are no-ops (Alexander Lobakin)

 - fix swiotlb padding for untrusted devices (Michael Kelley)

 - add documentation for swiotb (Michael Kelley)

* tag 'dma-mapping-6.10-2024-05-20' of git://git.infradead.org/users/hch/dma-mapping:
  dma: fix DMA sync for drivers not calling dma_set_mask*()
  xsk: use generic DMA sync shortcut instead of a custom one
  page_pool: check for DMA sync shortcut earlier
  page_pool: don't use driver-set flags field directly
  page_pool: make sure frag API fields don't span between cachelines
  iommu/dma: avoid expensive indirect calls for sync operations
  dma: avoid redundant calls for sync operations
  dma: compile-out DMA sync op calls when not used
  iommu/dma: fix zeroing of bounce buffer padding used by untrusted devices
  swiotlb: remove alloc_size argument to swiotlb_tbl_map_single()
  Documentation/core-api: add swiotlb documentation
12 files changed:
drivers/iommu/dma-iommu.c
drivers/net/ethernet/intel/i40e/i40e_xsk.c
drivers/net/ethernet/intel/ice/ice_xsk.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/xen/swiotlb-xen.c
include/linux/dma-map-ops.h
include/net/page_pool/types.h
kernel/dma/mapping.c
kernel/dma/swiotlb.c
net/core/page_pool.c