linux-kernel - [PATCH v2 10/10] [for -next only] kconfig: generate include/generated/rustc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20211002085823.1280124-1-masahiroy@kernel.org>
Date:   Sat,  2 Oct 2021 17:58:23 +0900
From:   Masahiro Yamada <masahiroy@...nel.org>
To:     linux-kbuild@...r.kernel.org
Cc:     Masahiro Yamada <masahiroy@...nel.org>,
        linux-kernel@...r.kernel.org
Subject: [PATCH v2 10/10] [for -next only] kconfig: generate include/generated/rustc_cfg

This patch is not intended for the mainline.

I created this patch for Stephen Rothwell to resolve the merge
conflicts in linux-next more easily.

The Rust tree is touching scripts/kconfig/confdata.c to generate
include/generated/rustc_cfg, which would cause complicated conflicts
with changes from the kbuild tree.

I re-implemented it to produce the equaivalent rustc_cfg.

I also fixed the memory leak; the original code from the Rust tree
did not free the malloc'ed pointer.

Stephen:
When you resolve the conflicts in confdata.c, please take this one.

Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
---

Changes for v2:
 - Fix memory leak for *val == 'n' case.


 scripts/kconfig/confdata.c | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 9ece2f3b61a6..ad371d71c842 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -603,6 +603,9 @@ static const struct comment_style comment_style_c = {
 
 static void conf_write_heading(FILE *fp, const struct comment_style *cs)
 {
+	if (!cs) /* no heading for rustc_cfg? */
+		return;
+
 	fprintf(fp, "%s\n", cs->comment_block_begin);
 
 	fprintf(fp, "%s Automatically generated file; DO NOT EDIT.\n",
@@ -750,6 +753,38 @@ static void print_symbol_for_c(FILE *fp, struct symbol *sym)
 	free(escaped);
 }
 
+/* rustc configuration */
+static void print_symbol_for_rustc_cfg(FILE *fp, struct symbol *sym)
+{
+	const char *val;
+	char *escaped;
+
+	if (sym->type == S_UNKNOWN)
+		return;
+
+	val = sym_get_string_value(sym);
+
+	if ((sym->type == S_BOOLEAN || sym->type == S_TRISTATE) && *val == 'n')
+		return;
+
+	/*
+	 * To have similar functionality to the C macro `IS_ENABLED()` we
+	 * provide an empty `--cfg CONFIG_X` here in both `y` and `m` cases.
+	 *
+	 * Then, the common `fprintf()` below will also give us a
+	 * `--cfg CONFIG_X="y"` or `--cfg CONFIG_X="m"`, which can be used as
+	 * the equivalent of `IS_BUILTIN()`/`IS_MODULE()`.
+	 */
+	if (sym->type == S_BOOLEAN || sym->type == S_TRISTATE)
+		fprintf(fp, "--cfg=%s%s\n", CONFIG_, sym->name);
+
+	escaped = escape_string_value(val);
+
+	fprintf(fp, "--cfg=%s%s=%s\n", CONFIG_, sym->name, escaped);
+
+	free(escaped);
+}
+
 /*
  * Write out a minimal config.
  * All values that has default values are skipped as this is redundant.
@@ -1129,6 +1164,12 @@ int conf_write_autoconf(int overwrite)
 	if (ret)
 		return ret;
 
+	ret = __conf_write_autoconf("include/generated/rustc_cfg",
+				    print_symbol_for_rustc_cfg,
+				    NULL);
+	if (ret)
+		return ret;
+
 	/*
 	 * Create include/config/auto.conf. This must be the last step because
 	 * Kbuild has a dependency on auto.conf and this marks the successful
-- 
2.30.2