Commit 366ca6e2 authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Wentao Guan
Browse files

nilfs2: eliminate staggered calls to kunmap in nilfs_rename 

stable inclusion
from stable-v6.6.80
commit 35dcb8a3a70e9ae3be3eafb644bb2f8de2a95c4e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBXANC

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

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

commit 8cf57c6df818f58fdad16a909506be213623a88e upstream.

In nilfs_rename(), calls to nilfs_put_page() to release pages obtained
with nilfs_find_entry() or nilfs_dotdot() are alternated in the normal
path.

When replacing the kernel memory mapping method from kmap to
kmap_local_{page,folio}, this violates the constraint on the calling order
of kunmap_local().

Swap the order of nilfs_put_page calls where the kmap sections of multiple
pages overlap so that they are nested, allowing direct replacement of
nilfs_put_page() -> unmap_and_put_page().

Without this reordering, that replacement will cause a kernel WARNING in
kunmap_local_indexed() on architectures with high memory mapping.

Link: https://lkml.kernel.org/r/20231127143036.2425-3-konishi.ryusuke@gmail.com


Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Stable-dep-of: ee70999a988b ("nilfs2: handle errors that nilfs_prepare_chunk() may return")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 35dcb8a3a70e9ae3be3eafb644bb2f8de2a95c4e)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 793f921b

fs/nilfs2/namei.c

+2 −1
Original line number Diff line number Diff line
@@ -431,13 +431,14 @@ static int nilfs_rename(struct mnt_idmap *idmap, 
	inode_set_ctime_current(old_inode);



	nilfs_delete_entry(old_de, old_page);

	nilfs_put_page(old_page);



	if (dir_de) {

		nilfs_set_link(old_inode, dir_de, dir_page, new_dir);

		nilfs_put_page(dir_page);

		drop_nlink(old_dir);

	}

	nilfs_put_page(old_page);



	nilfs_mark_inode_dirty(old_dir);

	nilfs_mark_inode_dirty(old_inode);