[PATCH] mm,compaction: serialize waitqueue_active() checks (for real)

Davidlohr Bueso
2017-09-14T00:09:24Z

Andrea brought to my attention that the L->{L,S} guarantees
are completely bogus for this case. I was looking at the diagram,
from the offending commit, when that _is_ the race, we had the
load reordered already.

What we need is at least S->L semantics, thus simply use
wq_has_sleeper() to serialize the call for good.

Fixes: 46acef048a6 (mm,compaction: serialize waitqueue_active() checks)
Reported-by: Andrea Parri <parri.andrea@gmail.com>
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
mm/compaction.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mm/compaction.c b/mm/compaction.c
index fb548e4c7bd4..d1ad2cf6c758 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1999,17 +1999,16 @@ void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_idx)
if (pgdat->kcompactd_max_order < order)
pgdat->kcompactd_max_order = order;

- /*
- * Pairs with implicit barrier in wait_event_freezable()
- * such that wakeups are not missed in the lockless
- * waitqueue_active() call.
- */
smp_acquire__after_ctrl_dep();

if (pgdat->kcompactd_classzone_idx > classzone_idx)
pgdat->kcompactd_classzone_idx = classzone_idx;

- if (!waitqueue_active(&pgdat->kcompactd_wait))
+ /*
+ * Pairs with implicit barrier in wait_event_freezable()
+ * such that wakeups are not missed.
+ */
+ if (!wq_has_sleeper(&pgdat->kcompactd_wait))
return;

if (!kcompactd_node_suitable(pgdat))
--
2.12.0