Unverified Commit 01cac348 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10863 v2 ext4: flexibly control whether to enable dioread_nolock by default 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Erkun <yangerkun@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HU3KMBYUTXGNOFT4KKHUYOLXMKZLMCWC/ 
 
https://gitee.com/openeuler/kernel/issues/IAAPPE 
 
Link:https://gitee.com/openeuler/kernel/pulls/10863

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b863a748 c4ed7b59

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6954,6 +6954,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y 
CONFIG_EXT4_FS_SECURITY=y

# CONFIG_EXT4_DEBUG is not set

CONFIG_EXT4_ERROR_REPORT=y

# CONFIG_EXT4_DIOREAD_NOLOCK_PARAM is not set

CONFIG_JBD2=m

# CONFIG_JBD2_DEBUG is not set

CONFIG_FS_MBCACHE=m

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -8117,6 +8117,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y 
CONFIG_EXT4_FS_SECURITY=y

# CONFIG_EXT4_DEBUG is not set

CONFIG_EXT4_ERROR_REPORT=y

# CONFIG_EXT4_DIOREAD_NOLOCK_PARAM is not set

CONFIG_JBD2=m

# CONFIG_JBD2_DEBUG is not set

CONFIG_FS_MBCACHE=m

fs/ext4/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -126,3 +126,11 @@ config EXT4_ERROR_REPORT 
	help

	  Implement the ext3/ext4 file system error report. Report error to

	  userspace by netlink



config EXT4_DIOREAD_NOLOCK_PARAM

	bool "Ext4 default_dioread_nolock module param support"

	depends on EXT4_FS

	default n

	help

	  Support to enable default_dioread_nolock module param, be attention to

          that we default disable dioread_nolock with this config set to Y.

fs/ext4/super.c

+19 −0
Original line number Diff line number Diff line
@@ -66,6 +66,20 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/ext4.h>



#ifdef CONFIG_EXT4_DIOREAD_NOLOCK_PARAM

/*

 * After 244adf6426ee ("ext4: make dioread_nolock the default"), we will enable

 * dioread_nolock by default, but this options may lead data lose combine with

 * poweroff(Since we may first update i_size, and then unwritten extent convert

 * to written extent). For this case, we give a param to help control does we

 * really default enable dioread_nolock and we default disable dioread_nolock,

 * enable it with ext4.default_dioread_nolock=1 if you want.

 */

int default_dioread_nolock;

module_param_named(default_dioread_nolock, default_dioread_nolock, int, 0644);

MODULE_PARM_DESC(default_dioread_nolock, "Default enable dioread_nolock");

#endif



static struct ext4_lazy_init *ext4_li_info;

static DEFINE_MUTEX(ext4_li_mtx);

static struct ratelimit_state ext4_mount_msg_ratelimit;
@@ -4472,8 +4486,13 @@ static void ext4_set_def_opts(struct super_block *sb, 
	    ((def_mount_opts & EXT4_DEFM_NODELALLOC) == 0))

		set_opt(sb, DELALLOC);



#ifdef CONFIG_EXT4_DIOREAD_NOLOCK_PARAM

	if (sb->s_blocksize == PAGE_SIZE && default_dioread_nolock)

		set_opt(sb, DIOREAD_NOLOCK);

#else

	if (sb->s_blocksize == PAGE_SIZE)

		set_opt(sb, DIOREAD_NOLOCK);

#endif



	/* Use iomap for buffered IO path on 4k pagesize */

	if (PAGE_SIZE == SZ_4K)