Skip to content

Commit 4f7ffa8

Browse files
Hugh Dickinsgregkh
Hugh Dickins
authored andcommitted
iov_iter: fix copy_page_from_iter_atomic() if KMAP_LOCAL_FORCE_MAP
[ Upstream commit c749d9b ] generic/077 on x86_32 CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y with highmem, on huge=always tmpfs, issues a warning and then hangs (interruptibly): WARNING: CPU: 5 PID: 3517 at mm/highmem.c:622 kunmap_local_indexed+0x62/0xc9 CPU: 5 UID: 0 PID: 3517 Comm: cp Not tainted 6.12.0-rc4 #2 ... copy_page_from_iter_atomic+0xa6/0x5ec generic_perform_write+0xf6/0x1b4 shmem_file_write_iter+0x54/0x67 Fix copy_page_from_iter_atomic() by limiting it in that case (include/linux/skbuff.h skb_frag_must_loop() does similar). But going forward, perhaps CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is too surprising, has outlived its usefulness, and should just be removed? Fixes: 908a1ad ("iov_iter: Handle compound highmem pages in copy_page_from_iter_atomic()") Signed-off-by: Hugh Dickins <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Christoph Hellwig <[email protected]> Cc: [email protected] Signed-off-by: Christian Brauner <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent ade91f6 commit 4f7ffa8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/iov_iter.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,8 @@ size_t copy_page_from_iter_atomic(struct page *page, size_t offset,
570570
size_t bytes, struct iov_iter *i)
571571
{
572572
size_t n, copied = 0;
573+
bool uses_kmap = IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP) ||
574+
PageHighMem(page);
573575

574576
if (!page_copy_sane(page, offset, bytes))
575577
return 0;
@@ -580,7 +582,7 @@ size_t copy_page_from_iter_atomic(struct page *page, size_t offset,
580582
char *p;
581583

582584
n = bytes - copied;
583-
if (PageHighMem(page)) {
585+
if (uses_kmap) {
584586
page += offset / PAGE_SIZE;
585587
offset %= PAGE_SIZE;
586588
n = min_t(size_t, n, PAGE_SIZE - offset);
@@ -594,7 +596,7 @@ size_t copy_page_from_iter_atomic(struct page *page, size_t offset,
594596
kunmap_atomic(p);
595597
copied += n;
596598
offset += n;
597-
} while (PageHighMem(page) && copied != bytes && n > 0);
599+
} while (uses_kmap && copied != bytes && n > 0);
598600

599601
return copied;
600602
}

0 commit comments

Comments
 (0)