Skip to contentSkip to conversation

staging: erofs: option validation for remount and some code cleanups

PATCH Superseded Chengguang Xu 6 participants 23 messages Sep 12, 2018 – Sep 17, 2018 Staging

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover staging: erofs: option validation for remount and some code cleanups

This patch set mainly does option validation for remount and at the same time does related code cleanups. Currently when we call fault injection related code we have to surround it with macro CONFIG_EROFS_FAULT_INJECTION in every calling place, after this patch set we don't have to that, so the code looks clean and more understandable.

Chengguang Xu (7):
staging: erofs: code cleanup for erofs_kmalloc()
staging: erofs: code cleanup for option parsing of fault_injection
staging: erofs: introduce a new helper __erofs_build_fault_attr()
staging: erofs: return -EINVAL when specifying fault rate to 0
staging: erofs: introduce a new helper erofs_get_fault_rate()
staging: erofs: code cleanup for erofs_show_options()
staging: erofs: option validation in remount

 drivers/staging/erofs/internal.h | 16 ++++---
 drivers/staging/erofs/super.c    | 74 +++++++++++++++++++++++++-------
 2 files changed, 69 insertions(+), 21 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/7 staging: erofs: code cleanup for erofs_kmalloc()

Define a dummy function of time_to_inject(), so that we don't have to check macro CONFIG_EROFS_FAULT_INJECTION in calling place. Base on above adjustment, do proper code cleanup for erofs_kmalloc().

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/internal.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/staging/erofs/internal.h +10 -6
index 367b39fe46e5..1bb2e9e96143 100644
@@ -42,12 +42,12 @@
 #define DBG_BUGON(...)          ((void)0)
 #endif
 
-#ifdef CONFIG_EROFS_FAULT_INJECTION
 enum {
 	FAULT_KMALLOC,
 	FAULT_MAX,
 };
 
+#ifdef CONFIG_EROFS_FAULT_INJECTION
 extern char *erofs_fault_name[FAULT_MAX];
 #define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type)))
 
@@ -139,21 +139,25 @@ static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
 	atomic_inc(&ffi->inject_ops);
 	if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {
 		atomic_set(&ffi->inject_ops, 0);
+		erofs_show_injection_info(type);
 		return true;
 	}
 	return false;
 }
+
+#else
+static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
+{
+	return false;
+}
 #endif
 
 static inline void *erofs_kmalloc(struct erofs_sb_info *sbi,
 					size_t size, gfp_t flags)
 {
-#ifdef CONFIG_EROFS_FAULT_INJECTION
-	if (time_to_inject(sbi, FAULT_KMALLOC)) {
-		erofs_show_injection_info(FAULT_KMALLOC);
+	if (time_to_inject(sbi, FAULT_KMALLOC))
 		return NULL;
-	}
-#endif
+
 	return kmalloc(size, flags);
 }
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/7 staging: erofs: code cleanup for erofs_kmalloc()

Quoted 28 lines · Chengguang Xu

Define a dummy function of time_to_inject(), so that we don't have to check macro CONFIG_EROFS_FAULT_INJECTION in calling place. Base on above adjustment, do proper code cleanup for erofs_kmalloc().

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/internal.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/staging/erofs/internal.h +1 -1
index 367b39fe46e5..1bb2e9e96143 100644
@@ -42,12 +42,12 @@
 #define DBG_BUGON(...)          ((void)0)
 #endif
 
-#ifdef CONFIG_EROFS_FAULT_INJECTION
 enum {
 	FAULT_KMALLOC,
 	FAULT_MAX,
 };
 
+#ifdef CONFIG_EROFS_FAULT_INJECTION
 extern char *erofs_fault_name[FAULT_MAX];
 #define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type)))
 

drivers/staging/erofs/internal.h static inline bool time_to_inject(struct erofs_sb_info *sbi, int type) · line 142

Quoted 4 lines
drivers/staging/erofs/internal.h +1 -0
@@ -139,21 +139,25 @@ static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
 	atomic_inc(&ffi->inject_ops);
 	if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {
 		atomic_set(&ffi->inject_ops, 0);
+		erofs_show_injection_info(type);

I prefer to show injection info in original place, where we can show real caller of time_to_inject().

Thanks,

Quoted 27 lines
drivers/staging/erofs/internal.h +8 -5
 		return true;
 	}
 	return false;
 }
+
+#else
+static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
+{
+	return false;
+}
 #endif
 
 static inline void *erofs_kmalloc(struct erofs_sb_info *sbi,
 					size_t size, gfp_t flags)
 {
-#ifdef CONFIG_EROFS_FAULT_INJECTION
-	if (time_to_inject(sbi, FAULT_KMALLOC)) {
-		erofs_show_injection_info(FAULT_KMALLOC);
+	if (time_to_inject(sbi, FAULT_KMALLOC))
 		return NULL;
-	}
-#endif
+
 	return kmalloc(size, flags);
 }
 
author
#3 lore raw

PATCH 1/7 staging: erofs: code cleanup for erofs_kmalloc()

Quoted 28 lines · Chao Yu
Quoted 27 lines · Chengguang Xu

Define a dummy function of time_to_inject(), so that we don't have to check macro CONFIG_EROFS_FAULT_INJECTION in calling place. Base on above adjustment, do proper code cleanup for erofs_kmalloc().

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
  drivers/staging/erofs/internal.h | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
drivers/staging/erofs/internal.h +1 -1
index 367b39fe46e5..1bb2e9e96143 100644
@@ -42,12 +42,12 @@
  #define DBG_BUGON(...)          ((void)0)
  #endif
 
-#ifdef CONFIG_EROFS_FAULT_INJECTION
  enum {
  	FAULT_KMALLOC,
  	FAULT_MAX,
  };
 
+#ifdef CONFIG_EROFS_FAULT_INJECTION
  extern char *erofs_fault_name[FAULT_MAX];
  #define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type)))
 
Quoted 8 lines

drivers/staging/erofs/internal.h static inline bool time_to_inject(struct erofs_sb_info *sbi, int type) · line 142

Quoted 5 lines
drivers/staging/erofs/internal.h +1 -0
@@ -139,21 +139,25 @@ static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
  	atomic_inc(&ffi->inject_ops);
  	if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {
  		atomic_set(&ffi->inject_ops, 0);
+		erofs_show_injection_info(type);

I prefer to show injection info in original place, where we can show real caller of time_to_inject().

OK, I agree with your suggestion.

Thanks,
Chengguang

#4 lore raw

PATCH 2/7 staging: erofs: code cleanup for option parsing of fault_injection

In reply to Chengguang Xu

Define a dummpy function of erofs_build_fault_attr() when macro CONFIG_EROFS_FAULT_INJECTION is disabled, so that we don't have to check the macro in calling place. Based on above adjustment, do proper code cleanup for option parsing of fault_injection.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/staging/erofs/super.c +22 -11
index 1aec509c805f..14dbb6517b8d 100644
@@ -144,18 +144,33 @@ char *erofs_fault_name[FAULT_MAX] = {
 	[FAULT_KMALLOC]		= "kmalloc",
 };
 
-static void erofs_build_fault_attr(struct erofs_sb_info *sbi,
-						unsigned int rate)
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					substring_t *args)
 {
 	struct erofs_fault_info *ffi = &sbi->fault_info;
+	int rate = 0;
+
+	if (args->from && match_int(args, &rate))
+		return -EINVAL;
 
 	if (rate) {
 		atomic_set(&ffi->inject_ops, 0);
 		ffi->inject_rate = rate;
 		ffi->inject_type = (1 << FAULT_MAX) - 1;
+		set_opt(sbi, FAULT_INJECTION);
 	} else {
 		memset(ffi, 0, sizeof(struct erofs_fault_info));
+		clear_opt(sbi, FAULT_INJECTION);
 	}
+
+	return 0;
+}
+#else
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					substring_t *args)
+{
+	infoln("fault_injection options not supported");
+	return 0;
 }
 #endif
 
@@ -192,7 +207,7 @@ static int parse_options(struct super_block *sb, char *options)
 {
 	substring_t args[MAX_OPT_ARGS];
 	char *p;
-	int arg = 0;
+	int err;
 
 	if (!options)
 		return 0;
@@ -238,15 +253,11 @@ static int parse_options(struct super_block *sb, char *options)
 			break;
 #endif
 		case Opt_fault_injection:
-			if (args->from && match_int(args, &arg))
-				return -EINVAL;
-#ifdef CONFIG_EROFS_FAULT_INJECTION
-			erofs_build_fault_attr(EROFS_SB(sb), arg);
-			set_opt(EROFS_SB(sb), FAULT_INJECTION);
-#else
-			infoln("FAULT_INJECTION was not selected");
-#endif
+			err = erofs_build_fault_attr(EROFS_SB(sb), args);
+			if (err)
+				return err;
 			break;
+
 		default:
 			errln("Unrecognized mount option \"%s\" "
 					"or missing value", p);
Signature · 1 line
2.17.1
#5 lore raw

PATCH 2/7 staging: erofs: code cleanup for option parsing of fault_injection

Quoted 27 lines · Chengguang Xu

Define a dummpy function of erofs_build_fault_attr() when macro CONFIG_EROFS_FAULT_INJECTION is disabled, so that we don't have to check the macro in calling place. Based on above adjustment, do proper code cleanup for option parsing of fault_injection.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/staging/erofs/super.c +5 -2
index 1aec509c805f..14dbb6517b8d 100644
@@ -144,18 +144,33 @@ char *erofs_fault_name[FAULT_MAX] = {
 	[FAULT_KMALLOC]		= "kmalloc",
 };
 
-static void erofs_build_fault_attr(struct erofs_sb_info *sbi,
-						unsigned int rate)
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					substring_t *args)
 {
 	struct erofs_fault_info *ffi = &sbi->fault_info;
+	int rate = 0;
+
+	if (args->from && match_int(args, &rate))

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 163

Quoted 10 lines
drivers/staging/erofs/super.c +3 -0
+		return -EINVAL;
 
 	if (rate) {
 		atomic_set(&ffi->inject_ops, 0);
 		ffi->inject_rate = rate;
 		ffi->inject_type = (1 << FAULT_MAX) - 1;
+		set_opt(sbi, FAULT_INJECTION);
 	} else {
 		memset(ffi, 0, sizeof(struct erofs_fault_info));
+		clear_opt(sbi, FAULT_INJECTION);

Hmmm, if user mounts/remounts image with -o fault_injection=0, user can not check such info in anywhere, as we skip showing this option due to lack of EROFS_MOUNT_FAULT_INJECTION bit. How about keeping this bit?

Thanks,

Quoted 43 lines
drivers/staging/erofs/super.c +14 -9
 	}
+
+	return 0;
+}
+#else
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					substring_t *args)
+{
+	infoln("fault_injection options not supported");
+	return 0;
 }
 #endif
 
@@ -192,7 +207,7 @@ static int parse_options(struct super_block *sb, char *options)
 {
 	substring_t args[MAX_OPT_ARGS];
 	char *p;
-	int arg = 0;
+	int err;
 
 	if (!options)
 		return 0;
@@ -238,15 +253,11 @@ static int parse_options(struct super_block *sb, char *options)
 			break;
 #endif
 		case Opt_fault_injection:
-			if (args->from && match_int(args, &arg))
-				return -EINVAL;
-#ifdef CONFIG_EROFS_FAULT_INJECTION
-			erofs_build_fault_attr(EROFS_SB(sb), arg);
-			set_opt(EROFS_SB(sb), FAULT_INJECTION);
-#else
-			infoln("FAULT_INJECTION was not selected");
-#endif
+			err = erofs_build_fault_attr(EROFS_SB(sb), args);
+			if (err)
+				return err;
 			break;
+
 		default:
 			errln("Unrecognized mount option \"%s\" "
 					"or missing value", p);
author
#6 lore raw

PATCH 2/7 staging: erofs: code cleanup for option parsing of fault_injection

Quoted 30 lines · Chao Yu
Quoted 29 lines · Chengguang Xu

Define a dummpy function of erofs_build_fault_attr() when macro CONFIG_EROFS_FAULT_INJECTION is disabled, so that we don't have to check the macro in calling place. Based on above adjustment, do proper code cleanup for option parsing of fault_injection.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
  drivers/staging/erofs/super.c | 33 ++++++++++++++++++++++-----------
  1 file changed, 22 insertions(+), 11 deletions(-)
drivers/staging/erofs/super.c +6 -2
index 1aec509c805f..14dbb6517b8d 100644
@@ -144,18 +144,33 @@ char *erofs_fault_name[FAULT_MAX] = {
  	[FAULT_KMALLOC]		= "kmalloc",
  };
 
-static void erofs_build_fault_attr(struct erofs_sb_info *sbi,
-						unsigned int rate)
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					substring_t *args)
  {
  	struct erofs_fault_info *ffi = &sbi->fault_info;
+	int rate = 0;
+
+	if (args->from && match_int(args, &rate))
+		return -EINVAL;
 
Quoted 12 lines

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 163

Quoted 8 lines
drivers/staging/erofs/super.c +2 -0
  	if (rate) {
  		atomic_set(&ffi->inject_ops, 0);
  		ffi->inject_rate = rate;
  		ffi->inject_type = (1 << FAULT_MAX) - 1;
+		set_opt(sbi, FAULT_INJECTION);
  	} else {
  		memset(ffi, 0, sizeof(struct erofs_fault_info));
+		clear_opt(sbi, FAULT_INJECTION);

Hmmm, if user mounts/remounts image with -o fault_injection=0, user can not check such info in anywhere, as we skip showing this option due to lack of EROFS_MOUNT_FAULT_INJECTION bit. How about keeping this bit?

IIUC, the purpose of fault_injection=0 is for disabling fault injection function,
so isn't it the same as default? Should we distinguish explicit setting value 0 and default value 0?

Thanks,
Chengguang

#7 lore raw

PATCH 2/7 staging: erofs: code cleanup for option parsing of fault_injection

Quoted 42 lines · On 2018/9/13 13:46, cgxu519 wrote:
Quoted 31 lines · Chao Yu
Quoted 30 lines · Chengguang Xu

Define a dummpy function of erofs_build_fault_attr() when macro CONFIG_EROFS_FAULT_INJECTION is disabled, so that we don't have to check the macro in calling place. Based on above adjustment, do proper code cleanup for option parsing of fault_injection.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>

---
? drivers/staging/erofs/super.c | 33 ++++++++++++++++++++++----------- ? 1 file changed, 22 insertions(+), 11 deletions(-)

drivers/staging/erofs/super.c +6 -1
index 1aec509c805f..14dbb6517b8d 100644
@@ -144,18 +144,33 @@ char *erofs_fault_name[FAULT_MAX] = {
 ????? [FAULT_KMALLOC]??????? = "kmalloc",
 ? };
 ? -static void erofs_build_fault_attr(struct erofs_sb_info *sbi,
-??????????????????????? unsigned int rate)
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+??????????????????? substring_t *args)
 ? {
 ????? struct erofs_fault_info *ffi = &sbi->fault_info;
+??? int rate = 0;
+
+??? if (args->from && match_int(args, &rate))
+??????? return -EINVAL;
 ? ????? if (rate) {
 ????????? atomic_set(&ffi->inject_ops, 0);
 ????????? ffi->inject_rate = rate;
Quoted 9 lines

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 162

Quoted 5 lines
drivers/staging/erofs/super.c +2 -0
 ????????? ffi->inject_type = (1 << FAULT_MAX) - 1;
+??????? set_opt(sbi, FAULT_INJECTION);
 ????? } else {
 ????????? memset(ffi, 0, sizeof(struct erofs_fault_info));
+??????? clear_opt(sbi, FAULT_INJECTION);

Hmmm, if user mounts/remounts image with -o fault_injection=0, user can not check such info in anywhere, as we skip showing this option due to lack of EROFS_MOUNT_FAULT_INJECTION bit. How about keeping this bit?

Quoted 2 lines

IIUC, the purpose of fault_injection=0 is for disabling fault injection function, so isn't it the same as default? Should we distinguish explicit setting value 0

IMO, if user set fault_injection=0 during mount, it means user want to enable this feature but currently user want to set the rate to zero, later user may change it to non-zero. And with EROFS_MOUNT_FAULT_INJECTION being set, user can check current rate value via ->show_options.

Thanks,

Quoted 10 lines

and default value 0?

Thanks,
Chengguang

author
#8 lore raw

PATCH 2/7 staging: erofs: code cleanup for option parsing of fault_injection

Quoted 42 lines · Chao Yu
Quoted 41 lines · On 2018/9/13 13:46, cgxu519 wrote:
Quoted 40 lines · Chao Yu
Quoted 25 lines · Chengguang Xu

Define a dummpy function of erofs_build_fault_attr() when macro CONFIG_EROFS_FAULT_INJECTION is disabled, so that we don't have to check the macro in calling place. Based on above adjustment, do proper code cleanup for option parsing of fault_injection.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 ? drivers/staging/erofs/super.c | 33 ++++++++++++++++++++++-----------

? 1 file changed, 22 insertions(+), 11 deletions(-)

drivers/staging/erofs/super.c +4 -1
index 1aec509c805f..14dbb6517b8d 100644
@@ -144,18 +144,33 @@ char *erofs_fault_name[FAULT_MAX] = {
 ????? [FAULT_KMALLOC]??????? = "kmalloc",
 ? };
 ? -static void erofs_build_fault_attr(struct erofs_sb_info *sbi,
-??????????????????????? unsigned int rate)
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+??????????????????? substring_t *args)
 ? {
 ????? struct erofs_fault_info *ffi = &sbi->fault_info;
+??? int rate = 0;
+

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 162

Quoted 10 lines
drivers/staging/erofs/super.c +4 -0
+??? if (args->from && match_int(args, &rate))
+??????? return -EINVAL;
 ? ????? if (rate) {
 ????????? atomic_set(&ffi->inject_ops, 0);
 ????????? ffi->inject_rate = rate;
 ????????? ffi->inject_type = (1 << FAULT_MAX) - 1;
+??????? set_opt(sbi, FAULT_INJECTION);
 ????? } else {
 ????????? memset(ffi, 0, sizeof(struct erofs_fault_info));
+??????? clear_opt(sbi, FAULT_INJECTION);

Hmmm, if user mounts/remounts image with -o fault_injection=0, user can not check such info in anywhere, as we skip showing this option due to lack of EROFS_MOUNT_FAULT_INJECTION bit. How about keeping this bit?

Quoted 6 lines
Quoted 2 lines

IIUC, the purpose of fault_injection=0 is for disabling fault injection function, so isn't it the same as default? Should we distinguish explicit setting value 0

IMO, if user set fault_injection=0 during mount, it means user want to enable this feature but currently user want to set the rate to zero, later user may change it to non-zero. And with EROFS_MOUNT_FAULT_INJECTION being set, user can check current rate value via ->show_options.

Hi Chao,

Do you mean user can modify the value without remount? or maybe in the future?

Thanks,
Chengguang

#9 lore raw

PATCH 2/7 staging: erofs: code cleanup for option parsing of fault_injection

Quoted 46 lines · On 2018/9/17 21:52, cgxu519 wrote:
Quoted 45 lines · Chao Yu
Quoted 44 lines · On 2018/9/13 13:46, cgxu519 wrote:
Quoted 31 lines · Chao Yu
Quoted 30 lines · Chengguang Xu

Define a dummpy function of erofs_build_fault_attr() when macro CONFIG_EROFS_FAULT_INJECTION is disabled, so that we don't have to check the macro in calling place. Based on above adjustment, do proper code cleanup for option parsing of fault_injection.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>

---
?? drivers/staging/erofs/super.c | 33 ++++++++++++++++++++++----------- ?? 1 file changed, 22 insertions(+), 11 deletions(-)

drivers/staging/erofs/super.c +6 -1
index 1aec509c805f..14dbb6517b8d 100644
@@ -144,18 +144,33 @@ char *erofs_fault_name[FAULT_MAX] = {
 ?????? [FAULT_KMALLOC]??????? = "kmalloc",
 ?? };
 ?? -static void erofs_build_fault_attr(struct erofs_sb_info *sbi,
-??????????????????????? unsigned int rate)
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+??????????????????? substring_t *args)
 ?? {
 ?????? struct erofs_fault_info *ffi = &sbi->fault_info;
+??? int rate = 0;
+
+??? if (args->from && match_int(args, &rate))
+??????? return -EINVAL;
 ?? ????? if (rate) {
 ?????????? atomic_set(&ffi->inject_ops, 0);
 ?????????? ffi->inject_rate = rate;
Quoted 9 lines

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 162

Quoted 5 lines
drivers/staging/erofs/super.c +2 -0
 ?????????? ffi->inject_type = (1 << FAULT_MAX) - 1;
+??????? set_opt(sbi, FAULT_INJECTION);
 ?????? } else {
 ?????????? memset(ffi, 0, sizeof(struct erofs_fault_info));
+??????? clear_opt(sbi, FAULT_INJECTION);

Hmmm, if user mounts/remounts image with -o fault_injection=0, user can not check such info in anywhere, as we skip showing this option due to lack of EROFS_MOUNT_FAULT_INJECTION bit. How about keeping this bit?

IIUC, the purpose of fault_injection=0 is for disabling fault injection function,
so isn't it the same as default? Should we distinguish explicit setting value 0

Quoted 8 lines
Quoted 4 lines

IMO, if user set fault_injection=0 during mount, it means user want to enable this feature but currently user want to set the rate to zero, later user may change it to non-zero. And with EROFS_MOUNT_FAULT_INJECTION being set, user can check current rate value via ->show_options.

Hi Chao,

Do you mean user can modify the value without remount? or maybe in the future?

Yeah, like we did in f2fs, we can export sysfs node for configuring fault injection rate/type.

Thanks,

Quoted 9 lines

Thanks,
Chengguang

#10 lore raw

PATCH 3/7 staging: erofs: introduce a new helper __erofs_build_fault_attr()

In reply to Chengguang Xu

Introduce a new helper __erofs_build_fault_attr() to handle set/clear erofs_fault_info, we need this funciton for internal use case. for example, reset fault_injection option in remount.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/staging/erofs/super.c +18 -8
index 14dbb6517b8d..d2dbc1fd3abb 100644
@@ -144,15 +144,9 @@ char *erofs_fault_name[FAULT_MAX] = {
 	[FAULT_KMALLOC]		= "kmalloc",
 };
 
-static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
-					substring_t *args)
+static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					unsigned int rate)
 {
-	struct erofs_fault_info *ffi = &sbi->fault_info;
-	int rate = 0;
-
-	if (args->from && match_int(args, &rate))
-		return -EINVAL;
-
 	if (rate) {
 		atomic_set(&ffi->inject_ops, 0);
 		ffi->inject_rate = rate;
@@ -162,10 +156,26 @@ static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
 		memset(ffi, 0, sizeof(struct erofs_fault_info));
 		clear_opt(sbi, FAULT_INJECTION);
 	}
+}
 
+static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					substring_t *args)
+{
+	struct erofs_fault_info *ffi = &sbi->fault_info;
+	int rate = 0;
+
+	if (args->from && match_int(args, &rate))
+		return -EINVAL;
+
+	__erofs_build_fault_attr(sbi, rate);
 	return 0;
 }
 #else
+static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					unsigned int rate)
+{
+}
+
 static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
 					substring_t *args)
 {
Signature · 1 line
2.17.1
#11 lore raw

PATCH 3/7 staging: erofs: introduce a new helper __erofs_build_fault_attr()

Hi Chengguang,

Quoted 19 lines · Chengguang Xu

Introduce a new helper __erofs_build_fault_attr() to handle set/clear erofs_fault_info, we need this funciton for internal use case. for example, reset fault_injection option in remount.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/staging/erofs/super.c +0 -2
index 14dbb6517b8d..d2dbc1fd3abb 100644
@@ -144,15 +144,9 @@ char *erofs_fault_name[FAULT_MAX] = {
 	[FAULT_KMALLOC]		= "kmalloc",
 };
 
-static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
-					substring_t *args)

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 150

Quoted 10 lines
drivers/staging/erofs/super.c +2 -6
+static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					unsigned int rate)
 {
-	struct erofs_fault_info *ffi = &sbi->fault_info;
-	int rate = 0;
-
-	if (args->from && match_int(args, &rate))
-		return -EINVAL;
-
 	if (rate) {

I get some compile error of this patch...
drivers/staging/erofs/super.c: In function ?__erofs_build_fault_attr?:
drivers/staging/erofs/super.c:156:15: error: ?ffi? undeclared (first use in this function)

   atomic_set(&ffi->inject_ops, 0);
               ^

drivers/staging/erofs/super.c:156:15: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/erofs/super.c: In function ?erofs_build_fault_attr?:
drivers/staging/erofs/super.c:169:27: warning: unused variable ?ffi? [-Wunused-variable]
struct erofs_fault_info *ffi = &sbi->fault_info;

p.s. could you please rebase your patch on Thomas's [PATCH v4] staging: erofs: use explicit unsigned int type ? since I'm rebasing the rest PREVIEW patches on this commit now.

p.p.s. I'd like to get Chao's idea of this fault injection patchset first :)

Thanks,
Gao Xiang

author
#12 lore raw

PATCH 3/7 staging: erofs: introduce a new helper __erofs_build_fault_attr()

Quoted 35 lines · Gao Xiang

Hi Chengguang,

Quoted 19 lines · Chengguang Xu

Introduce a new helper __erofs_build_fault_attr() to handle set/clear erofs_fault_info, we need this funciton for internal use case. for example, reset fault_injection option in remount.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
  drivers/staging/erofs/super.c | 26 ++++++++++++++++++--------
  1 file changed, 18 insertions(+), 8 deletions(-)
drivers/staging/erofs/super.c +0 -2
index 14dbb6517b8d..d2dbc1fd3abb 100644
@@ -144,15 +144,9 @@ char *erofs_fault_name[FAULT_MAX] = {
  	[FAULT_KMALLOC]		= "kmalloc",
  };
 
-static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
-					substring_t *args)

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 150

Quoted 10 lines
drivers/staging/erofs/super.c +2 -6
+static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
+					unsigned int rate)
  {
-	struct erofs_fault_info *ffi = &sbi->fault_info;
-	int rate = 0;
-
-	if (args->from && match_int(args, &rate))
-		return -EINVAL;
-
  	if (rate) {

I get some compile error of this patch...
drivers/staging/erofs/super.c: In function ?__erofs_build_fault_attr?:
drivers/staging/erofs/super.c:156:15: error: ?ffi? undeclared (first use in this function)

Quoted 6 lines
    atomic_set(&ffi->inject_ops, 0);
                ^

drivers/staging/erofs/super.c:156:15: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/erofs/super.c: In function ?erofs_build_fault_attr?:
drivers/staging/erofs/super.c:169:27: warning: unused variable ?ffi? [-Wunused-variable]
struct erofs_fault_info *ffi = &sbi->fault_info;

Sorry for that, I'll fix it in rebased version.

Quoted 3 lines

p.s. could you please rebase your patch on Thomas's [PATCH v4] staging: erofs: use explicit unsigned int type ? since I'm rebasing the rest PREVIEW patches on this commit now.

I noticed Thomas' patch had already committed to erofs-master branch in Chao's linux git repo, also my
previous patch but not in erofs-dev branch. So should I rebase on erofs-master?
Could you give me a little more guide for it?

Quoted 2 lines

p.p.s. I'd like to get Chao's idea of this fault injection patchset first :)

No problem, let's wait for a while, then I'll rebase the code according to the comments.

Thanks,
Chengguang

#13 lore raw

PATCH 3/7 staging: erofs: introduce a new helper __erofs_build_fault_attr()

Quoted 44 lines · On 2018/9/12 22:23, cgxu519 wrote:
Quoted 32 lines · Gao Xiang

Hi Chengguang,

Quoted 18 lines · Chengguang Xu

Introduce a new helper __erofs_build_fault_attr() to handle set/clear erofs_fault_info, we need this funciton for internal use case. for example, reset fault_injection option in remount.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>

---
? drivers/staging/erofs/super.c | 26 ++++++++++++++++++-------- ? 1 file changed, 18 insertions(+), 8 deletions(-)

drivers/staging/erofs/super.c +0 -1
index 14dbb6517b8d..d2dbc1fd3abb 100644
@@ -144,15 +144,9 @@ char *erofs_fault_name[FAULT_MAX] = {
 ????? [FAULT_KMALLOC]??????? = "kmalloc",
 ? };
 ? -static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
-??????????????????? substring_t *args)

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 150

Quoted 10 lines
drivers/staging/erofs/super.c +2 -6
+static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
+??????????????????? unsigned int rate)
 ? {
-??? struct erofs_fault_info *ffi = &sbi->fault_info;
-??? int rate = 0;
-
-??? if (args->from && match_int(args, &rate))
-??????? return -EINVAL;
-
 ????? if (rate) {

I get some compile error of this patch...

Quoted 8 lines

drivers/staging/erofs/super.c: In function ?__erofs_build_fault_attr?:
drivers/staging/erofs/super.c:156:15: error: ?ffi? undeclared (first use in this function)
??? atomic_set(&ffi->inject_ops, 0);
??????????????? ^
drivers/staging/erofs/super.c:156:15: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/erofs/super.c: In function ?erofs_build_fault_attr?:
drivers/staging/erofs/super.c:169:27: warning: unused variable ?ffi? [-Wunused-variable]
?? struct erofs_fault_info *ffi = &sbi->fault_info;

Sorry for that, I'll fix it in rebased version.

Quoted 1 line
Quoted 6 lines
Quoted 2 lines

p.s. could you please rebase your patch on Thomas's [PATCH v4] staging: erofs: use explicit unsigned int type ? since I'm rebasing the rest PREVIEW patches on this commit now.

I noticed Thomas' patch had already committed to erofs-master branch in Chao's linux git repo, also my previous patch but not in erofs-dev branch. So should I rebase on erofs-master?
Could you give me a little more guide for it?

Hi Chengguang,

Recently many cleanup patches submitted to Greg's staging tree and I need to rebase the rest erofs preview patches for linux-4.20 on these accepted cleanup patches.

I think you could make your patch based on Thomas's patch (erofs-master branch in Chao's linux git repo), you could also tell Chao drop your previous patch.

Thanks,
Gao Xiang

Quoted 12 lines
Quoted 2 lines

p.p.s. I'd like to get Chao's idea of this fault injection patchset first :)

No problem, let's wait for a while, then I'll rebase the code according to the comments.

Thanks,
Chengguang

_______________________________________________
devel mailing list
devel at linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

author
#14 lore raw

PATCH 3/7 staging: erofs: introduce a new helper __erofs_build_fault_attr()

Quoted 52 lines · Gao Xiang
Quoted 41 lines · On 2018/9/12 22:23, cgxu519 wrote:
Quoted 32 lines · Gao Xiang

Hi Chengguang,

Quoted 18 lines · Chengguang Xu

Introduce a new helper __erofs_build_fault_attr() to handle set/clear erofs_fault_info, we need this funciton for internal use case. for example, reset fault_injection option in remount.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 ? drivers/staging/erofs/super.c | 26 ++++++++++++++++++--------

? 1 file changed, 18 insertions(+), 8 deletions(-)

drivers/staging/erofs/super.c +0 -1
index 14dbb6517b8d..d2dbc1fd3abb 100644
@@ -144,15 +144,9 @@ char *erofs_fault_name[FAULT_MAX] = {
 ????? [FAULT_KMALLOC]??????? = "kmalloc",
 ? };
 ? -static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
-??????????????????? substring_t *args)

drivers/staging/erofs/super.c char *erofs_fault_name[FAULT_MAX] = { · line 150

Quoted 10 lines
drivers/staging/erofs/super.c +2 -6
+static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
+??????????????????? unsigned int rate)
 ? {
-??? struct erofs_fault_info *ffi = &sbi->fault_info;
-??? int rate = 0;
-
-??? if (args->from && match_int(args, &rate))
-??????? return -EINVAL;
-
 ????? if (rate) {

I get some compile error of this patch...

Quoted 8 lines

drivers/staging/erofs/super.c: In function ?__erofs_build_fault_attr?:
drivers/staging/erofs/super.c:156:15: error: ?ffi? undeclared (first use in this function)
??? atomic_set(&ffi->inject_ops, 0);
??????????????? ^
drivers/staging/erofs/super.c:156:15: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/erofs/super.c: In function ?erofs_build_fault_attr?:
drivers/staging/erofs/super.c:169:27: warning: unused variable ?ffi? [-Wunused-variable]
?? struct erofs_fault_info *ffi = &sbi->fault_info;

Quoted 7 lines

Sorry for that, I'll fix it in rebased version.

Quoted 2 lines

p.s. could you please rebase your patch on Thomas's [PATCH v4] staging: erofs: use explicit unsigned int type ? since I'm rebasing the rest PREVIEW patches on this commit now.

I noticed Thomas' patch had already committed to erofs-master branch in Chao's linux git repo, also my previous patch but not in erofs-dev branch. So should I rebase on erofs-master?
Could you give me a little more guide for it?

Hi Chengguang,

Quoted 7 lines

Recently many cleanup patches submitted to Greg's staging tree and I need to rebase the rest erofs preview patches for linux-4.20 on these accepted cleanup patches.

I think you could make your patch based on Thomas's patch (erofs-master branch in Chao's linux git repo), you could also tell Chao drop your previous patch.

Hi Xiang,

Thanks for explanation, that will be fine.

Hi Chao,

What do you think for these patches? If you think they are worth to do then please
revert my previous patch and I'll resend rebased version.

Thanks,
Chengguang

#15 lore raw

PATCH 4/7 staging: erofs: return -EINVAL when specifying fault rate to 0

In reply to Chengguang Xu

Set fault rate to 0 is useless and confusable, so add check to avoid it.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/erofs/super.c +2 -0
index d2dbc1fd3abb..8df680aee55a 100644
@@ -166,6 +166,8 @@ static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
 
 	if (args->from && match_int(args, &rate))
 		return -EINVAL;
+	if (!rate)
+		return -EINVAL;
 
 	__erofs_build_fault_attr(sbi, rate);
 	return 0;
Signature · 1 line
2.17.1
#16 lore raw

PATCH 4/7 staging: erofs: return -EINVAL when specifying fault rate to 0

Quoted 3 lines · Chengguang Xu

Set fault rate to 0 is useless and confusable, so add check to avoid it.

I would have assumed setting rate to zero just disabled it.

regards,
dan carpenter

author
#17 lore raw

PATCH 4/7 staging: erofs: return -EINVAL when specifying fault rate to 0

Quoted 5 lines · Dan Carpenter
Quoted 3 lines · Chengguang Xu

Set fault rate to 0 is useless and confusable, so add check to avoid it.

I would have assumed setting rate to zero just disabled it.

I think currently it is useless because we have not implemented option parsing in remount yet, maybe it's better adding another option 'no_fault_injection' to explicitly disable it.

Thanks,
Chengguang

#18 lore raw

PATCH 4/7 staging: erofs: return -EINVAL when specifying fault rate to 0

Quoted 10 lines · On Wed, Sep 12, 2018@10:05:26PM +0800, cgxu519 wrote:
Quoted 5 lines · Dan Carpenter
Quoted 3 lines · Chengguang Xu

Set fault rate to 0 is useless and confusable, so add check to avoid it.

I would have assumed setting rate to zero just disabled it.

I think currently it is useless because we have not implemented option parsing in remount yet, maybe it's better adding another option 'no_fault_injection' to explicitly disable it.

That's like the AC on my car, where I can't turn the fan from one to zero, I have to press disable. I don't like the explicit disable, I wish they would just remove that button.

But I also don't think most people will ever use the fault injection interface so it doesn't really matter. Do whatever seems good to you.

regards,
dan carpenter

author
#19 lore raw

PATCH 4/7 staging: erofs: return -EINVAL when specifying fault rate to 0

Quoted 6 lines · Dan Carpenter
Quoted 5 lines · On Wed, Sep 12, 2018@10:05:26PM +0800, cgxu519 wrote:
Quoted 4 lines · Dan Carpenter
Quoted 3 lines · Chengguang Xu

Set fault rate to 0 is useless and confusable, so add check to avoid it.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

I would have assumed setting rate to zero just disabled it.

I think currently it is useless because we have not implemented option parsing in remount yet, maybe it's better adding another option 'no_fault_injection' to explicitly disable it.

That's like the AC on my car, where I can't turn the fan from one to zero, I have to press disable. I don't like the explicit disable, I wish they would just remove that button.

Interesting, It seems same logic everywhere...

Quoted 3 lines

But I also don't think most people will ever use the fault injection interface so it doesn't really matter. Do whatever seems good to you.

More background:
The main reason I touch this option is in remount sometimes we need to restore original option setting when we detecting error during option parsing, so after this patch we can easily determine the option is explicitly set or just keep default value.

Thanks,
Chengguang

#20 lore raw

PATCH 5/7 staging: erofs: introduce a new helper erofs_get_fault_rate()

In reply to Chengguang Xu

Introduce a new helper for getting fault rate, so that we don't have to check macro in calling place.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/staging/erofs/super.c +10 -0
index 8df680aee55a..a6ae60564c65 100644
@@ -144,6 +144,11 @@ char *erofs_fault_name[FAULT_MAX] = {
 	[FAULT_KMALLOC]		= "kmalloc",
 };
 
+static unsigned int erofs_get_fault_rate(struct erofs_sb_info *sbi)
+{
+	return sbi->fault_info.inject_rate;
+}
+
 static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
 					unsigned int rate)
 {
@@ -173,6 +178,11 @@ static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
 	return 0;
 }
 #else
+static unsigned int erofs_get_fault_rate(struct erofs_sb_info *sbi)
+{
+	return 0;
+}
+
 static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
 					unsigned int rate)
 {
Signature · 1 line
2.17.1
#21 lore raw

PATCH 6/7 staging: erofs: code cleanup for erofs_show_options()

In reply to Chengguang Xu

Call erofs_get_fault_rate() to get fault rate instead of directly getting it from sbi, so we can remove the macro check surrounding it.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/erofs/super.c +1 -3
index a6ae60564c65..702098c80446 100644
@@ -648,11 +648,9 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root)
 	else
 		seq_puts(seq, ",noacl");
 #endif
-#ifdef CONFIG_EROFS_FAULT_INJECTION
 	if (test_opt(sbi, FAULT_INJECTION))
 		seq_printf(seq, ",fault_injection=%u",
-				sbi->fault_info.inject_rate);
-#endif
+			erofs_get_fault_rate(sbi));
 	return 0;
 }
 
Signature · 1 line
2.17.1
#22 lore raw

PATCH 7/7 staging: erofs: option validation in remount

In reply to Chengguang Xu

Add option validation in remount. After this patch, remount can change recognized options, and for unknown options remount will fail and report error.

Signed-off-by Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/super.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/staging/erofs/super.c +13 -0
index 702098c80446..953408fb82c8 100644
@@ -656,10 +656,23 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root)
 
 static int erofs_remount(struct super_block *sb, int *flags, char *data)
 {
+	struct erofs_sb_info *sbi = EROFS_SB(sb);
+	unsigned int org_mnt_opt = sbi->mount_opt;
+	unsigned int org_inject_rate = erofs_get_fault_rate(sbi);
+	int err;
+
 	BUG_ON(!sb_rdonly(sb));
+	err = parse_options(sb, data);
+	if (err)
+		goto out;
 
 	*flags |= MS_RDONLY;
 	return 0;
+out:
+	__erofs_build_fault_attr(sbi, org_inject_rate);
+	sbi->mount_opt = org_mnt_opt;
+
+	return err;
 }
 
 const struct super_operations erofs_sops = {
Signature · 1 line
2.17.1