kfence: fix reports if constant function prefixes exist
Subsystems (2)
Marco Elver
maintainerPATCH 1/1 kfence: fix reports if constant function prefixes exist
Some architectures prefix all functions with a constant string ('.' on ppc64). Add ARCH_FUNC_PREFIX, which may optionally be defined in <asm/kfence.h>, so that get_stack_skipnr() can work properly.
--- mm/kfence/report.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
mm/kfence/report.c +12 -6
@@ -20,6 +20,11 @@#include "kfence.h" +/* May be overridden by <asm/kfence.h>. */ +#ifndef ARCH_FUNC_PREFIX +#define ARCH_FUNC_PREFIX "" +#endif +extern bool no_hash_pointers;/* Helper function to either print to a seq_file or to console. */
@@ -67,8 +72,9 @@ static int get_stack_skipnr(const unsigned long stack_entries[], int num_entriesfor (skipnr =0 ; skipnr < num_entries; skipnr++) {int len =scnprintf (buf,sizeof (buf),"%ps" , (void *)stack_entries[skipnr]); -if (str_has_prefix (buf,"kfence_" ) ||str_has_prefix (buf,"__kfence_" ) || - !strncmp (buf,"__slab_free" , len)) { +if (str_has_prefix (buf,ARCH_FUNC_PREFIX "kfence_" ) || +str_has_prefix (buf,ARCH_FUNC_PREFIX "__kfence_" ) || + !strncmp (buf,ARCH_FUNC_PREFIX "__slab_free" , len)) {/* * In case of tail calls from any of the below * to any of the above.
@@ -77,10 +83,10 @@ static int get_stack_skipnr(const unsigned long stack_entries[], int num_entries }/* Also the *_bulk() variants by only checking prefixes. */ -if (str_has_prefix (buf,"kfree" ) || -str_has_prefix (buf,"kmem_cache_free" ) || -str_has_prefix (buf,"__kmalloc" ) || -str_has_prefix (buf,"kmem_cache_alloc" )) +if (str_has_prefix (buf,ARCH_FUNC_PREFIX "kfree" ) || +str_has_prefix (buf,ARCH_FUNC_PREFIX "kmem_cache_free" ) || +str_has_prefix (buf,ARCH_FUNC_PREFIX "__kmalloc" ) || +str_has_prefix (buf,ARCH_FUNC_PREFIX "kmem_cache_alloc" )) goto found; }if (fallback < num_entries)
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Marco Elver
maintainerQuoted 9 lines · Marco Elver
Some architectures prefix all functions with a constant string ('.' on ppc64). Add
ARCH_FUNC_PREFIX, which may optionally be defined in <asm/kfence.h>, so thatget_stack_skipnr()can work properly.Reported-by Christophe Leroy <[email protected]>Tested-by Christophe Leroy <[email protected]>Signed-off-by Marco Elver <[email protected]>---
For further context, the corresponding ppc64-enablement patch is was just sent by Christophe:
But there is no strict dependency between the patches, only that the stack traces that KFENCE prints aren't as pretty without the ARCH_FUNC_PREFIX patch.
So it should be fine to take them through different trees, as long as they both make the next merge window.
Thanks,
-- Marco