From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A89EE1B3759; Mon, 17 Jun 2024 13:22:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718630545; cv=none; b=tqmEWhxJIf52gTHtP9yAIc6DRR1ri/0BXGFD83ms6HMsiwqjutW2UlWs6Ryb+lQ/JVRgCaz3F39cXUC6FNRR6Yc4CBhykt6ickFtHt3JkSmHD7T1JyRpemKxp7fYTEO9HRu9GNc6cAYW3C/mpxlCglBdbBHgjZGobx2DqsM5qTQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718630545; c=relaxed/simple; bh=bX0MtxWC2K9hESeMVfhhVFpNsng9rY8CdwMrW0ZKeKg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=se15pTnoOi73WbBOTZNXaUXA3yI3sa3i6rSLHVvymO7Cd1uznjr2vtSvJXPjJIBSI6eVK53tXNCB9v8hQNKL5q4+xAyeLVhFDypzjw5A4P/1spO/fNOeTvUnpf7j2XeNuzSHMmrHzj+mx+MLfEDBmtXJirQDnGqfeBc2xcOa3Ac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BJoJOjCk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BJoJOjCk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3472C4AF4D; Mon, 17 Jun 2024 13:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718630545; bh=bX0MtxWC2K9hESeMVfhhVFpNsng9rY8CdwMrW0ZKeKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BJoJOjCkwAei3W1aIJR5RnSFtWkA/MyXvOCsPHov/FSJE16PGpizOEjfQRY6uv6w6 wVOhulZZoj0zd1QXheL9SOZiIQglwsFecQ56BANpdk1Z9gi1A00fYQ3vLnHm5e8vgC jOeS5L3H808S+ztgXzWfwrlmm6b0n5JsHM6uLcDjgrn/rH2PCEqba2C9XZbnZkb/Hh kHLbveyjO9QgiHBOUu29mSLrpARH/UIxHl5/8V3LEZRY5Ja0n3S5+9+dPk3cH/oUbg HnFEXL+kdHiC5h5V1bXNqJehDrKMenOxMuuNm/1mDet5sAXIzqWsDZufwKpjjEl51W unalfWlemtFHQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masahiro Yamada , Randy Dunlap , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 6.9 41/44] kconfig: remove wrong expr_trans_bool() Date: Mon, 17 Jun 2024 09:19:54 -0400 Message-ID: <20240617132046.2587008-41-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240617132046.2587008-1-sashal@kernel.org> References: <20240617132046.2587008-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.5 Content-Transfer-Encoding: 8bit From: Masahiro Yamada [ Upstream commit 77a92660d8fe8d29503fae768d9f5eb529c88b36 ] expr_trans_bool() performs an incorrect transformation. [Test Code] config MODULES def_bool y modules config A def_bool y select C if B != n config B def_tristate m config C tristate [Result] CONFIG_MODULES=y CONFIG_A=y CONFIG_B=m CONFIG_C=m This output is incorrect because CONFIG_C=y is expected. Documentation/kbuild/kconfig-language.rst clearly explains the function of the '!=' operator: If the values of both symbols are equal, it returns 'n', otherwise 'y'. Therefore, the statement: select C if B != n should be equivalent to: select C if y Or, more simply: select C Hence, the symbol C should be selected by the value of A, which is 'y'. However, expr_trans_bool() wrongly transforms it to: select C if B Therefore, the symbol C is selected by (A && B), which is 'm'. The comment block of expr_trans_bool() correctly explains its intention: * bool FOO!=n => FOO ^^^^ If FOO is bool, FOO!=n can be simplified into FOO. This is correct. However, the actual code performs this transformation when FOO is tristate: if (e->left.sym->type == S_TRISTATE) { ^^^^^^^^^^ While it can be fixed to S_BOOLEAN, there is no point in doing so because expr_tranform() already transforms FOO!=n to FOO when FOO is bool. (see the "case E_UNEQUAL" part) expr_trans_bool() is wrong and unnecessary. Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap Signed-off-by: Sasha Levin --- scripts/kconfig/expr.c | 29 ----------------------------- scripts/kconfig/expr.h | 1 - scripts/kconfig/menu.c | 2 -- 3 files changed, 32 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index a290de36307ba..7866167552177 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -396,35 +396,6 @@ static struct expr *expr_eliminate_yn(struct expr *e) return e; } -/* - * bool FOO!=n => FOO - */ -struct expr *expr_trans_bool(struct expr *e) -{ - if (!e) - return NULL; - switch (e->type) { - case E_AND: - case E_OR: - case E_NOT: - e->left.expr = expr_trans_bool(e->left.expr); - e->right.expr = expr_trans_bool(e->right.expr); - break; - case E_UNEQUAL: - // FOO!=n -> FOO - if (e->left.sym->type == S_TRISTATE) { - if (e->right.sym == &symbol_no) { - e->type = E_SYMBOL; - e->right.sym = NULL; - } - } - break; - default: - ; - } - return e; -} - /* * e1 || e2 -> ? */ diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 0158f5eac4542..f015883519b39 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -288,7 +288,6 @@ void expr_free(struct expr *e); void expr_eliminate_eq(struct expr **ep1, struct expr **ep2); int expr_eq(struct expr *e1, struct expr *e2); tristate expr_calc_value(struct expr *e); -struct expr *expr_trans_bool(struct expr *e); struct expr *expr_eliminate_dups(struct expr *e); struct expr *expr_transform(struct expr *e); int expr_contains_symbol(struct expr *dep, struct symbol *sym); diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 3b822cd110f47..8b48a80e7e168 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -379,8 +379,6 @@ static void _menu_finalize(struct menu *parent, bool inside_choice) dep = expr_transform(dep); dep = expr_alloc_and(expr_copy(basedep), dep); dep = expr_eliminate_dups(dep); - if (menu->sym && menu->sym->type != S_TRISTATE) - dep = expr_trans_bool(dep); prop->visible.expr = dep; /* -- 2.43.0