Skip to contentSkip to conversation

rculist: fix borked __list_for_each_rcu() macro

PATCH In review Mariusz Kozlowski 3 participants 8 messages Dec 15, 2010 – Dec 17, 2010 RCU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rculist: fix borked __list_for_each_rcu() macro

This restores parentheses blance.

---
 include/linux/rculist.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/rculist.h +1 -1
index f31ef61..70d3ba5 100644
@@ -244,7 +244,7 @@ static inline void list_splice_init_rcu(struct list_head *list,
 #define __list_for_each_rcu(pos, head) \
 	for (pos = rcu_dereference_raw(list_next_rcu(head)); \
 		pos != (head); \
-		pos = rcu_dereference_raw(list_next_rcu((pos)))
+		pos = rcu_dereference_raw(list_next_rcu(pos)))
 
 /**
  * list_for_each_entry_rcu	-	iterate over rcu list of given type
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Hmmm... Maybe we should just delete __list_for_each_rcu. ;-)

Thanx, Paul

Quoted 21 lines
---
 include/linux/rculist.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/rculist.h +1 -1
index f31ef61..70d3ba5 100644
@@ -244,7 +244,7 @@ static inline void list_splice_init_rcu(struct list_head *list,
 #define __list_for_each_rcu(pos, head) \
 	for (pos = rcu_dereference_raw(list_next_rcu(head)); \
 		pos != (head); \
-		pos = rcu_dereference_raw(list_next_rcu((pos)))
+		pos = rcu_dereference_raw(list_next_rcu(pos)))
 
 /**
  * list_for_each_entry_rcu	-	iterate over rcu list of given type
Signature · 1 line
1.7.0.4
#2 lore raw
Quoted 8 lines · Paul E. McKenney
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Some years ago I wrote a dumb script that walks trees of () and {}. It catches unbalanced trees. It's dumb enough to fail with #ifdef etc, but most of the time it does its job. It reaches unreachable code and unused one too.

Quoted 25 lines

Hmmm... Maybe we should just delete __list_for_each_rcu. ;-)

Thanx, Paul

Quoted 21 lines
---
 include/linux/rculist.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/rculist.h +1 -1
index f31ef61..70d3ba5 100644
@@ -244,7 +244,7 @@ static inline void list_splice_init_rcu(struct list_head *list,
 #define __list_for_each_rcu(pos, head) \
 	for (pos = rcu_dereference_raw(list_next_rcu(head)); \
 		pos != (head); \
-		pos = rcu_dereference_raw(list_next_rcu((pos)))
+		pos = rcu_dereference_raw(list_next_rcu(pos)))
 
 /**
  * list_for_each_entry_rcu	-	iterate over rcu list of given type
Signature · 1 line
1.7.0.4
Signature · 1 line
Mariusz Kozlowski
#3 lore raw
Quoted 6 lines · Mariusz Kozlowski
Quoted 5 lines · Paul E. McKenney
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

Quoted 9 lines
Quoted 3 lines

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Some years ago I wrote a dumb script that walks trees of () and {}. It catches unbalanced trees. It's dumb enough to fail with #ifdef etc, but most of the time it does its job. It reaches unreachable code and unused one too.

gcc will complain about this, however, in this case, it is used.

#4 lore raw
Quoted 11 lines · Américo Wang
Quoted 10 lines · Mariusz Kozlowski
Quoted 8 lines · Paul E. McKenney
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Quoted 6 lines
Quoted 4 lines

Some years ago I wrote a dumb script that walks trees of () and {}. It catches unbalanced trees. It's dumb enough to fail with #ifdef etc, but most of the time it does its job. It reaches unreachable code and unused one too.

gcc will complain about this, however, in this case, it is used.

Hello, Américo!

I did a "git grep -l __list_for_each_rcu" and its output was only:

	include/linux/rculist.h:#define __list_for_each_rcu(pos, head) \

This was in Linus's tree. And gcc certainly would have failed if this macro had been used in any recent build.

It really was used some time back, but it appears to me that those uses no longer exist.

Or are you saying that you have a patch on its way in that needs this macro? If so, please point me at it.

Thanx, Paul

#5 lore raw
Quoted 19 lines · Paul E. McKenney
Quoted 11 lines · Américo Wang
Quoted 10 lines · Mariusz Kozlowski
Quoted 8 lines · Paul E. McKenney
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Quoted 6 lines
Quoted 4 lines

Some years ago I wrote a dumb script that walks trees of () and {}. It catches unbalanced trees. It's dumb enough to fail with #ifdef etc, but most of the time it does its job. It reaches unreachable code and unused one too.

gcc will complain about this, however, in this case, it is used.

Quoted 9 lines

Hello, Américo!

I did a "git grep -l __list_for_each_rcu" and its output was only:

	include/linux/rculist.h:#define __list_for_each_rcu(pos, head) \

This was in Linus's tree. And gcc certainly would have failed if this macro had been used in any recent build.

Yeah, my bad, actually I meant to say "unused"... :-( Sorry for confusing!

My point is that gcc should do this basic lexical check, no need to invent another tool. :)

Thanks.

#6 lore raw
Quoted 24 lines · Américo Wang
Quoted 23 lines · Paul E. McKenney
Quoted 11 lines · Américo Wang
Quoted 10 lines · Mariusz Kozlowski
Quoted 8 lines · Paul E. McKenney
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Quoted 6 lines
Quoted 4 lines

Some years ago I wrote a dumb script that walks trees of () and {}. It catches unbalanced trees. It's dumb enough to fail with #ifdef etc, but most of the time it does its job. It reaches unreachable code and unused one too.

gcc will complain about this, however, in this case, it is used.

Hello, Américo!

I did a "git grep -l __list_for_each_rcu" and its output was only:

Quoted 7 lines
Quoted 4 lines
	include/linux/rculist.h:#define __list_for_each_rcu(pos, head) \

This was in Linus's tree. And gcc certainly would have failed if this macro had been used in any recent build.

Yeah, my bad, actually I meant to say "unused"... :-( Sorry for confusing!

No problem!

Quoted 2 lines

My point is that gcc should do this basic lexical check, no need to invent another tool. :)

As an off-by-default warning, this could make a lot of sense, especially for projects like the Linux kernel that are relatively disciplined in their use of cpp macros. Though I am not sure that the recent macros in the "perf" code would pass such a check. ;-)

Thanx, Paul

#7 lore raw
In reply to Mariusz Kozlowski
Quoted 6 lines · Mariusz Kozlowski
Quoted 5 lines · Paul E. McKenney
Quoted 1 line · Mariusz Kozlowski

This restores parentheses blance.

Good catch, queued!!!

Quoted 8 lines
Quoted 3 lines

This does not actually appear to be in use anywhere in the kernel any more, so I queued this for 2.6.38 rather than in the 2.6.37 urgent queue. So, just out of curiosity, how did you find this one?

Some years ago I wrote a dumb script that walks trees of () and {}. It catches unbalanced trees. It's dumb enough to fail with #ifdef etc, but most of the time it does its job. It reaches unreachable code and unused one too.

Very cool, and thank you!

Thanx, Paul

Quoted 28 lines
Quoted 25 lines

Hmmm... Maybe we should just delete __list_for_each_rcu. ;-)

Thanx, Paul

Quoted 21 lines
---
 include/linux/rculist.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/rculist.h +1 -1
index f31ef61..70d3ba5 100644
@@ -244,7 +244,7 @@ static inline void list_splice_init_rcu(struct list_head *list,
 #define __list_for_each_rcu(pos, head) \
 	for (pos = rcu_dereference_raw(list_next_rcu(head)); \
 		pos != (head); \
-		pos = rcu_dereference_raw(list_next_rcu((pos)))
+		pos = rcu_dereference_raw(list_next_rcu(pos)))
 
 /**
  * list_for_each_entry_rcu	-	iterate over rcu list of given type
Signature · 1 line
1.7.0.4
Signature · 1 line
Mariusz Kozlowski