2023-01-30 16:10:43 +08:00
|
|
|
From d4c1e4f3b5cb162bff499c1f28d11cbea626f787 Mon Sep 17 00:00:00 2001
|
2021-11-16 12:10:06 +08:00
|
|
|
From: Zhipeng Xie <xiezhipeng1@huawei.com>
|
|
|
|
|
Date: Sun, 14 Nov 2021 19:53:22 +0800
|
2023-01-30 16:10:43 +08:00
|
|
|
Subject: [PATCH 04/37] create-diff-object:support skip check func profiling
|
2021-11-16 12:10:06 +08:00
|
|
|
calls
|
|
|
|
|
|
|
|
|
|
when kernel support livepatch without ftrace, we can skip check
|
|
|
|
|
func profiling calls.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
kpatch-build/create-diff-object.c | 8 +++++++-
|
|
|
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
|
2023-01-30 16:10:43 +08:00
|
|
|
index 2ad0791..02a722d 100644
|
2021-11-16 12:10:06 +08:00
|
|
|
--- a/kpatch-build/create-diff-object.c
|
|
|
|
|
+++ b/kpatch-build/create-diff-object.c
|
2023-01-30 16:10:43 +08:00
|
|
|
@@ -3917,6 +3917,7 @@ int main(int argc, char *argv[])
|
|
|
|
|
struct section *relasec, *symtab;
|
2021-11-16 12:10:06 +08:00
|
|
|
char *orig_obj, *patched_obj, *parent_name;
|
|
|
|
|
char *parent_symtab, *mod_symvers, *patch_name, *output_obj;
|
|
|
|
|
+ char *no_profiling_calls = NULL;
|
|
|
|
|
|
|
|
|
|
memset(&arguments, 0, sizeof(arguments));
|
|
|
|
|
argp_parse (&argp, argc, argv, 0, NULL, &arguments);
|
2023-01-30 16:10:43 +08:00
|
|
|
@@ -3970,7 +3971,12 @@ int main(int argc, char *argv[])
|
2021-11-16 12:10:06 +08:00
|
|
|
kpatch_compare_correlated_elements(kelf_patched);
|
|
|
|
|
kpatch_mark_ignored_functions_same(kelf_patched);
|
|
|
|
|
kpatch_mark_ignored_sections_same(kelf_patched);
|
|
|
|
|
- kpatch_check_func_profiling_calls(kelf_patched);
|
|
|
|
|
+ no_profiling_calls = getenv("NO_PROFILING_CALLS");
|
|
|
|
|
+ if (!no_profiling_calls)
|
|
|
|
|
+ kpatch_check_func_profiling_calls(kelf_patched);
|
|
|
|
|
+ else
|
|
|
|
|
+ log_debug("NO_PROFILING_CALLS set\n");
|
|
|
|
|
+
|
|
|
|
|
kpatch_elf_teardown(kelf_orig);
|
|
|
|
|
kpatch_elf_free(kelf_orig);
|
|
|
|
|
|
|
|
|
|
--
|
2023-01-30 16:10:43 +08:00
|
|
|
2.33.0
|
2021-11-16 12:10:06 +08:00
|
|
|
|