RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1027 from jpoimboe/ignore-descriptor-static-key 

create-diff-object: allow dynamic debug static keys
This commit is contained in:
Joe Lawrence 2019-08-19 10:50:13 -04:00 committed by GitHub
parent c9fa73bb9a 2975775768
commit 2e9cfa2fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,6 +237,15 @@ static void kpatch_detect_child_functions(struct kpatch_elf *kelf)
}
}
static bool is_dynamic_debug_symbol(struct symbol *sym)
{
if (sym->type == STT_OBJECT && !strcmp(sym->sec->name, "__verbose"))
return true;
if (sym->type == STT_SECTION && !strcmp(sym->name, "__verbose"))
return true;
return false;
}
/*
* This function detects whether the given symbol is a "special" static local
* variable (for lack of a better term).
@ -261,8 +270,7 @@ static int is_special_static(struct symbol *sym)
return 0;
/* pr_debug() uses static local variables in the __verbose section */
if ((sym->type == STT_OBJECT && !strcmp(sym->sec->name, "__verbose")) ||
(sym->type == STT_SECTION && !strcmp(sym->name, "__verbose")))
if (is_dynamic_debug_symbol(sym))
return 1;
if (sym->type == STT_SECTION) {
@ -2104,9 +2112,16 @@ static void kpatch_regenerate_special_section(struct kpatch_elf *kelf,
if (i != 3)
ERROR("BUG: __jump_table has an unexpected format");
if (strncmp(key->sym->name, "__tracepoint_", 13))
ERROR("Found a jump label at %s()+0x%x, using key %s. Jump labels aren't currently supported. Use static_key_enabled() instead.",
code->sym->name, code->addend, key->sym->name);
/* inert tracepoints are harmless */
if (!strncmp(key->sym->name, "__tracepoint_", 13))
continue;
/* inert dynamic debug printks are harmless */
if (is_dynamic_debug_symbol(key->sym))
continue;
ERROR("Found a jump label at %s()+0x%x, using key %s. Jump labels aren't currently supported. Use static_key_enabled() instead.",
code->sym->name, code->addend, key->sym->name);
continue;
}

2
test/unit/objs

@ -1 +1 @@
Subproject commit 0b34cbb7e835706615d2295f8c3129a23e19f6e6
Subproject commit 510a90ca8d35c09574d449ea0f171a7a9baaf087