Unverified Commit 0a055904 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2222 Add new config 'CONFIG_EXT4_ERROR_REPORT' to control ext3/4 error reporting 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UJA5CYIBDGJB36QHANXWXKZWL6U6KL5A/ 
 
https://gitee.com/openeuler/kernel/issues/I7T77P 
 
Link:https://gitee.com/openeuler/kernel/pulls/2222

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2e63e7d0 67f67743

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6211,6 +6211,7 @@ CONFIG_EXT4_FS=m 
CONFIG_EXT4_USE_FOR_EXT2=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ERROR_REPORT=y

# CONFIG_EXT4_DEBUG is not set

CONFIG_JBD2=m

# CONFIG_JBD2_DEBUG is not set

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -7308,6 +7308,7 @@ CONFIG_EXT4_FS=m 
CONFIG_EXT4_USE_FOR_EXT2=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ERROR_REPORT=y

# CONFIG_EXT4_DEBUG is not set

CONFIG_JBD2=m

# CONFIG_JBD2_DEBUG is not set

fs/ext4/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -117,3 +117,11 @@ config EXT4_KUNIT_TESTS 
	  to the KUnit documentation in Documentation/dev-tools/kunit/.



	  If unsure, say N.



config EXT4_ERROR_REPORT

	bool "Ext4 error reporting by netlink"

	depends on EXT4_FS && NET

	default n

	help

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

	  userspace by netlink

fs/ext4/ext4.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#include <linux/compiler.h>



#ifdef CONFIG_EXT4_ERROR_REPORT

#define NL_EXT4_ERROR_GROUP    1

#define EXT4_ERROR_MAGIC       0xAE32014U

struct ext4_err_msg {
@@ -54,6 +55,7 @@ struct ext4_err_msg { 
	unsigned long s_flags;

	int ext4_errno;

};

#endif



/*

 * The fourth extended filesystem constants/structures

fs/ext4/super.c

+19 −0
Original line number Diff line number Diff line
@@ -55,9 +55,11 @@ 
#include "mballoc.h"

#include "fsmap.h"



#ifdef CONFIG_EXT4_ERROR_REPORT

#include <uapi/linux/netlink.h>

#include <net/sock.h>

#include <net/net_namespace.h>

#endif



#define CREATE_TRACE_POINTS

#include <trace/events/ext4.h>
@@ -90,8 +92,10 @@ static void ext4_unregister_li_request(struct super_block *sb); 
static void ext4_clear_request_list(void);

static struct inode *ext4_get_journal_inode(struct super_block *sb,

					    unsigned int journal_inum);

#ifdef CONFIG_EXT4_ERROR_REPORT

static void ext4_netlink_send_info(struct super_block *sb, int ext4_errno);

static struct sock *ext4nl;

#endif



/*

 * Lock ordering
@@ -616,6 +620,7 @@ static void save_error_info(struct super_block *sb, int error, 
	spin_unlock(&sbi->s_error_lock);

}



#ifdef CONFIG_EXT4_ERROR_REPORT

static void ext4_netlink_send_info(struct super_block *sb, int ext4_errno)

{

	int size;
@@ -651,6 +656,7 @@ static void ext4_netlink_send_info(struct super_block *sb, int ext4_errno) 
			kfree_skb(skb);

	}

}

#endif



/* Deal with the reporting of failure conditions on a filesystem such as

 * inconsistencies detected or read IO failures.
@@ -713,11 +719,16 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error, 
			sb->s_id);

	}



#ifdef CONFIG_EXT4_ERROR_REPORT

	if (sb_rdonly(sb))

		return;



	if (continue_fs)

		goto out;

#else

	if (sb_rdonly(sb) || continue_fs)

		return;

#endif





	ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
@@ -727,8 +738,10 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error, 
	 */

	smp_wmb();

	sb->s_flags |= SB_RDONLY;

#ifdef CONFIG_EXT4_ERROR_REPORT

out:

	ext4_netlink_send_info(sb, force_ro ? 2 : 1);

#endif

}



static void flush_stashed_error_work(struct work_struct *work)
@@ -6855,7 +6868,9 @@ wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ]; 
static int __init ext4_init_fs(void)

{

	int i, err;

#ifdef CONFIG_EXT4_ERROR_REPORT

	struct netlink_kernel_cfg cfg = {.groups = NL_EXT4_ERROR_GROUP,};

#endif



	ratelimit_state_init(&ext4_mount_msg_ratelimit, 30 * HZ, 64);

	ext4_li_info = NULL;
@@ -6908,9 +6923,11 @@ static int __init ext4_init_fs(void) 
	if (err)

		goto out;



#ifdef CONFIG_EXT4_ERROR_REPORT

	ext4nl = netlink_kernel_create(&init_net, NETLINK_FILESYSTEM, &cfg);

	if (!ext4nl)

		printk(KERN_ERR "EXT4-fs: Cannot create netlink socket.\n");

#endif

	return 0;

out:

	unregister_as_ext2();
@@ -6951,7 +6968,9 @@ static void __exit ext4_exit_fs(void) 
	ext4_exit_post_read_processing();

	ext4_exit_es();

	ext4_exit_pending();

#ifdef CONFIG_EXT4_ERROR_REPORT

	netlink_kernel_release(ext4nl);

#endif

}



MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");