Skip to contentSkip to conversation

[2.6.29] Fix for enabling branch profiling makes sparse unusable

PATCH Bart Van Assche 2 participants 4 messages Apr 5, 2009 – Apr 8, 2009 Sparse checker

lore
Share & tools
lore
#0 lore raw

One of the changes between kernels 2.6.28 and 2.6.29 is that a branch profiler has been added for if() statements. Unfortunately this patch makes the sparse output unusable with CONFIG_TRACE_BRANCH_PROFILING=y: when branch profiling is enabled, sparse prints so much false positives that the real issues are no longer visible. This behavior can be reproduced as follows:
* enable CONFIG_TRACE_BRANCH_PROFILING, e.g. by running make allyesconfig or make allmodconfig.
* run make C=2

Result: a huge number of the following sparse warnings.
...
include/linux/cpumask.h:547:2: warning: symbol '______r' shadows an earlier one include/linux/cpumask.h:547:2: originally declared here
...

The patch below fixes this by disabling branch profiling while analyzing the kernel code with sparse.

See also:
* http://lkml.org/lkml/2008/11/21/18
* http://bugzilla.kernel.org/show_bug.cgi?id=12925

include/linux/compiler.h renamed from linux-2.6.29/include/linux/compiler.h +2 -1
@@ -75,7 +75,8 @@ struct ftrace_branch_data {
  * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
  * to disable branch tracing on a per file basis.
  */
-#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \
+    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
 void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 
 #define likely_notrace(x)	__builtin_expect(!!(x), 1)
#1 lore raw

[tip:tracing/urgent] branch tracer: Fix for enabling branch profiling makes sparse unusable

Commit-ID:  d9ad8bc0ca823705413f75b50c442a88cc518b35
Gitweb:     http://git.kernel.org/tip/d9ad8bc0ca823705413f75b50c442a88cc518b35
Author:     Bart Van Assche <[email protected]>
AuthorDate: Sun, 5 Apr 2009 16:20:02 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 7 Apr 2009 17:07:40 +0200

branch tracer: Fix for enabling branch profiling makes sparse unusable

One of the changes between kernels 2.6.28 and 2.6.29 is that a branch profiler has been added for if() statements. Unfortunately this patch makes the sparse output unusable with CONFIG_TRACE_BRANCH_PROFILING=y: when branch profiling is enabled, sparse prints so much false positives that the real issues are no longer visible. This behavior can be reproduced as follows:
* enable CONFIG_TRACE_BRANCH_PROFILING, e.g. by running make allyesconfig or make allmodconfig.
* run make C=2

Result: a huge number of the following sparse warnings.
..
include/linux/cpumask.h:547:2: warning: symbol '______r' shadows an earlier one include/linux/cpumask.h:547:2: originally declared here
..

The patch below fixes this by disabling branch profiling while analyzing the kernel code with sparse.

See also:
* http://lkml.org/lkml/2008/11/21/18
* http://bugzilla.kernel.org/show_bug.cgi?id=12925

Cc Andrew Morton <[email protected]>
Cc Steven Rostedt <[email protected]>

LKML-Reference: <[email protected]>

---
 include/linux/compiler.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
include/linux/compiler.h +2 -1
index 6faa7e5..8872ad6 100644
@@ -76,7 +76,8 @@ struct ftrace_branch_data {
  * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
  * to disable branch tracing on a per file basis.
  */
-#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \
+    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
 void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 
 #define likely_notrace(x)	__builtin_expect(!!(x), 1)
#2 lore raw
In reply to Bart Van Assche
Quoted 27 lines · Bart Van Assche

One of the changes between kernels 2.6.28 and 2.6.29 is that a branch profiler has been added for if() statements. Unfortunately this patch makes the sparse output unusable with CONFIG_TRACE_BRANCH_PROFILING=y: when branch profiling is enabled, sparse prints so much false positives that the real issues are no longer visible. This behavior can be reproduced as follows:
* enable CONFIG_TRACE_BRANCH_PROFILING, e.g. by running make allyesconfig or make allmodconfig.
* run make C=2

Result: a huge number of the following sparse warnings.
...
include/linux/cpumask.h:547:2: warning: symbol '______r' shadows an earlier one include/linux/cpumask.h:547:2: originally declared here
...

The patch below fixes this by disabling branch profiling while analyzing the kernel code with sparse.

See also:
* http://lkml.org/lkml/2008/11/21/18
* http://bugzilla.kernel.org/show_bug.cgi?id=12925

include/linux/compiler.h       2009-03-24 08:46:46.000000000 -0400 struct ftrace_branch_data { · line 82

Quoted 9 lines
include/linux/compiler.h       2009-03-24 08:46:46.000000000 -0400 renamed from linux-2.6.29/include/linux/compiler.h  2009-03-23 19:12:14.000000000 -0400 +2 -1
@@ -75,7 +75,8 @@ struct ftrace_branch_data {
  * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
  * to disable branch tracing on a per file basis.
  */
-#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \
+    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
  void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 
  #define likely_notrace(x)      __builtin_expect(!!(x), 1)

(ping)

Hello,

Is there any chance the above patch will get included in the 2.6.30 kernel ?

Bart.

#3 lore raw
Quoted 37 lines · Bart Van Assche
Quoted 35 lines · Bart Van Assche

One of the changes between kernels 2.6.28 and 2.6.29 is that a branch profiler has been added for if() statements. Unfortunately this patch makes the sparse output unusable with CONFIG_TRACE_BRANCH_PROFILING=y: when branch profiling is enabled, sparse prints so much false positives that the real issues are no longer visible. This behavior can be reproduced as follows:
* enable CONFIG_TRACE_BRANCH_PROFILING, e.g. by running make allyesconfig or make allmodconfig.
* run make C=2

Result: a huge number of the following sparse warnings.
...
include/linux/cpumask.h:547:2: warning: symbol '______r' shadows an earlier one include/linux/cpumask.h:547:2: originally declared here
...

The patch below fixes this by disabling branch profiling while analyzing the kernel code with sparse.

See also:
* http://lkml.org/lkml/2008/11/21/18
* http://bugzilla.kernel.org/show_bug.cgi?id=12925

include/linux/compiler.h       2009-03-24 08:46:46.000000000 -0400 renamed from linux-2.6.29/include/linux/compiler.h  2009-03-23 19:12:14.000000000 -0400 +2 -1
@@ -75,7 +75,8 @@ struct ftrace_branch_data {
  * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
  * to disable branch tracing on a per file basis.
  */
-#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \
+    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
  void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 
Quoted 7 lines

include/linux/compiler.h       2009-03-24 08:46:46.000000000 -0400 struct ftrace_branch_data { · line 82

Quoted 1 line
include/linux/compiler.h       2009-03-24 08:46:46.000000000 -0400 renamed from linux-2.6.29/include/linux/compiler.h  2009-03-23 19:12:14.000000000 -0400 +0 -0
  #define likely_notrace(x)      __builtin_expect(!!(x), 1)

(ping)

Hello,

Is there any chance the above patch will get included in the 2.6.30 kernel ?

it already is part of .30-rc1, see
d9ad8bc0ca823705413f75b50c442a88cc518b35.

Ingo