create-diff-object: ignore .cold.* suffixes in is_bundleable()

While building a gcc-consprop patch from integration tests gcc8 would place a
__timekeeping_inject_sleeptime.constprop.18.cold.27 symbol into
.text.unlikely.__timekeeping_inject_sleeptime.constprop.18 section. Because
section name doesn't have the '.cold.27' suffix this symbol fails
is_bundleable() check while still being bundleable and later exits early in
kpatch_rename_mangled_functions() without renaming the corresponding patched
function. All of this results in a create-diff-object errror:

  ERROR: timekeeping.o: symbol changed sections: __timekeeping_inject_sleeptime.constprop.18.cold.27
  /home/asavkov/dev/kpatch/kpatch-build/create-diff-object: unreconcilable difference

Fix by ignoring .cold.* name suffix in is_bundleable() for.text.unlikely
sections.

Signed-off-by: Artem Savkov <asavkov@redhat.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>

diff --git a/common.c b/common.c
index 68a71f75ac7bed76ae7bd25198c1c53deef93370..84ca14d3e39708ab713bb77871ccb6c48b8e07d8 100644 (file)
--- a/common.c
+++ b/common.c
@@ -126,7 +126,9 @@ static int is_bundleable(struct symbol *sym)
 
        if (sym->type == STT_FUNC &&
            !strncmp(sym->sec->name, ".text.unlikely.",15) &&
-           !strcmp(sym->sec->name + 15, sym->name))
+           (!strcmp(sym->sec->name + 15, sym->name) ||
+                        (strstr(sym->name, ".cold.") &&
+                         !strncmp(sym->sec->name + 15, sym->name, strlen(sym->sec->name) - 15))))
                return 1;
 
        if (sym->type == STT_OBJECT &&