The patch titled Subject: hfs: unmap the page in the "fail_page" label has been added to the -mm mm-nonmm-unstable branch. Its filename is hfs-unmap-the-page-in-the-fail_page-label.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/hfs-unmap-the-page-in-the-fail_page-label.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Fabio M. De Francesco" <fmdefrancesco@xxxxxxxxx> Subject: hfs: unmap the page in the "fail_page" label Date: Sun, 21 Aug 2022 20:03:58 +0200 Patch series "hfs: Replace kmap() with kmap_local_page()". kmap() is being deprecated in favor of kmap_local_page(). There are two main problems with kmap(): (1) It comes with an overhead as mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmaps pool wraps and it might block when the mapping space is fully utilized until a slot becomes available. With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and still valid. Since its use in fs/hfs is safe everywhere, it should be preferred. Therefore, replace kmap() with kmap_local_page() in fs/hfs. Where possible, use the suited standard helpers (memzero_page(), memcpy_page()) instead of open coding kmap_local_page() plus memset() or memcpy(). Fix a bug due to a page being not unmapped if the code jumps to the "fail_page" label (1/3). Tested in a QEMU/KVM x86_32 VM, 6GB RAM, booting a kernel with HIGHMEM64GB enabled. This patch (of 3): Several paths within hfs_btree_open() jump to the "fail_page" label where put_page() is called while the page is still mapped. Call kunmap() to unmap the page soon before put_page(). Link: https://lkml.kernel.org/r/20220821180400.8198-1-fmdefrancesco@xxxxxxxxx Link: https://lkml.kernel.org/r/20220821180400.8198-2-fmdefrancesco@xxxxxxxxx Signed-off-by: Fabio M. De Francesco <fmdefrancesco@xxxxxxxxx> Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx> Reviewed-by: Viacheslav Dubeyko <slava@xxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Chaitanya Kulkarni <kch@xxxxxxxxxx> Cc: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx> Cc: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>] Cc: Jeff Layton <jlayton@xxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Martin K. Petersen <martin.petersen@xxxxxxxxxx> Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx> Cc: Roman Gushchin <roman.gushchin@xxxxxxxxx> Cc: Theodore Ts'o <tytso@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hfs/btree.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/hfs/btree.c~hfs-unmap-the-page-in-the-fail_page-label +++ a/fs/hfs/btree.c @@ -124,6 +124,7 @@ struct hfs_btree *hfs_btree_open(struct return tree; fail_page: + kunmap(page); put_page(page); free_inode: tree->inode->i_mapping->a_ops = &hfs_aops; _ Patches currently in -mm which might be from fmdefrancesco@xxxxxxxxx are hfsplus-unmap-the-page-in-the-fail_page-label.patch hfsplus-convert-kmap-to-kmap_local_page-in-bnodec.patch hfsplus-convert-kmap-to-kmap_local_page-in-bitmapc.patch hfsplus-convert-kmap-to-kmap_local_page-in-btreec.patch fs-isofs-replace-kmap-with-kmap_local_page.patch kexec-replace-kmap-with-kmap_local_page.patch hfs-unmap-the-page-in-the-fail_page-label.patch hfs-replace-kmap-with-kmap_local_page-in-bnodec.patch hfs-replace-kmap-with-kmap_local_page-in-btreec.patch