[PATCH] ata: libata-sff: replace kmap_atomic() with kmap_local_page()
From: Danish Khateeb
Date: Mon Sep 21 2026 - 14:28:34 EST
kmap_atomic() is deprecated in favour of kmap_local_page(), as described
in Documentation/mm/highmem.rst.
ata_pio_xfer() and __atapi_pio_bytes() each map a single page, pass the
address to ->sff_data_xfer() for one transfer and unmap it again, so the
mapping never leaves the function that created it.
Neither needs the pagefault_disable() and preempt_disable() implied by
kmap_atomic(). ->sff_data_xfer() only moves data between the device and
the mapped buffer, and both functions are reached only through
ata_sff_hsm_move() with the host lock held, whether from the PIO task,
an interrupt handler or EH. kmap_local_page() is fine in all of these.
Tested on i386 with CONFIG_HIGHMEM4G and CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP
under QEMU, with the PIIX IDE controller limited to PIO by
libata.force=pio4: O_DIRECT and buffered reads from an ATA disk and an
ATAPI CD-ROM, and O_DIRECT writes to the disk, all checked against the
image files. The O_DIRECT buffers were in highmem. Both call sites ran
in hardirq context, and ata_pio_xfer() also from the PIO task. No
warnings with lockdep and CONFIG_DEBUG_ATOMIC_SLEEP enabled.
Assisted-by: LLM sparse
Signed-off-by: Danish Khateeb <danishkhateeb03@xxxxxxxxx>
---
drivers/ata/libata-sff.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index d5ef0338735c..a263f886abc7 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -580,9 +580,9 @@ static void ata_pio_xfer(struct ata_queued_cmd *qc, struct page *page,
bool do_write = (qc->tf.flags & ATA_TFLAG_WRITE);
unsigned char *buf;
- buf = kmap_atomic(page);
+ buf = kmap_local_page(page);
qc->ap->ops->sff_data_xfer(qc, buf + offset, xfer_size, do_write);
- kunmap_atomic(buf);
+ kunmap_local(buf);
if (!do_write && !PageSlab(page))
flush_dcache_page(page);
@@ -763,9 +763,9 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
trace_atapi_pio_transfer_data(qc, offset, count);
/* do the actual data transfer */
- buf = kmap_atomic(page);
+ buf = kmap_local_page(page);
consumed = ap->ops->sff_data_xfer(qc, buf + offset, count, rw);
- kunmap_atomic(buf);
+ kunmap_local(buf);
bytes -= min(bytes, consumed);
qc->curbytes += count;
base-commit: 3bab8c7e0c6ba187a47163a1f71477213a278c48
--
2.55.0