[PATCH] aarch64: filter $x from kallsyms

[PATCH] aarch64: filter $x from kallsyms

[Kyle McMartin]

Similar to ARM, AArch64 is generating $x and $d syms... which isn't
terribly helpful when looking at %pF output and the like. Filter those
out in kallsyms, modpost and when looking at module symbols.

Seems simplest since none of these check EM_ARM anyway, to just add it
to the strchr used, rather than trying to make things overly
complicated.

initcall_debug improves:
dmesg_before.txt: initcall $x+0x0/0x154 [sg] returned 0 after 26331 usecs
dmesg_after.txt: initcall init_sg+0x0/0x154 [sg] returned 0 after 15461 usecs

Signed-off-by: Kyle McMartin <kyle@redhat.com>

--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3388,7 +3388,7 @@ static inline int is_arm_mapping_symbol(const char *str)
 {
 	if (str[0] == '.' && str[1] == 'L')
 		return true;
-	return str[0] == '$' && strchr("atd", str[1])
+	return str[0] == '$' && strchr("axtd", str[1])
 	       && (str[2] == '\0' || str[2] == '.');
 }
 
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -84,7 +84,7 @@ static void usage(void)
  */
 static inline int is_arm_mapping_symbol(const char *str)
 {
-	return str[0] == '$' && strchr("atd", str[1])
+	return str[0] == '$' && strchr("axtd", str[1])
 	       && (str[2] == '\0' || str[2] == '.');
 }
 
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1146,7 +1146,7 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
 
 static inline int is_arm_mapping_symbol(const char *str)
 {
-	return str[0] == '$' && strchr("atd", str[1])
+	return str[0] == '$' && strchr("axtd", str[1])
 	       && (str[2] == '\0' || str[2] == '.');
 }
 

Re: [PATCH] aarch64: filter $x from kallsyms

[Rusty Russell]

Kyle McMartin <kyle@redhat.com> writes:
> Similar to ARM, AArch64 is generating $x and $d syms... which isn't
> terribly helpful when looking at %pF output and the like. Filter those
> out in kallsyms, modpost and when looking at module symbols.
>
> Seems simplest since none of these check EM_ARM anyway, to just add it
> to the strchr used, rather than trying to make things overly
> complicated.
>
> initcall_debug improves:
> dmesg_before.txt: initcall $x+0x0/0x154 [sg] returned 0 after 26331 usecs
> dmesg_after.txt: initcall init_sg+0x0/0x154 [sg] returned 0 after 15461 usecs
>
> Signed-off-by: Kyle McMartin <kyle@redhat.com>

Acked-by: Rusty Russell <rusty@rustcorp.com.au>

Thanks,
Rusty.

Re: [PATCH] aarch64: filter $x from kallsyms

[Catalin Marinas]

On Thu, Sep 18, 2014 at 05:18:57AM +0100, Rusty Russell wrote:
> Kyle McMartin <kyle@redhat.com> writes:
> > Similar to ARM, AArch64 is generating $x and $d syms... which isn't
> > terribly helpful when looking at %pF output and the like. Filter those
> > out in kallsyms, modpost and when looking at module symbols.
> >
> > Seems simplest since none of these check EM_ARM anyway, to just add it
> > to the strchr used, rather than trying to make things overly
> > complicated.
> >
> > initcall_debug improves:
> > dmesg_before.txt: initcall $x+0x0/0x154 [sg] returned 0 after 26331 usecs
> > dmesg_after.txt: initcall init_sg+0x0/0x154 [sg] returned 0 after 15461 usecs
> >
> > Signed-off-by: Kyle McMartin <kyle@redhat.com>
> 
> Acked-by: Rusty Russell <rusty@rustcorp.com.au>

Thanks. Shall I understand that you are ok for me to take it via the
arm64 tree (or you'd prefer to merge it via your tree)?

-- 
Catalin

Re: [PATCH] aarch64: filter $x from kallsyms

[Rusty Russell]

Catalin Marinas <catalin.marinas@arm.com> writes:
> On Thu, Sep 18, 2014 at 05:18:57AM +0100, Rusty Russell wrote:
>> Kyle McMartin <kyle@redhat.com> writes:
>> > Similar to ARM, AArch64 is generating $x and $d syms... which isn't
>> > terribly helpful when looking at %pF output and the like. Filter those
>> > out in kallsyms, modpost and when looking at module symbols.
>> >
>> > Seems simplest since none of these check EM_ARM anyway, to just add it
>> > to the strchr used, rather than trying to make things overly
>> > complicated.
>> >
>> > initcall_debug improves:
>> > dmesg_before.txt: initcall $x+0x0/0x154 [sg] returned 0 after 26331 usecs
>> > dmesg_after.txt: initcall init_sg+0x0/0x154 [sg] returned 0 after 15461 usecs
>> >
>> > Signed-off-by: Kyle McMartin <kyle@redhat.com>
>> 
>> Acked-by: Rusty Russell <rusty@rustcorp.com.au>
>
> Thanks. Shall I understand that you are ok for me to take it via the
> arm64 tree (or you'd prefer to merge it via your tree)?

Sorry, vacation.  Yes, it was all yours, and I see it in Linus' tree
now.

Thanks,
Rusty.