diff mbox series

kconfig: fix broken dependency in randconfig-generated .config

Message ID 20200201050311.3458-1-masahiroy@kernel.org (mailing list archive)
State New, archived
Headers show
Series kconfig: fix broken dependency in randconfig-generated .config | expand

Commit Message

Masahiro Yamada Feb. 1, 2020, 5:03 a.m. UTC
Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5)
produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y,
which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency.

This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs
CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the
value of CONFIG_EFI is calculated.

When this happens, the has_changed flag should be set.

Currently, it takes the result from the last iteration. It should
accumulate all the results of the loop.

Reported-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/kconfig/confdata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Masahiro Yamada Feb. 1, 2020, 5:11 a.m. UTC | #1
On Sat, Feb 1, 2020 at 2:03 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5)
> produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y,
> which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency.
>
> This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs
> CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the
> value of CONFIG_EFI is calculated.
>
> When this happens, the has_changed flag should be set.
>
> Currently, it takes the result from the last iteration. It should
> accumulate all the results of the loop.
>
> Reported-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Maybe, this could be tagged:

Fixes: 3b9a19e08960 ("kconfig: loop as long as we changed some symbols
in randconfig")





>  scripts/kconfig/confdata.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index 99f2418baa6c..eb1efa3abdee 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -1353,7 +1353,7 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
>
>                 sym_calc_value(csym);
>                 if (mode == def_random)
> -                       has_changed = randomize_choice_values(csym);
> +                       has_changed |= randomize_choice_values(csym);
>                 else {
>                         set_all_choice_values(csym);
>                         has_changed = true;
> --
> 2.17.1
>
Vincenzo Frascino Feb. 7, 2020, 10:41 a.m. UTC | #2
On 01/02/2020 05:11, Masahiro Yamada wrote:
> On Sat, Feb 1, 2020 at 2:03 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>>
>> Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5)
>> produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y,
>> which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency.
>>
>> This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs
>> CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the
>> value of CONFIG_EFI is calculated.
>>
>> When this happens, the has_changed flag should be set.
>>
>> Currently, it takes the result from the last iteration. It should
>> accumulate all the results of the loop.
>>
>> Reported-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
>> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>> ---
> 
> Maybe, this could be tagged:
> 
> Fixes: 3b9a19e08960 ("kconfig: loop as long as we changed some symbols
> in randconfig")
> 
> 
>

Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>

> 
> 
>>  scripts/kconfig/confdata.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
>> index 99f2418baa6c..eb1efa3abdee 100644
>> --- a/scripts/kconfig/confdata.c
>> +++ b/scripts/kconfig/confdata.c
>> @@ -1353,7 +1353,7 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
>>
>>                 sym_calc_value(csym);
>>                 if (mode == def_random)
>> -                       has_changed = randomize_choice_values(csym);
>> +                       has_changed |= randomize_choice_values(csym);
>>                 else {
>>                         set_all_choice_values(csym);
>>                         has_changed = true;
>> --
>> 2.17.1
>>
> 
>
diff mbox series

Patch

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 99f2418baa6c..eb1efa3abdee 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -1353,7 +1353,7 @@  bool conf_set_all_new_symbols(enum conf_def_mode mode)
 
 		sym_calc_value(csym);
 		if (mode == def_random)
-			has_changed = randomize_choice_values(csym);
+			has_changed |= randomize_choice_values(csym);
 		else {
 			set_all_choice_values(csym);
 			has_changed = true;