kcsan: Fix function matching in report
Marco Elver
maintainerPATCH 1/2 kcsan: Fix function matching in report
Pass string length as returned by scnprintf() to strnstr(), since strnstr() searches exactly len bytes in haystack, even if it contains a NUL-terminator before haystack+len.
--- kernel/kcsan/report.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
kernel/kcsan/report.c +9 -9
@@ -192,11 +192,11 @@ skip_report(enum kcsan_value_change value_change, unsigned long top_frame)* maintainers. */ char buf[64 ]; +int len =scnprintf (buf,sizeof (buf),"%ps" , (void *)top_frame); -snprintf (buf,sizeof (buf),"%ps" , (void *)top_frame); -if (!strnstr (buf,"rcu_" ,sizeof (buf)) && - !strnstr (buf,"_rcu" ,sizeof (buf)) && - !strnstr (buf,"_srcu" ,sizeof (buf))) +if (!strnstr (buf,"rcu_" , len) && + !strnstr (buf,"_rcu" , len) && + !strnstr (buf,"_srcu" , len))return true; }
@@ -262,15 +262,15 @@ static const char *get_thread_desc(int task_id)static int get_stack_skipnr (const unsigned long stack_entries[],int num_entries) {char buf[64 ]; +int len;int skip =0 ;for (; skip < num_entries; ++skip) { -snprintf (buf,sizeof (buf),"%ps" , (void *)stack_entries[skip]); -if (!strnstr (buf,"csan_" ,sizeof (buf)) && - !strnstr (buf,"tsan_" ,sizeof (buf)) && - !strnstr (buf,"_once_size" ,sizeof (buf))) { + len =scnprintf (buf,sizeof (buf),"%ps" , (void *)stack_entries[skip]); +if (!strnstr (buf,"csan_" , len) && + !strnstr (buf,"tsan_" , len) && + !strnstr (buf,"_once_size" , len))break ; - } }return skip; }
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Marco Elver
maintainerPATCH 2/2 kcsan: Make reporting aware of KCSAN tests
Reporting hides KCSAN runtime functions in the stack trace, with filtering done based on function names. Currently this included all functions (or modules) that would match "kcsan_". Make the filter aware of KCSAN tests, which contain "kcsan_test", and are no longer skipped in the report.
This is in preparation for adding a KCSAN test module.
--- kernel/kcsan/report.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
kernel/kcsan/report.c +23 -7
@@ -262,16 +262,32 @@ static const char *get_thread_desc(int task_id)static int get_stack_skipnr (const unsigned long stack_entries[],int num_entries) {char buf[64 ]; -int len; -int skip =0 ; +char *cur; +int len, skip; -for (; skip < num_entries; ++skip) { +for (skip =0 ; skip < num_entries; ++skip) { len =scnprintf (buf,sizeof (buf),"%ps" , (void *)stack_entries[skip]); -if (!strnstr (buf,"csan_" , len) && - !strnstr (buf,"tsan_" , len) && - !strnstr (buf,"_once_size" , len)) -break ; + +/* Never show tsan_* or {read,write}_once_size. */ +if (strnstr (buf,"tsan_" , len) || +strnstr (buf,"_once_size" , len)) +continue ; + + cur =strnstr (buf,"kcsan_" , len); +if (cur) { + cur +=sizeof ("kcsan_" ) -1 ; +if (strncmp (cur,"test" ,sizeof ("test" ) -1 )) +continue ;/* KCSAN runtime function. */ +/* KCSAN related test. */ + } + +/* +* No match for runtime functions -- @skip entries to skip to +* get to first frame of interest. +*/ +break ; } +return skip; }
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Quoted 5 lines · Marco Elver
Pass string length as returned by
scnprintf()tostrnstr(), sincestrnstr()searches exactly len bytes in haystack, even if it contains a NUL-terminator before haystack+len.Signed-off-by Marco Elver <[email protected]>
I queued both for testing and review, thank you, Marco!
Thanx, Paul
Quoted 48 lines
--- kernel/kcsan/report.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)kernel/kcsan/report.c +9
-9@@ -192,11 +192,11 @@ skip_report(enum kcsan_value_change value_change, unsigned long top_frame)* maintainers. */ char buf[64 ]; +int len =scnprintf (buf,sizeof (buf),"%ps" , (void *)top_frame); -snprintf (buf,sizeof (buf),"%ps" , (void *)top_frame); -if (!strnstr (buf,"rcu_" ,sizeof (buf)) && - !strnstr (buf,"_rcu" ,sizeof (buf)) && - !strnstr (buf,"_srcu" ,sizeof (buf))) +if (!strnstr (buf,"rcu_" , len) && + !strnstr (buf,"_rcu" , len) && + !strnstr (buf,"_srcu" , len))return true; }@@ -262,15 +262,15 @@ static const char *get_thread_desc(int task_id)static int get_stack_skipnr (const unsigned long stack_entries[],int num_entries) {char buf[64 ]; +int len;int skip =0 ;for (; skip < num_entries; ++skip) { -snprintf (buf,sizeof (buf),"%ps" , (void *)stack_entries[skip]); -if (!strnstr (buf,"csan_" ,sizeof (buf)) && - !strnstr (buf,"tsan_" ,sizeof (buf)) && - !strnstr (buf,"_once_size" ,sizeof (buf))) { + len =scnprintf (buf,sizeof (buf),"%ps" , (void *)stack_entries[skip]); +if (!strnstr (buf,"csan_" , len) && + !strnstr (buf,"tsan_" , len) && + !strnstr (buf,"_once_size" , len))break ; - } }return skip; }Signature · 1 line
2.26.0.110.g2183baf09c-goog