Currently, to search for a symbol, we need to expand the symbols in
'kallsyms_names' one by one, and then use the expanded string for
comparison. This process can be optimized.
And now scripts/kallsyms no longer compresses the symbol types, each
symbol type always occupies one byte. So we can first compress the
searched symbol and then make a quick comparison based on the compressed
length and content. In this way, for entries with mismatched lengths,
there is no need to expand and compare strings. And for those matching
lengths, there's no need to expand the symbol. This saves a lot of time.
According to my test results, the average performance of
kallsyms_lookup_name() can be improved by 20 to 30 times.
The pseudo code of the test case is as follows:
static int stat_find_name(...)
{
start = sched_clock();
(void)kallsyms_lookup_name(name);
end = sched_clock();
//Update min, max, cnt, sum
}
/*
* Traverse all symbols in sequence and collect statistics on the time
* taken by kallsyms_lookup_name() to lookup each symbol.
*/
kallsyms_on_each_symbol(stat_find_name, NULL);
The test results are as follows (twice):
After : min=5250, max= 726560, avg= 302132
After : min=5320, max= 726850, avg= 301978
Before: min=170, max=15949190, avg=7553906
Before: min=160, max=15877280, avg=7517784
The average time consumed is only 4.01% and the maximum time consumed is
only 4.57% of the time consumed before optimization.
Signed-off-by: Zhen Lei <thunder.leizhen@xxxxxxxxxx>
---
kernel/kallsyms.c | 79 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 76 insertions(+), 3 deletions(-)
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 3e7e2c2ad2f75ef..2d76196cfe89f34 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -87,6 +87,71 @@ static unsigned int kallsyms_expand_symbol(unsigned int off,
return off;
}
+static int kallsyms_name_to_tokens(const char *name, char *buf)
+{
+ int i, j, k, n;
+ int len, token_len;
+ const char *token;
+ unsigned char token_idx[KSYM_NAME_LEN];
+ unsigned char token_bak[KSYM_NAME_LEN];
+
+ /*
+ * n, number of tokens in the string name.
+ * token_idx[i], the start index of the ith token.
+ * token_idx[n] is used to calculate the length of the last token.
+ */
+ n = strlen(name);
+ if (n >= KSYM_NAME_LEN) {
+ buf[0] = 0;
+ return 0;
+ }
+ for (i = 0; i <= n; i++)
+ token_idx[i] = (unsigned char)i;
+
+ /*
+ * For tokens whose token_len >= 2, a larger index value indicates
+ * a higher occurrence frequency. See scripts/kallsyms.c
+ */
+ for (i = 255; i >= 0; i--) {
+ token = &kallsyms_token_table[kallsyms_token_index[i]];
+ token_len = strlen(token);
+ if (token_len <= 1)
+ continue;
+
+ /*
+ * Find and merge two tokens into one.
+ *
+ * |<-- new_token -->|
+ * | token1 | token2 |
+ * token_idx[]: j j+1 j+2
+ *
+ */
+ for (j = 0; j < n - 1; j++) {
+ len = token_idx[j + 2] - token_idx[j];
+ if (len == token_len &&
+ !strncmp(name + token_idx[j], token, len)) {
+ token_bak[token_idx[j]] = (unsigned char)i;
+ for (k = j + 1; k < n; k++)
+ token_idx[k] = token_idx[k + 1];
+ n--;
+ }
+ }
+ }
+
+ for (j = 0; j < n; j++) {
+ len = token_idx[j + 1] - token_idx[j];
+ if (len <= 1) {
+ buf[j] = name[token_idx[j]];
+ continue;
+ }
+
+ buf[j] = token_bak[token_idx[j]];
+ }
+ buf[n] = 0;
+
+ return n;
+}
+
/*
* Get symbol type information. This is encoded as a single char at the
* beginning of the symbol name.
@@ -192,20 +257,28 @@ unsigned long kallsyms_lookup_name(const char *name)
char namebuf[KSYM_NAME_LEN];
unsigned long i;
unsigned int off;
+ int len;
/* Skip the search for empty string. */
if (!*name)
return 0;
+ len = kallsyms_name_to_tokens(name, namebuf);
+ for (i = 0, off = 0; len && i < kallsyms_num_syms; i++) {
+ if (kallsyms_names[off] == len + 1 &&
+ !memcmp(&kallsyms_names[off + 2], namebuf, len))
+ return kallsyms_sym_address(i);
+
+ off += kallsyms_names[off] + 1;
+ }
+
for (i = 0, off = 0; i < kallsyms_num_syms; i++) {
off = kallsyms_expand_symbol(off, namebuf, ARRAY_SIZE(namebuf));
- if (strcmp(namebuf, name) == 0)
- return kallsyms_sym_address(i);
-
if (cleanup_symbol_name(namebuf) && strcmp(namebuf, name) == 0)
return kallsyms_sym_address(i);
}
+
return module_kallsyms_lookup_name(name);
}
--
2.25.1
