gendwarfksyms: Fix structure type overrides

As we always iterate through the entire die_map when expanding
type strings, recursively processing referenced types in
type_expand_child() is not actually necessary. Furthermore,
the type_string kABI rule added in commit c9083467f7b9
("gendwarfksyms: Add a kABI rule to override type strings") can
fail to override type strings for structures due to a missing
kabi_get_type_string() check in this function.

Fix the issue by dropping the unnecessary recursion and moving
the override check to type_expand(). Note that symbol versions
are otherwise unchanged with this patch.

Fixes: c9083467f7b9 ("gendwarfksyms: Add a kABI rule to override type strings")
Reported-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Petr Pavlu <petr.pavlu@suse.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/gendwarfksyms/gendwarfksyms.h b/scripts/gendwarfksyms/gendwarfksyms.h
index 7dd03ffe0c5c829d32cadfe9ac9109ed7455dd92..d9c06d2cb1dfc07aed805356feb624fe74194c6d 100644 (file)
--- a/scripts/gendwarfksyms/gendwarfksyms.h
+++ b/scripts/gendwarfksyms/gendwarfksyms.h
@@ -216,24 +216,14 @@ int cache_get(struct cache *cache, unsigned long key);
 void cache_init(struct cache *cache);
 void cache_free(struct cache *cache);
 
-static inline void __cache_mark_expanded(struct cache *cache, uintptr_t addr)
-{
-       cache_set(cache, addr, 1);
-}
-
-static inline bool __cache_was_expanded(struct cache *cache, uintptr_t addr)
-{
-       return cache_get(cache, addr) == 1;
-}
-
 static inline void cache_mark_expanded(struct cache *cache, void *addr)
 {
-       __cache_mark_expanded(cache, (uintptr_t)addr);
+       cache_set(cache, (unsigned long)addr, 1);
 }
 
 static inline bool cache_was_expanded(struct cache *cache, void *addr)
 {
-       return __cache_was_expanded(cache, (uintptr_t)addr);
+       return cache_get(cache, (unsigned long)addr) == 1;
 }
 
 /*

diff --git a/scripts/gendwarfksyms/types.c b/scripts/gendwarfksyms/types.c
index 39ce1770e46364bafa275debf9327ec130b6bc4e..7bd459ea6c597cf1d37892e3e0e99d618dfa6ec2 100644 (file)
--- a/scripts/gendwarfksyms/types.c
+++ b/scripts/gendwarfksyms/types.c
@@ -333,37 +333,11 @@ static void calculate_version(struct version *version,
        cache_free(&expansion_cache);
 }
 
-static void __type_expand(struct die *cache, struct type_expansion *type,
-                         bool recursive);
-
-static void type_expand_child(struct die *cache, struct type_expansion *type,
-                             bool recursive)
-{
-       struct type_expansion child;
-       char *name;
-
-       name = get_type_name(cache);
-       if (!name) {
-               __type_expand(cache, type, recursive);
-               return;
-       }
-
-       if (recursive && !__cache_was_expanded(&expansion_cache, cache->addr)) {
-               __cache_mark_expanded(&expansion_cache, cache->addr);
-               type_expansion_init(&child);
-               __type_expand(cache, &child, true);
-               type_map_add(name, &child);
-               type_expansion_free(&child);
-       }
-
-       type_expansion_append(type, name, name);
-}
-
-static void __type_expand(struct die *cache, struct type_expansion *type,
-                         bool recursive)
+static void __type_expand(struct die *cache, struct type_expansion *type)
 {
        struct die_fragment *df;
        struct die *child;
+       char *name;
 
        list_for_each_entry(df, &cache->fragments, list) {
                switch (df->type) {
@@ -379,7 +353,12 @@ static void __type_expand(struct die *cache, struct type_expansion *type,
                                error("unknown child: %" PRIxPTR,
                                      df->data.addr);
 
-                       type_expand_child(child, type, recursive);
+                       name = get_type_name(child);
+                       if (name)
+                               type_expansion_append(type, name, name);
+                       else
+                               __type_expand(child, type);
+
                        break;
                case FRAGMENT_LINEBREAK:
                        /*
@@ -397,12 +376,17 @@ static void __type_expand(struct die *cache, struct type_expansion *type,
        }
 }
 
-static void type_expand(struct die *cache, struct type_expansion *type,
-                       bool recursive)
+static void type_expand(const char *name, struct die *cache,
+                       struct type_expansion *type)
 {
+       const char *override;
+
        type_expansion_init(type);
-       __type_expand(cache, type, recursive);
-       cache_free(&expansion_cache);
+
+       if (stable && kabi_get_type_string(name, &override))
+               type_parse(name, override, type);
+       else
+               __type_expand(cache, type);
 }
 
 static void type_parse(const char *name, const char *str,
@@ -416,8 +400,6 @@ static void type_parse(const char *name, const char *str,
        if (!*str)
                error("empty type string override for '%s'", name);
 
-       type_expansion_init(type);
-
        for (pos = 0; str[pos]; ++pos) {
                bool empty;
                char marker = ' ';
@@ -478,7 +460,6 @@ static void type_parse(const char *name, const char *str,
 static void expand_type(struct die *cache, void *arg)
 {
        struct type_expansion type;
-       const char *override;
        char *name;
 
        if (cache->mapped)
@@ -504,11 +485,7 @@ static void expand_type(struct die *cache, void *arg)
 
        debug("%s", name);
 
-       if (stable && kabi_get_type_string(name, &override))
-               type_parse(name, override, &type);
-       else
-               type_expand(cache, &type, true);
-
+       type_expand(name, cache, &type);
        type_map_add(name, &type);
        type_expansion_free(&type);
        free(name);
@@ -518,7 +495,6 @@ static void expand_symbol(struct symbol *sym, void *arg)
 {
        struct type_expansion type;
        struct version version;
-       const char *override;
        struct die *cache;
 
        /*
@@ -532,10 +508,7 @@ static void expand_symbol(struct symbol *sym, void *arg)
        if (__die_map_get(sym->die_addr, DIE_SYMBOL, &cache))
                return; /* We'll warn about missing CRCs later. */
 
-       if (stable && kabi_get_type_string(sym->name, &override))
-               type_parse(sym->name, override, &type);
-       else
-               type_expand(cache, &type, false);
+       type_expand(sym->name, cache, &type);
 
        /* If the symbol already has a version, don't calculate it again. */
        if (sym->state != SYMBOL_PROCESSED) {