diff options
author | Jesper Dangaard Brouer <hawk@comx.dk> | 2009-09-23 18:57:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 10:21:05 -0400 |
commit | 458e5ff13e1bed050990d97e9aa55bcdafc951a7 (patch) | |
tree | 521d837beabe5265f070351a8ea42d48408ec5d7 | |
parent | dd8ef1db87a486577b3a76e6ad45df52e12d0145 (diff) |
edac: core: remove completion-wait for complete with rcu_barrier
Module edac_core.ko uses call_rcu() callbacks in edac_device.c, edac_mc.c
and edac_pci.c.
They all use a wait_for_completion() scheme, but this scheme it not 100%
safe on multiple CPUs. See the _rcu_barrier() implementation which
explains why extra precausion is needed.
The patch adds a comment about rcu_barrier() and as a precausion calls
rcu_barrier(). A maintainer needs to look at removing the
wait_for_completion code.
[dougthompson@xmission.com: remove the wait_for_completion code]
Signed-off-by Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/edac/edac_device.c | 5 | ||||
-rw-r--r-- | drivers/edac/edac_mc.c | 4 | ||||
-rw-r--r-- | drivers/edac/edac_pci.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index b02a6a69a8f0..d5e13c94714f 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
@@ -356,7 +356,6 @@ static void complete_edac_device_list_del(struct rcu_head *head) | |||
356 | 356 | ||
357 | edac_dev = container_of(head, struct edac_device_ctl_info, rcu); | 357 | edac_dev = container_of(head, struct edac_device_ctl_info, rcu); |
358 | INIT_LIST_HEAD(&edac_dev->link); | 358 | INIT_LIST_HEAD(&edac_dev->link); |
359 | complete(&edac_dev->removal_complete); | ||
360 | } | 359 | } |
361 | 360 | ||
362 | /* | 361 | /* |
@@ -369,10 +368,8 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info | |||
369 | *edac_device) | 368 | *edac_device) |
370 | { | 369 | { |
371 | list_del_rcu(&edac_device->link); | 370 | list_del_rcu(&edac_device->link); |
372 | |||
373 | init_completion(&edac_device->removal_complete); | ||
374 | call_rcu(&edac_device->rcu, complete_edac_device_list_del); | 371 | call_rcu(&edac_device->rcu, complete_edac_device_list_del); |
375 | wait_for_completion(&edac_device->removal_complete); | 372 | rcu_barrier(); |
376 | } | 373 | } |
377 | 374 | ||
378 | /* | 375 | /* |
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 335b7ebdb11c..b629c41756f0 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
@@ -418,16 +418,14 @@ static void complete_mc_list_del(struct rcu_head *head) | |||
418 | 418 | ||
419 | mci = container_of(head, struct mem_ctl_info, rcu); | 419 | mci = container_of(head, struct mem_ctl_info, rcu); |
420 | INIT_LIST_HEAD(&mci->link); | 420 | INIT_LIST_HEAD(&mci->link); |
421 | complete(&mci->complete); | ||
422 | } | 421 | } |
423 | 422 | ||
424 | static void del_mc_from_global_list(struct mem_ctl_info *mci) | 423 | static void del_mc_from_global_list(struct mem_ctl_info *mci) |
425 | { | 424 | { |
426 | atomic_dec(&edac_handlers); | 425 | atomic_dec(&edac_handlers); |
427 | list_del_rcu(&mci->link); | 426 | list_del_rcu(&mci->link); |
428 | init_completion(&mci->complete); | ||
429 | call_rcu(&mci->rcu, complete_mc_list_del); | 427 | call_rcu(&mci->rcu, complete_mc_list_del); |
430 | wait_for_completion(&mci->complete); | 428 | rcu_barrier(); |
431 | } | 429 | } |
432 | 430 | ||
433 | /** | 431 | /** |
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index 30b585b1d60b..efb5d5650783 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c | |||
@@ -174,7 +174,6 @@ static void complete_edac_pci_list_del(struct rcu_head *head) | |||
174 | 174 | ||
175 | pci = container_of(head, struct edac_pci_ctl_info, rcu); | 175 | pci = container_of(head, struct edac_pci_ctl_info, rcu); |
176 | INIT_LIST_HEAD(&pci->link); | 176 | INIT_LIST_HEAD(&pci->link); |
177 | complete(&pci->complete); | ||
178 | } | 177 | } |
179 | 178 | ||
180 | /* | 179 | /* |
@@ -185,9 +184,8 @@ static void complete_edac_pci_list_del(struct rcu_head *head) | |||
185 | static void del_edac_pci_from_global_list(struct edac_pci_ctl_info *pci) | 184 | static void del_edac_pci_from_global_list(struct edac_pci_ctl_info *pci) |
186 | { | 185 | { |
187 | list_del_rcu(&pci->link); | 186 | list_del_rcu(&pci->link); |
188 | init_completion(&pci->complete); | ||
189 | call_rcu(&pci->rcu, complete_edac_pci_list_del); | 187 | call_rcu(&pci->rcu, complete_edac_pci_list_del); |
190 | wait_for_completion(&pci->complete); | 188 | rcu_barrier(); |
191 | } | 189 | } |
192 | 190 | ||
193 | #if 0 | 191 | #if 0 |