RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-03-11 05:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1117 from jpoimboe/rela-equal

Browse Source 
Ignore changes to .altinstr_aux
This commit is contained in:
Joe Lawrence 2020-06-25 10:34:41 -04:00 committed by GitHub
commit e0221f489e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kpatch-build/create-diff-object.c
View File

@ -378,14 +378,27 @@ static int kpatch_mangled_strcmp(char *s1, char *s2)
return 1;
}
static int rela_equal(struct rela *rela1, struct rela *rela2)
static bool rela_equal(struct rela *rela1, struct rela *rela2)
{
struct rela *rela_toc1, *rela_toc2;
unsigned long toc_data1 = 0, toc_data2 = 0; /* = 0 to prevent gcc warning */
if (rela1->type != rela2->type ||
rela1->offset != rela2->offset)
return 0;
return false;
/*
* On x86, .altinstr_aux is used to store temporary code which allows
* static_cpu_has() to work before apply_alternatives() has run. This
* code is completely inert for modules, because apply_alternatives()
* runs during module init, before the module is fully formed. Any
* changed references to it (i.e. changed addend) can be ignored. As
* long as they're both references to .altinstr_aux, they can be
* considered equal, even if the addends differ.
*/
if (!strcmp(rela1->sym->name, ".altinstr_aux") &&
!strcmp(rela2->sym->name, ".altinstr_aux"))
return true;
/*
* With -mcmodel=large on ppc64le, GCC might generate entries in the .toc
@ -444,13 +457,13 @@ static int rela_equal(struct rela *rela1, struct rela *rela2)
return toc_data1 == toc_data2;
if (!rela_toc1 || !rela_toc2)
return 0;
return false;
if (rela_toc1->string)
return rela_toc2->string && !strcmp(rela_toc1->string, rela_toc2->string);
if (rela_toc1->addend != rela_toc2->addend)
return 0;
return false;
return !kpatch_mangled_strcmp(rela_toc1->sym->name, rela_toc2->sym->name);
}