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 4A6B32C1E15; Mon, 5 May 2025 22:20:11 +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=1746483611; cv=none; b=D8736xTkBu6sYswfbkfiTJUHNym+bnNOJi6zI+6yG5aK4s8T2qzP1Z1uRtCS+YjBiRo8r5iEy4xmXj9XMP1an4L46bpM/NUEjVl6fLqveLAuwNq2w0VAtgJYcTUFgMb/UAm5OAkBcfLbI6yr1KTFp3AxSb6THwIrTfIW/1+Cu00= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483611; c=relaxed/simple; bh=VzfuitWmNtwy2lfYXQP3+eZjHCxR1uGp2yuas6XIq0o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tFmDsU9v8WKx/JmtXfx+qeBWQepLXD5D3PYkJL4O0h7/Avay0Pkxf0OpDoEhwfD15tAw/E0waWaQ/n8xu87H1BLO7U3BHosUXQQCGbnybObDyzlJMfmwihTRZHNsQolMdSRM18rglSHxuC8TYmfKSYg1sYwSRiSqRpDCqiPFu6M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vK8qFy5A; 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="vK8qFy5A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81DFBC4CEED; Mon, 5 May 2025 22:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483611; bh=VzfuitWmNtwy2lfYXQP3+eZjHCxR1uGp2yuas6XIq0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vK8qFy5A5pyNB/Xe6T1PycJOMiCQQ9B0hBd0k9fXGkAnLTn9LlhmkGUSfjazMq5Hz I8TtcopfbH/96FtT3NOLWbugXM99gV4ccxcEoBArYv6ehCsQ0E3x2IJ36qIDXSYunW upT/GwvC0hJbIAeF1NYdTZg1WaP4UHYSO4yskCGmyXHa+rxIRUp8SVIlmP2ctut3tx 3eOTzmZ5usEGJv3DyPmp2NhDDN3MaupZVeunOdh4z4VxcplXC+K9IbncItJcAeqeyB NDfxfJ+4yMkSshjSakVBAuilVBcZ40u2AHe2U0bCtmJD8TMqcySLONF8RWcYfgx5Ix I1tqRX9jitplw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masahiro Yamada , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 142/642] kconfig: do not clear SYMBOL_VALID when reading include/config/auto.conf Date: Mon, 5 May 2025 18:05:58 -0400 Message-Id: <20250505221419.2672473-142-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.14.5 Content-Transfer-Encoding: 8bit From: Masahiro Yamada [ Upstream commit 226ac19c217f24f0927d0a73cf9ee613971a188d ] When conf_read_simple() is called with S_DEF_AUTO, it is meant to read previous symbol values from include/config/auto.conf to determine which include/config/* files should be touched. This process should not modify the current symbol status in any way. However, conf_touch_deps() currently invalidates all symbol values and recalculates them, which is totally unneeded. Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/kconfig/confdata.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 3b55e7a4131d9..ac95661a1c9dd 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -385,7 +385,7 @@ int conf_read_simple(const char *name, int def) def_flags = SYMBOL_DEF << def; for_all_symbols(sym) { - sym->flags &= ~(def_flags|SYMBOL_VALID); + sym->flags &= ~def_flags; switch (sym->type) { case S_INT: case S_HEX: @@ -398,7 +398,11 @@ int conf_read_simple(const char *name, int def) } } - expr_invalidate_all(); + if (def == S_DEF_USER) { + for_all_symbols(sym) + sym->flags &= ~SYMBOL_VALID; + expr_invalidate_all(); + } while (getline_stripped(&line, &line_asize, in) != -1) { struct menu *choice; @@ -464,6 +468,9 @@ int conf_read_simple(const char *name, int def) if (conf_set_sym_val(sym, def, def_flags, val)) continue; + if (def != S_DEF_USER) + continue; + /* * If this is a choice member, give it the highest priority. * If conflicting CONFIG options are given from an input file, @@ -967,10 +974,8 @@ static int conf_touch_deps(void) depfile_path[depfile_prefix_len] = 0; conf_read_simple(name, S_DEF_AUTO); - sym_calc_value(modules_sym); for_all_symbols(sym) { - sym_calc_value(sym); if (sym_is_choice(sym)) continue; if (sym->flags & SYMBOL_WRITE) { @@ -1084,12 +1089,12 @@ int conf_write_autoconf(int overwrite) if (ret) return -1; - if (conf_touch_deps()) - return 1; - for_all_symbols(sym) sym_calc_value(sym); + if (conf_touch_deps()) + return 1; + ret = __conf_write_autoconf(conf_get_autoheader_name(), print_symbol_for_c, &comment_style_c); -- 2.39.5