Commit fb4037b1 authored by Hugh Dickins's avatar Hugh Dickins Committed by Wen Zhiwei
Browse files

iov_iter: fix copy_page_from_iter_atomic() if KMAP_LOCAL_FORCE_MAP 

stable inclusion
from stable-v6.6.60
commit 4f7ffa83fa79dd52efbaef366c850aaaae06a469
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB44K1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4f7ffa83fa79dd52efbaef366c850aaaae06a469



--------------------------------

[ Upstream commit c749d9b7ebbc5716af7a95f7768634b30d9446ec ]

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: 908a1ad8 ("iov_iter: Handle compound highmem pages in copy_page_from_iter_atomic()")
Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Link: https://lore.kernel.org/r/dd5f0c89-186e-18e1-4f43-19a60f5a9774@google.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent db3d052a

lib/iov_iter.c

+4 −2
Original line number Diff line number Diff line
@@ -570,6 +570,8 @@ size_t copy_page_from_iter_atomic(struct page *page, size_t offset, 
		size_t bytes, struct iov_iter *i)

{

	size_t n, copied = 0;

	bool uses_kmap = IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP) ||

			 PageHighMem(page);



	if (!page_copy_sane(page, offset, bytes))

		return 0;
@@ -580,7 +582,7 @@ size_t copy_page_from_iter_atomic(struct page *page, size_t offset, 
		char *p;



		n = bytes - copied;

		if (PageHighMem(page)) {

		if (uses_kmap) {

			page += offset / PAGE_SIZE;

			offset %= PAGE_SIZE;

			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, 
		kunmap_atomic(p);

		copied += n;

		offset += n;

	} while (PageHighMem(page) && copied != bytes && n > 0);

	} while (uses_kmap && copied != bytes && n > 0);



	return copied;

}