Re: init: multi param parsing regression since 3.4

[BenoÃt ThÃbaudeau]

On Mon, Jun 4, 2012 at 6:32:42AM, Rusty Russell wrote:
> Erk, I tested it and you're right.  Level 0 is 'early' initcalls, but
> traditional module parameters are called even earlier.  Simplest fix
> is to move the default parameters to -1.
> 
> This works for me:
> 
> Subject: module_param: stop double-calling parameters.
> From: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> 
> Commit 026cee0086fe1df4cf74691cf273062cc769617d "params:
> <level>_initcall-like kernel parameters" set old-style module
> parameters to level 0.  And we call those level 0 calls where we used
> to, early in start_kernel().
> 
> We also loop through the initcall levels and call the levelled
> module_params before the corresponding initcall.  Unfortunately level
> 0 is early_init(), so we call the standard module_param calls twice.
> 
> (Turns out most things don't care, but at least ubi.mtd does).
> 
> Change the level to -1 for standard module_param calls.
> 
> Reported-by: BenoÃt ThÃbaudeau <benoit.thebaudeau@xxxxxxxxxxxx>
> Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxx
> 
> diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
> --- a/drivers/mtd/ubi/build.c
> +++ b/drivers/mtd/ubi/build.c
> @@ -1293,6 +1293,8 @@ static int __init ubi_mtd_param_parse(co
>  	char *pbuf = &buf[0];
>  	char *tokens[2] = {NULL, NULL};
>  
> +	printk("ubi_mtd_param_parse: val = %s\n", val);
> +	WARN_ON(1);
>  	if (!val)
>  		return -EINVAL;
>  
> diff --git a/include/linux/moduleparam.h
> b/include/linux/moduleparam.h
> --- a/include/linux/moduleparam.h
> +++ b/include/linux/moduleparam.h
> @@ -128,7 +128,7 @@ struct kparam_array
>   * The ops can have NULL set or get functions.
>   */
>  #define module_param_cb(name, ops, arg, perm)				      \
> -	__module_param_call(MODULE_PARAM_PREFIX, name, ops, arg, perm, 0)
> +	__module_param_call(MODULE_PARAM_PREFIX, name, ops, arg, perm, -1)
>  
>  /**
>   * <level>_param_cb - general callback for a module/cmdline
>   parameter
> @@ -192,7 +192,7 @@ struct kparam_array
>  		 { (void *)set, (void *)get };				\
>  	__module_param_call(MODULE_PARAM_PREFIX,			\
>  			    name, &__param_ops_##name, arg,		\
> -			    (perm) + sizeof(__check_old_set_param(set))*0, 0)
> +			    (perm) + sizeof(__check_old_set_param(set))*0, -1)
>  
>  /* We don't get oldget: it's often a new-style param_get_uint, etc.
>  */
>  static inline int
> @@ -272,7 +272,7 @@ static inline void __kernel_param_unlock
>   */
>  #define core_param(name, var, type, perm)				\
>  	param_check_##type(name, &(var));				\
> -	__module_param_call("", name, &param_ops_##type, &var, perm, 0)
> +	__module_param_call("", name, &param_ops_##type, &var, perm, -1)
>  #endif /* !MODULE */
>  
>  /**
> @@ -290,7 +290,7 @@ static inline void __kernel_param_unlock
>  		= { len, string };					\
>  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
>  			    &param_ops_string,				\
> -			    .str = &__param_string_##name, perm, 0);	\
> +			    .str = &__param_string_##name, perm, -1);	\
>  	__MODULE_PARM_TYPE(name, "string")
>  
>  /**
> @@ -432,7 +432,7 @@ extern int param_set_bint(const char *va
>  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
>  			    &param_array_ops,				\
>  			    .arr = &__param_arr_##name,			\
> -			    perm, 0);					\
> +			    perm, -1);					\
>  	__MODULE_PARM_TYPE(name, "array of " #type)
>  
>  extern struct kernel_param_ops param_array_ops;
> diff --git a/init/main.c b/init/main.c
> --- a/init/main.c
> +++ b/init/main.c
> @@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(void
>  	parse_early_param();
>  	parse_args("Booting kernel", static_command_line, __start___param,
>  		   __stop___param - __start___param,
> -		   0, 0, &unknown_bootoption);
> +		   -1, -1, &unknown_bootoption);
>  
>  	jump_label_init();
>  
> 

It works for me too. But I think you can remove the 1st hunk, which seems to be
a leftover from your tests.

Regards,
BenoÃt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/