History

kallsyms: increase maximum kernel symbol length to 512

Rust symbols can become quite long due to namespacing introduced by modules, types, traits, generics, etc. For instance, the following code: pub mod my_module { pub struct MyType; pub struct MyGenericType<T>(T); pub trait MyTrait { fn my_method() -> u32; } impl MyTrait for MyGenericType<MyType> { fn my_method() -> u32 { 42 } } } generates a symbol of length 96 when using the upcoming v0 mangling scheme: _RNvXNtCshGpAVYOtgW1_7example9my_moduleINtB2_13MyGenericTypeNtB2_6MyTypeENtB2_7MyTrait9my_method At the moment, Rust symbols may reach up to 300 in length. Setting 512 as the maximum seems like a reasonable choice to keep some headroom.

Miguel Ojeda committed 5 years ago

Commit b8a94bf1 parent 73bbb946 files · +8 −8Browse files

Unified · Split

6 files
  1. include/linux/kallsyms.h +1 −1
  2. kernel/livepatch/core.c +2 −2
  3. scripts/kallsyms.c +2 −2
  4. tools/include/linux/kallsyms.h +1 −1
  5. tools/lib/perf/include/perf/event.h +1 −1
  6. tools/lib/symbol/kallsyms.h +1 −1
include/linux/kallsyms.h+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
15 15
16#include <asm/sections.h>16#include <asm/sections.h>
17 17
18#define KSYM_NAME_LEN 12818#define KSYM_NAME_LEN 512
19#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s %s]") + \19#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s %s]") + \
20 (KSYM_NAME_LEN - 1) + \20 (KSYM_NAME_LEN - 1) + \
21 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + \21 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + \
kernel/livepatch/core.c+2−2
@@ -213,7 +213,7 @@ static int klp_resolve_symbols(Elf_Shdr *sechdrs, const char *strtab, · 212 unmodified lines
213 * we use the smallest/strictest upper bound possible (56, based on213 * we use the smallest/strictest upper bound possible (56, based on
214 * the current definition of MODULE_NAME_LEN) to prevent overflows.214 * the current definition of MODULE_NAME_LEN) to prevent overflows.
215 */215 */
216 BUILD_BUG_ON(MODULE_NAME_LEN < 56 || KSYM_NAME_LEN != 128);216 BUILD_BUG_ON(MODULE_NAME_LEN < 56 || KSYM_NAME_LEN != 512);
217 217
218 relas = (Elf_Rela *) relasec->sh_addr;218 relas = (Elf_Rela *) relasec->sh_addr;
219 /* For each rela in this klp relocation section */219 /* For each rela in this klp relocation section */
@@ -227,7 +227,7 @@ static int klp_resolve_symbols(Elf_Shdr *sechdrs, const char *strtab, · 7 unmodified lines
227 227
228 /* Format: .klp.sym.sym_objname.sym_name,sympos */228 /* Format: .klp.sym.sym_objname.sym_name,sympos */
229 cnt = sscanf(strtab + sym->st_name,229 cnt = sscanf(strtab + sym->st_name,
230 ".klp.sym.%55[^.].%127[^,],%lu",230 ".klp.sym.%55[^.].%511[^,],%lu",
231 sym_objname, sym_name, &sympos);231 sym_objname, sym_name, &sympos);
232 if (cnt != 3) {232 if (cnt != 3) {
233 pr_err("symbol %s has an incorrectly formatted name\n",233 pr_err("symbol %s has an incorrectly formatted name\n",
scripts/kallsyms.c+2−2
@@ -30,7 +30,7 @@ · 29 unmodified lines
30#define _stringify_1(x) #x30#define _stringify_1(x) #x
31#define _stringify(x) _stringify_1(x)31#define _stringify(x) _stringify_1(x)
32 32
33#define KSYM_NAME_LEN 12833#define KSYM_NAME_LEN 512
34 34
35/*35/*
36 * A substantially bigger size than the current maximum.36 * A substantially bigger size than the current maximum.
@@ -39,7 +39,7 @@ · 2 unmodified lines
39 * for the fscanf() format string. Therefore, a _Static_assert() is39 * for the fscanf() format string. Therefore, a _Static_assert() is
40 * used instead to maintain the relationship with KSYM_NAME_LEN.40 * used instead to maintain the relationship with KSYM_NAME_LEN.
41 */41 */
42#define KSYM_NAME_LEN_BUFFER 51242#define KSYM_NAME_LEN_BUFFER 2048
43_Static_assert(43_Static_assert(
44 KSYM_NAME_LEN_BUFFER == KSYM_NAME_LEN * 4,44 KSYM_NAME_LEN_BUFFER == KSYM_NAME_LEN * 4,
45 "Please keep KSYM_NAME_LEN_BUFFER in sync with KSYM_NAME_LEN"45 "Please keep KSYM_NAME_LEN_BUFFER in sync with KSYM_NAME_LEN"
tools/include/linux/kallsyms.h+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
6#include <stdio.h>6#include <stdio.h>
7#include <unistd.h>7#include <unistd.h>
8 8
9#define KSYM_NAME_LEN 1289#define KSYM_NAME_LEN 512
10 10
11struct module;11struct module;
12 12
tools/lib/perf/include/perf/event.h+1−1
@@ -97,7 +97,7 @@ struct perf_record_throttle { · 96 unmodified lines
97};97};
98 98
99#ifndef KSYM_NAME_LEN99#ifndef KSYM_NAME_LEN
100#define KSYM_NAME_LEN 256100#define KSYM_NAME_LEN 512
101#endif101#endif
102 102
103struct perf_record_ksymbol {103struct perf_record_ksymbol {
tools/lib/symbol/kallsyms.h+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
7#include <linux/types.h>7#include <linux/types.h>
8 8
9#ifndef KSYM_NAME_LEN9#ifndef KSYM_NAME_LEN
10#define KSYM_NAME_LEN 25610#define KSYM_NAME_LEN 512
11#endif11#endif
12 12
13static inline u8 kallsyms2elf_binding(char type)13static inline u8 kallsyms2elf_binding(char type)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t