| Message ID | 20190801164702.GA26365@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] arm highmem block I/O regression fix for 5.3 | expand |
The pull request you sent on Thu, 1 Aug 2019 19:47:02 +0300:
> git://git.infradead.org/users/hch/dma-mapping.git tags/arm-swiotlb-5.3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/234172f6bbf8e26fa8407c4bbbf2a36da30d7913
Thank you!
And here is another somewhat unusual pull request, mostly because it touches almost entirely arch/arm, but to fix a block regression. I would have preferred to feed this through the arm tree, but after the original thread in reply to the bug report I haven't heard anything back from Russell. The following changes since commit 06532750010e06dd4b6d69983773677df7fc5291: dma-mapping: use dma_get_mask in dma_addressing_limited (2019-07-23 17:43:58 +0200) are available in the Git repository at: git://git.infradead.org/users/hch/dma-mapping.git tags/arm-swiotlb-5.3 for you to fetch changes up to ad3c7b18c5b362be5dbd0f2c0bcf1fd5fd659315: arm: use swiotlb for bounce buffering on LPAE configs (2019-07-24 17:29:01 +0200) ---------------------------------------------------------------- add swiotlb support to arm This fixes a cascade of regressions that originally started with the addition of the ia64 port, but only got fatal once we removed most uses of block layer bounce buffering in Linux 4.18. The reason is that while the original i386/PAE code that was the first architecture that supported > 4GB of memory without an iommu decided to leave bounce buffering to the subsystems, which in those days just mean block and networking as no one else consumer arbitrary userspace memory. Later with ia64, x86_64 and other ports we assumed that either an iommu or something that fakes it up ("software IOTLB" in beautiful Intel speak) is present and that subsystems can rely on that for dealing with addressing limitations in devices. Except that the ARM LPAE scheme that added larger physical address to 32-bit ARM did not follow that scheme and thus only worked by chance and only for block and networking I/O directly to highmem. Long story, short fix - add swiotlb support to arm when build for LPAE platforms, which actuallys turns out to be pretty trivial with the modern dma-direct / swiotlb code to fix the Linux 4.18-ish regression. ---------------------------------------------------------------- Christoph Hellwig (2): dma-mapping: check pfn validity in dma_common_{mmap,get_sgtable} arm: use swiotlb for bounce buffering on LPAE configs arch/arm/include/asm/dma-mapping.h | 4 ++- arch/arm/mm/Kconfig | 5 ++++ arch/arm/mm/dma-mapping.c | 61 ++++++++++++++++++++++++++++++++++++++ arch/arm/mm/init.c | 5 ++++ kernel/dma/mapping.c | 13 ++++++-- 5 files changed, 85 insertions(+), 3 deletions(-)