tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMLIST: gendwarfksyms: order -T symtypes output by name

Browse Source 
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.

Signed-off-by: Giuliano Procida <gprocida@google.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>

Bug: 400972353
Link: https://lore.kernel.org/lkml/20250625095215.4027938-1-gprocida@google.com/
Change-Id: Icb2d0ec4a22593c59b43816a009ac19ed1e3e3bb
Signed-off-by: Giuliano Procida <gprocida@google.com>
This commit is contained in:
Giuliano Procida
2025-06-20 11:31:25 +01:00
committed by Greg Kroah-Hartman
parent 1493f0937f
commit 4f7b72e026
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/gendwarfksyms/types.c
View File

@@ -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(struct type_expansion *));
hash_for_each_safe(type_map, e, tmp, hash)
es[i++] = e;
qsort(es, count, sizeof(struct type_expansion *), 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)