kconfig: fix submenu rendering of negative dependencies
Julian Braha
reviewerPATCH v2 1/1 kconfig: fix submenu rendering of negative dependencies
The Kconfig frontend should render options that depend on a previous option in the submenu of that previous option. But currently, this breaks for negative dependencies. For example, option FOO may be rendered in the submenu of option BAR, despite FOO actually depending on !BAR.
Let's fix this ironic rendering by modifying Kconfig to explicitly check negative dependencies.
I've only tested locally on x86, but as far as I can tell, this only changes how 2 options are rendered in the menu:
1. NTFS3_FS, no longer in the NTFS_FS submenu, and
2. MTD_BLOCK_RO, no longer in the MTD_BLOCK submenu.
---
Changes since v1:
- made commit message self-contained
- moved the issue link to the trailers
- add Nathan's tested-by and Xi's reported-by tags Link to v1:
https://lore.kernel.org/all/[email protected]/
--- scripts/kconfig/expr.c | 33 +++++++++++++++++++++++++++++++++ scripts/kconfig/expr.h | 1 + scripts/kconfig/menu.c | 10 ++++++++++ 3 files changed, 44 insertions(+)
scripts/kconfig/expr.c +33 -0
@@ -738,6 +738,39 @@ bool expr_contains_symbol(struct expr *dep, struct symbol *sym)return false; } +/* +* Check if the expression references 'sym' in a way that is satisfiable +* with 'sym' disabled, e.g.'sym!=y'. +* +* Expects that expr_transform() was already called on 'expr'. +*/ +bool expr_contains_symbol_negated (struct expr *dep,struct symbol *sym) +{ +if (!dep) +return false; + +switch (dep->type) { +case E_AND : +case E_OR : +return expr_contains_symbol_negated (dep->left.expr, sym) || +expr_contains_symbol_negated (dep->right.expr, sym); +case E_NOT : +return dep->left.expr->type ==E_SYMBOL && + dep->left.expr->left.sym == sym; +case E_EQUAL : +/* sym=n */ +return dep->left.sym == sym && dep->right.sym == &symbol_no; +case E_UNEQUAL : +/* sym!=y, sym!=m */ +return dep->left.sym == sym && + (dep->right.sym == &symbol_yes || + dep->right.sym == &symbol_mod); +default : +break ; + } +return false; +} +bool expr_depends_symbol (struct expr *dep,struct symbol *sym) {if (!dep)
scripts/kconfig/expr.h +1 -0
@@ -307,6 +307,7 @@ tristate expr_calc_value(struct expr *e);struct expr *expr_eliminate_dups (struct expr *e);struct expr *expr_transform (struct expr *e);bool expr_contains_symbol (struct expr *dep,struct symbol *sym); +bool expr_contains_symbol_negated (struct expr *dep,struct symbol *sym);bool expr_depends_symbol (struct expr *dep,struct symbol *sym);struct expr *expr_trans_compare (struct expr *e,enum expr_type type,struct symbol *sym);
scripts/kconfig/menu.c +10 -0
@@ -428,9 +428,19 @@ static void _menu_finalize(struct menu *parent, bool inside_choice)if (!expr_contains_symbol (dep, sym))/* No dependency, quit */ break ; +/* +* Note that it's actually possible to depend on both +* 'SYM!=y' and 'SYM=y', so we need to first check if +* it's a positive dependency before checking if it's +* a negative dependency. See example: +* 'SFC && MTD && !(SFC=y && MTD=m)' +*/ if (expr_depends_symbol (dep, sym))/* Absolute dependency, put in submenu */ goto next; +if (expr_contains_symbol_negated (dep, sym)) +/* Negative dependency, quit */ +break ;/* * Also consider it a dependency on sym if our
Signature · 1 line
2.55.0
Quoted 10 lines · Julian Braha
The
Kconfigfrontend should render options that depend on a previous option in the submenu of that previous option. But currently, this breaks for negative dependencies. For example, option FOO may be rendered in the submenu of option BAR, despite FOO actually depending on !BAR.Let's fix this ironic rendering by modifying
Kconfigto explicitly check negative dependencies.[...]
Signature · 1 line
Nicolas
Nicolas Schier
maintainerQuoted 1 line · Julian Braha
kconfig: fix submenu rendering of negative dependencies
Applied to kbuild/linux.git (kbuild-next-unstable), thanks!
[1/1] kconfig: fix submenu rendering of negative dependencies
https://git.kernel.org/kbuild/c/8fbf553d
Please look out for regression or issue reports or other follow up comments, as they may result in the patch/series getting dropped, reverted or modified (e.g. trailers).
Patches applied to the kbuild-next-unstable branch are accepted pending wider testing in linux-next and any post-commit review; they will generally be moved to the kbuild-next branch in about a week if no issues are found.
Best regards,
Signature · 1 line
Nicolas