| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 17 Oct 2022 14:49:46 +0800
From: Zhen Lei <thunder.leizhen@...wei.com>
To: Josh Poimboeuf <jpoimboe@...nel.org>,
Jiri Kosina <jikos@...nel.org>,
Miroslav Benes <mbenes@...e.cz>,
Petr Mladek <pmladek@...e.com>,
Joe Lawrence <joe.lawrence@...hat.com>,
<live-patching@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Masahiro Yamada <masahiroy@...nel.org>,
Alexei Starovoitov <ast@...nel.org>,
Jiri Olsa <jolsa@...nel.org>,
Kees Cook <keescook@...omium.org>,
Andrew Morton <akpm@...ux-foundation.org>,
"Luis Chamberlain" <mcgrof@...nel.org>,
<linux-modules@...r.kernel.org>,
"Steven Rostedt" <rostedt@...dmis.org>,
Ingo Molnar <mingo@...hat.com>
CC: Zhen Lei <thunder.leizhen@...wei.com>
Subject: [PATCH v7 07/11] kallsyms: Add helper kallsyms_on_each_match_symbol()
Function kallsyms_on_each_symbol() traverses all symbols and submits each
symbol to the hook 'fn' for judgment and processing. For some cases, the
hook actually only handles the matched symbol, such as livepatch.
So that, we can first compress the name being looked up and then use
it for comparison when traversing 'kallsyms_names', this greatly reduces
the time consumed by traversing.
The pseudo code of the test case is as follows:
static int tst_find(void *data, const char *name,
struct module *mod, unsigned long addr)
{
if (strcmp(name, "stub_name") == 0)
*(unsigned long *)data = addr;
return 0;
}
static int tst_match(void *data, unsigned long addr)
{
*(unsigned long *)data = addr;
return 0;
}
start = sched_clock();
kallsyms_on_each_match_symbol(tst_match, "stub_name", &addr);
end = sched_clock();
start = sched_clock();
kallsyms_on_each_symbol(tst_find, &addr);
end = sched_clock();
The test results are as follows (twice):
kallsyms_on_each_match_symbol: 557400, 583900
kallsyms_on_each_symbol : 16659500, 16113950
kallsyms_on_each_match_symbol() consumes only 3.48% of
kallsyms_on_each_symbol()'s time.
Signed-off-by: Zhen Lei <thunder.leizhen@...wei.com>
---
include/linux/kallsyms.h | 8 ++++++++
kernel/kallsyms.c | 44 ++++++++++++++++++++++++++++++++++++----
2 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 649faac31ddb162..0cd33be7142ad0d 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -69,6 +69,8 @@ static inline void *dereference_symbol_descriptor(void *ptr)
int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
unsigned long),
void *data);
+int kallsyms_on_each_match_symbol(int (*fn)(void *, unsigned long),
+ const char *name, void *data);
/* Lookup the address for a symbol. Returns 0 if not found. */
unsigned long kallsyms_lookup_name(const char *name);
@@ -168,6 +170,12 @@ static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct
{
return -EOPNOTSUPP;
}
+
+static inline int kallsyms_on_each_match_symbol(int (*fn)(void *, unsigned long),
+ const char *name, void *data)
+{
+ return -EOPNOTSUPP;
+}
#endif /*CONFIG_KALLSYMS*/
static inline void print_ip_sym(const char *loglvl, unsigned long ip)
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index bd1f263b1c69b53..a1d3aa2c44e8d6f 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -286,14 +286,17 @@ static bool cleanup_compressed_symbol_name(int token)
return false;
}
-static int kallsyms_lookup_compressed_name(unsigned char *namebuf, int namelen,
- unsigned long *addr)
+static int __kallsyms_lookup_compressed_name(unsigned char *namebuf, int namelen,
+ unsigned int *index,
+ unsigned int *offset,
+ unsigned long *addr)
{
- unsigned int i, off;
+ unsigned int i = *index;
+ unsigned int off = *offset;
unsigned int len, x;
const unsigned char *name;
- for (i = 0, off = 0; namelen && i < kallsyms_num_syms; i++) {
+ for (; namelen && i < kallsyms_num_syms; i++) {
/*
* For each entry in kallsyms_names[], the storage format is:
* ----------------------------
@@ -317,6 +320,10 @@ static int kallsyms_lookup_compressed_name(unsigned char *namebuf, int namelen,
continue;
if (!memcmp(name, namebuf, namelen)) {
+ /* Prepare for the next iteration */
+ *index = i + 1;
+ *offset = off;
+
*addr = kallsyms_sym_address(i);
return 0;
}
@@ -325,6 +332,14 @@ static int kallsyms_lookup_compressed_name(unsigned char *namebuf, int namelen,
return -ENOENT;
}
+static int kallsyms_lookup_compressed_name(unsigned char *namebuf, int len,
+ unsigned long *addr)
+{
+ unsigned int i = 0, off = 0;
+
+ return __kallsyms_lookup_compressed_name(namebuf, len, &i, &off, addr);
+}
+
/* Lookup the address for this symbol. Returns 0 if not found. */
unsigned long kallsyms_lookup_name(const char *name)
{
@@ -367,6 +382,27 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
return 0;
}
+int kallsyms_on_each_match_symbol(int (*fn)(void *, unsigned long),
+ const char *name, void *data)
+{
+ int ret, len;
+ unsigned long addr;
+ unsigned int i = 0, off = 0;
+ char namebuf[KSYM_NAME_LEN];
+
+ len = kallsyms_compress_symbol_name(name, namebuf, ARRAY_SIZE(namebuf));
+ do {
+ ret = __kallsyms_lookup_compressed_name(namebuf, len, &i, &off, &addr);
+ if (ret)
+ return 0; /* end of lookup */
+
+ ret = fn(data, addr);
+ cond_resched();
+ } while (!ret);
+
+ return ret;
+}
+
static unsigned long get_symbol_pos(unsigned long addr,
unsigned long *symbolsize,
unsigned long *offset)
--
2.25.1
Powered by blists - more mailing lists