Skip to contentSkip to conversation

include/linux/kmemcheck.h: fix a sparse warning

PATCH In review Bart Van Assche 2 participants 6 messages Sep 26, 2009 – Oct 14, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 include/linux/kmemcheck.h: fix a sparse warning

Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig with sparse (make C=2) triggers a sparse warning on code that uses the kmemcheck_annotate_bitfield() macro. An example of such a warning:

include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

Cc Vegard Nossum <[email protected]>
Cc Andrew Morton <[email protected]>
include/linux/kmemcheck.h renamed from include/linux/kmemcheck-orig.h +2 -2
@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
 	int name##_end[0];
 
 #define kmemcheck_annotate_bitfield(ptr, name)				\
-	do if (ptr) {							\
+	do { if (ptr) {							\
 		int _n = (long) &((ptr)->name##_end)			\
 			- (long) &((ptr)->name##_begin);		\
 		BUILD_BUG_ON(_n < 0);					\
 									\
 		kmemcheck_mark_initialized(&((ptr)->name##_begin), _n);	\
-	} while (0)
+	} } while (0)
 
 #define kmemcheck_annotate_variable(var)				\
 	do {								\
#1 lore raw
Quoted 19 lines · Bart Van Assche

Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig with sparse (make C=2) triggers a sparse warning on code that uses the kmemcheck_annotate_bitfield() macro. An example of such a warning:

include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

Cc Vegard Nossum <[email protected]>
Cc Andrew Morton <[email protected]>
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +1 -1
@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
        int name##_end[0];
 
  #define kmemcheck_annotate_bitfield(ptr, name)                         \
-       do if (ptr) {                                                   \
+       do { if (ptr) {                                                 \

include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 static inline void kmemcheck_mark_initia · line 149

Quoted 10 lines
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +1 -1
                int _n = (long) &((ptr)->name##_end)                    \
                        - (long) &((ptr)->name##_begin);                \
                BUILD_BUG_ON(_n < 0);                                   \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
-       } while (0)
+       } } while (0)
 
  #define kmemcheck_annotate_variable(var)                               \
        do {                                                            \

(ping)

Did anyone already have the time to review the patch above ?

Bart.

#2 lore raw

2009/10/2 Bart Van Assche <[email protected]>:> On Sat, Sep 26, 2009 at 2:28 PM, Bart Van Assche> <[email protected]> wrote:>>>> Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig>> with sparse (make C=2) triggers a sparse warning on code that uses the>> kmemcheck_annotate_bitfield() macro. An example of such a warning:>>>> include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement>>>> Signed-off-by: Bart Van Assche <[email protected]>>> Cc: Vegard Nossum <[email protected]>>> Cc: Andrew Morton <[email protected]>>>>> --- linux-2.6.31.1/include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200>> +++ linux-2.6.31.1/include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200>> @@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia>>        int name##_end[0];>>>>  #define kmemcheck_annotate_bitfield(ptr, name)                         \>> -       do if (ptr) {                                                   \>> +       do { if (ptr) {                                                 \>>                int _n = (long) &((ptr)->name##_end)                    \>>                        - (long) &((ptr)->name##_begin);                \>>                BUILD_BUG_ON(_n < 0);                                   \>>                                                                        \>>                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \>> -       } while (0)>> +       } } while (0)>>>>  #define kmemcheck_annotate_variable(var)                               \>>        do {                                                            \>> (ping)>> Did anyone already have the time to review the patch above ?>> Bart. Hi,
A patch for this problem has already been applied in latest mainline.Thanks anyway, and sorry for not responding sooner.

Vegard���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#3 lore raw
Quoted 31 lines · Vegard Nossum

2009/10/2 Bart Van Assche <[email protected]>:

Quoted 29 lines
Quoted 27 lines · Bart Van Assche

Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig with sparse (make C=2) triggers a sparse warning on code that uses the kmemcheck_annotate_bitfield() macro. An example of such a warning:

include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

Cc Vegard Nossum <[email protected]>
Cc Andrew Morton <[email protected]>
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +2 -2
@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
        int name##_end[0];
 
  #define kmemcheck_annotate_bitfield(ptr, name)                         \
-       do if (ptr) {                                                   \
+       do { if (ptr) {                                                 \
                int _n = (long) &((ptr)->name##_end)                    \
                        - (long) &((ptr)->name##_begin);                \
                BUILD_BUG_ON(_n < 0);                                   \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
-       } while (0)
+       } } while (0)
 
Quoted 8 lines
Quoted 6 lines

include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 static inline void kmemcheck_mark_initia · line 149

Quoted 2 lines
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +0 -0
  #define kmemcheck_annotate_variable(var)                               \
        do {                                                            \

(ping)

Did anyone already have the time to review the patch above ?

A patch for this problem has already been applied in latest mainline.

Unfortunately this issue is still present in 2.6.31.4, which has been released on October 12 (yesterday). Is the patch that has been applied in the mainline kernel suitable for backporting ?

Bart.

#4 lore raw

2009/10/14 Bart Van Assche <[email protected]>:

Quoted 37 lines · Vegard Nossum
Quoted 36 lines

2009/10/2 Bart Van Assche <[email protected]>:

Quoted 34 lines
Quoted 19 lines · Bart Van Assche

Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig with sparse (make C=2) triggers a sparse warning on code that uses the kmemcheck_annotate_bitfield() macro. An example of such a warning:

include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

Cc Vegard Nossum <[email protected]>
Cc Andrew Morton <[email protected]>
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +1 -1
@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
        int name##_end[0];
 
  #define kmemcheck_annotate_bitfield(ptr, name)                         \
-       do if (ptr) {                                                   \
+       do { if (ptr) {                                                 \

include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 static inline void kmemcheck_mark_initia · line 149

Quoted 10 lines
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +1 -1
                int _n = (long) &((ptr)->name##_end)                    \
                        - (long) &((ptr)->name##_begin);                \
                BUILD_BUG_ON(_n < 0);                                   \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
-       } while (0)
+       } } while (0)
 
  #define kmemcheck_annotate_variable(var)                               \
        do {                                                            \

(ping)

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Did anyone already have the time to review the patch above ?

A patch for this problem has already been applied in latest mainline.

Unfortunately this issue is still present in 2.6.31.4, which has been released on October 12 (yesterday). Is the patch that has been applied in the mainline kernel suitable for backporting ?

I assumed that this wouldn't be suitable for stable kernels, as the change is purely syntactic. Is there a good reason for applying this patch to the stable series? Perhaps Greg can answer this (Cced)?

Vegard

#5 lore raw
Quoted 42 lines · Vegard Nossum

2009/10/14 Bart Van Assche <[email protected]>:

Quoted 41 lines · Vegard Nossum
Quoted 39 lines

2009/10/2 Bart Van Assche <[email protected]>:

Quoted 29 lines
Quoted 27 lines · Bart Van Assche

Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig with sparse (make C=2) triggers a sparse warning on code that uses the kmemcheck_annotate_bitfield() macro. An example of such a warning:

include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

Cc Vegard Nossum <[email protected]>
Cc Andrew Morton <[email protected]>
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +2 -2
@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
        int name##_end[0];
 
  #define kmemcheck_annotate_bitfield(ptr, name)                         \
-       do if (ptr) {                                                   \
+       do { if (ptr) {                                                 \
                int _n = (long) &((ptr)->name##_end)                    \
                        - (long) &((ptr)->name##_begin);                \
                BUILD_BUG_ON(_n < 0);                                   \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
-       } while (0)
+       } } while (0)
 
Quoted 6 lines

include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 static inline void kmemcheck_mark_initia · line 149

Quoted 2 lines
include/linux/kmemcheck.h    2009-09-26 13:53:56.000000000 +0200 renamed from include/linux/kmemcheck-orig.h       2009-09-26 13:53:44.000000000 +0200 +0 -0
  #define kmemcheck_annotate_variable(var)                               \
        do {                                                            \

(ping)

Did anyone already have the time to review the patch above ?

A patch for this problem has already been applied in latest mainline.

Quoted 7 lines
Quoted 3 lines

Unfortunately this issue is still present in 2.6.31.4, which has been released on October 12 (yesterday). Is the patch that has been applied in the mainline kernel suitable for backporting ?

I assumed that this wouldn't be suitable for stable kernels, as the change is purely syntactic. Is there a good reason for applying this patch to the stable series? Perhaps Greg can answer this (Cced)?

Which patch are you referring to (commit ID) ?

Bart.