diff options
| author | Fabio M. De Francesco <fmdefrancesco@gmail.com> | 2022-09-01 15:29:06 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-09-20 08:42:44 +0200 |
| commit | 1d61261bfe8ae34764aa5a9d68af4ab15237719e (patch) | |
| tree | c142fadee5fb3bd87bfa367e4315b11ea5177aff /kernel/dma | |
| parent | 521a547ced6477c54b4b0cc206000406c221b4d6 (diff) | |
| download | lwn-1d61261bfe8ae34764aa5a9d68af4ab15237719e.tar.gz lwn-1d61261bfe8ae34764aa5a9d68af4ab15237719e.zip | |
swiotlb: replace kmap_atomic() with memcpy_{from,to}_page()
The use of kmap_atomic() is being deprecated in favor of
kmap_local_page(), which can also be used in atomic context (including
interrupts).
Replace kmap_atomic() with kmap_local_page(). Instead of open coding
mapping, memcpy(), and un-mapping, use the memcpy_{from,to}_page() helper.
Suggested-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/swiotlb.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 0ef6b12f961d..c54da87ec4aa 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -545,9 +545,8 @@ static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size } if (PageHighMem(pfn_to_page(pfn))) { - /* The buffer does not have a mapping. Map it in and copy */ unsigned int offset = orig_addr & ~PAGE_MASK; - char *buffer; + struct page *page; unsigned int sz = 0; unsigned long flags; @@ -555,12 +554,11 @@ static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size sz = min_t(size_t, PAGE_SIZE - offset, size); local_irq_save(flags); - buffer = kmap_atomic(pfn_to_page(pfn)); + page = pfn_to_page(pfn); if (dir == DMA_TO_DEVICE) - memcpy(vaddr, buffer + offset, sz); + memcpy_from_page(vaddr, page, offset, sz); else - memcpy(buffer + offset, vaddr, sz); - kunmap_atomic(buffer); + memcpy_to_page(page, offset, vaddr, sz); local_irq_restore(flags); size -= sz; |