Skip to contentSkip to conversation

gendwarfksyms - improve symtypes output

PATCH In review Giuliano Procida 3 participants 5 messages Jul 1, 2025 – Jul 2, 2025 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): CAK7LNASzE1CtRo9T4byPXJtB-HtuWsGe=OLba+8JU9fB28Chow@mail.gmail.com

#1 lore raw

v2 cover gendwarfksyms - improve symtypes output

When investigating MODVERSIONS CRC changes from one build to the next, we need to diff corresponding symtypes files. However, gendwarfksyms did not order these files.

The first change in this series makes gendwarfksyms code conform to the preferred style for the size parameter passed to allocation functions.

https://github.com/torvalds/linux/blob/v6.15/Documentation/process/coding-style.rst?plain=1#L941

The second change in this series ensures symtypes are output in key order.

The series is marked as v2 to distinguish it from earlier versions where the changes were posted individually.

Giuliano Procida (2):
gendwarfksyms: use preferred form of sizeof for allocation
gendwarfksyms: order -T symtypes output by name

 scripts/gendwarfksyms/cache.c   |  2 +-
 scripts/gendwarfksyms/die.c     |  4 ++--
 scripts/gendwarfksyms/dwarf.c   |  2 +-
 scripts/gendwarfksyms/kabi.c    |  2 +-
 scripts/gendwarfksyms/symbols.c |  2 +-
 scripts/gendwarfksyms/types.c   | 33 ++++++++++++++++++++++++++++-----
 6 files changed, 34 insertions(+), 11 deletions(-)
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
#2 lore raw

PATCH v2 1/2 gendwarfksyms: use preferred form of sizeof for allocation

The preferred form is to use the variable being allocated to, rather than explicitly supplying a type name which might become stale.

Also do this for memset.

---
 scripts/gendwarfksyms/cache.c   | 2 +-
 scripts/gendwarfksyms/die.c     | 4 ++--
 scripts/gendwarfksyms/dwarf.c   | 2 +-
 scripts/gendwarfksyms/kabi.c    | 2 +-
 scripts/gendwarfksyms/symbols.c | 2 +-
 scripts/gendwarfksyms/types.c   | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
scripts/gendwarfksyms/cache.c +1 -1
index c9c19b86a686..1c640db93db3 100644
@@ -15,7 +15,7 @@ void cache_set(struct cache *cache, unsigned long key, int value)
 {
 	struct cache_item *ci;
 
-	ci = xmalloc(sizeof(struct cache_item));
+	ci = xmalloc(sizeof(*ci));
 	ci->key = key;
 	ci->value = value;
 	hash_add(cache->cache, &ci->hash, hash_32(key));
scripts/gendwarfksyms/die.c +2 -2
index 6183bbbe7b54..052f7a3f975a 100644
@@ -33,7 +33,7 @@ static struct die *create_die(Dwarf_Die *die, enum die_state state)
 {
 	struct die *cd;
 
-	cd = xmalloc(sizeof(struct die));
+	cd = xmalloc(sizeof(*cd));
 	init_die(cd);
 	cd->addr = (uintptr_t)die->addr;
 
@@ -123,7 +123,7 @@ static struct die_fragment *append_item(struct die *cd)
 {
 	struct die_fragment *df;
 
-	df = xmalloc(sizeof(struct die_fragment));
+	df = xmalloc(sizeof(*df));
 	df->type = FRAGMENT_EMPTY;
 	list_add_tail(&df->list, &cd->fragments);
 	return df;
scripts/gendwarfksyms/dwarf.c +1 -1
index 13ea7bf1ae7d..3538a7d9cb07 100644
@@ -634,7 +634,7 @@ static int get_union_kabi_status(Dwarf_Die *die, Dwarf_Die *placeholder,
 	 * Note that the user of this feature is responsible for ensuring
 	 * that the structure actually remains ABI compatible.
 	 */
-	memset(&state.kabi, 0, sizeof(struct kabi_state));
+	memset(&state.kabi, 0, sizeof(state.kabi));
 
 	res = checkp(process_die_container(&state, NULL, die,
 					   check_union_member_kabi_status,
scripts/gendwarfksyms/kabi.c +1 -1
index b3ade713778f..e3c2a3ccf51a 100644
@@ -228,7 +228,7 @@ void kabi_read_rules(int fd)
 		if (type == KABI_RULE_TYPE_UNKNOWN)
 			error("unsupported kABI rule type: '%s'", field);
 
-		rule = xmalloc(sizeof(struct rule));
+		rule = xmalloc(sizeof(*rule));
 
 		rule->type = type;
 		rule->target = xstrdup(get_rule_field(&rule_str, &left));
scripts/gendwarfksyms/symbols.c +1 -1
index 327f87389c34..35ed594f0749 100644
@@ -146,7 +146,7 @@ void symbol_read_exports(FILE *file)
 			continue;
 		}
 
-		sym = xcalloc(1, sizeof(struct symbol));
+		sym = xcalloc(1, sizeof(*sym));
 		sym->name = name;
 		sym->addr.section = SHN_UNDEF;
 		sym->state = SYMBOL_UNPROCESSED;
scripts/gendwarfksyms/types.c +2 -2
index 7bd459ea6c59..5344c7b9a9ce 100644
@@ -43,7 +43,7 @@ static int type_list_append(struct list_head *list, const char *s, void *owned)
 	if (!s)
 		return 0;
 
-	entry = xmalloc(sizeof(struct type_list_entry));
+	entry = xmalloc(sizeof(*entry));
 	entry->str = s;
 	entry->owned = owned;
 	list_add_tail(&entry->list, list);
@@ -120,7 +120,7 @@ static struct type_expansion *type_map_add(const char *name,
 	struct type_expansion *e;
 
 	if (__type_map_get(name, &e)) {
-		e = xmalloc(sizeof(struct type_expansion));
+		e = xmalloc(sizeof(*e));
 		type_expansion_init(e);
 		e->name = xstrdup(name);
 
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
maintainer Reviewed-by on v2 1/2
#3 lore raw

Re: [PATCH v2 1/2] gendwarfksyms: use preferred form of sizeof for allocation

Quoted 7 lines · Giuliano Procida

The preferred form is to use the variable being allocated to, rather than explicitly supplying a type name which might become stale.

Also do this for memset.

Sami

#4 lore raw

PATCH v2 2/2 gendwarfksyms: order -T symtypes output by name

In reply to Giuliano Procida

When writing symtypes information, we iterate through the entire hash table containing type expansions. The key order varies unpredictably as new entries are added, making it harder to compare symtypes between builds.

Resolve this by sorting the type expansions by name before output.

---
 scripts/gendwarfksyms/types.c | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)
scripts/gendwarfksyms/types.c +26 -3
index 5344c7b9a9ce..9c3b053bf061 100644
@@ -6,6 +6,8 @@
 #define _GNU_SOURCE
 #include <inttypes.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <zlib.h>
 
 #include "gendwarfksyms.h"
@@ -179,20 +181,41 @@ static int type_map_get(const char *name, struct type_expansion **res)
 	return -1;
 }
 
+static int cmp_expansion_name(const void *p1, const void *p2)
+{
+	struct type_expansion *const *e1 = p1;
+	struct type_expansion *const *e2 = p2;
+
+	return strcmp((*e1)->name, (*e2)->name);
+}
+
 static void type_map_write(FILE *file)
 {
 	struct type_expansion *e;
 	struct hlist_node *tmp;
+	struct type_expansion **es;
+	size_t count = 0;
+	size_t i = 0;
 
 	if (!file)
 		return;
 
-	hash_for_each_safe(type_map, e, tmp, hash) {
-		checkp(fputs(e->name, file));
+	hash_for_each_safe(type_map, e, tmp, hash)
+		++count;
+	es = xmalloc(count * sizeof(*es));
+	hash_for_each_safe(type_map, e, tmp, hash)
+		es[i++] = e;
+
+	qsort(es, count, sizeof(*es), cmp_expansion_name);
+
+	for (i = 0; i < count; ++i) {
+		checkp(fputs(es[i]->name, file));
 		checkp(fputs(" ", file));
-		type_list_write(&e->expanded, file);
+		type_list_write(&es[i]->expanded, file);
 		checkp(fputs("\n", file));
 	}
+
+	free(es);
 }
 
 static void type_map_free(void)
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
#5 lore raw
In reply to Giuliano Procida
Quoted 9 lines · Giuliano Procida

When investigating MODVERSIONS CRC changes from one build to the next, we need to diff corresponding symtypes files. However, gendwarfksyms did not order these files.

The first change in this series makes gendwarfksyms code conform to the preferred style for the size parameter passed to allocation functions.

Quoted 8 lines

https://github.com/torvalds/linux/blob/v6.15/Documentation/process/coding-style.rst?plain=1#L941

The second change in this series ensures symtypes are output in key order.

The series is marked as v2 to distinguish it from earlier versions where the changes were posted individually.

Both applied to linux-kbuild.
Thanks!

Signature · 2 lines
Best Regards
Masahiro Yamada