summaryrefslogtreecommitdiffstats
path: root/lib/rhashtable.c
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-07-06 15:51:20 +0200
committerDavid S. Miller <davem@davemloft.net>2015-07-08 14:53:49 -0700
commit142b942a75cb10ede1b42bf85368d41449ab4e3b (patch)
tree7012b4dc717e3d745ac6da012a593ca49849a2a7 /lib/rhashtable.c
parentf7e2965db17dd3b60f05fad88e7afc79ea75b48f (diff)
downloadop-kernel-dev-142b942a75cb10ede1b42bf85368d41449ab4e3b.zip
op-kernel-dev-142b942a75cb10ede1b42bf85368d41449ab4e3b.tar.gz
rhashtable: fix for resize events during table walk
If rhashtable_walk_next detects a resize operation in progress, it jumps to the new table and continues walking that one. But it misses to drop the reference to it's current item, leading it to continue traversing the new table's bucket in which the current item is sorted into, and after reaching that bucket's end continues traversing the new table's second bucket instead of the first one, thereby potentially missing items. This fixes the rhashtable runtime test for me. Bug probably introduced by Herbert Xu's patch eddee5ba ("rhashtable: Fix walker behaviour during rehash") although not explicitly tested. Fixes: eddee5ba ("rhashtable: Fix walker behaviour during rehash") Signed-off-by: Phil Sutter <phil@nwl.cc> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/rhashtable.c')
-rw-r--r--lib/rhashtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index a60a6d3..cc0c697 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -610,6 +610,8 @@ next:
iter->skip = 0;
}
+ iter->p = NULL;
+
/* Ensure we see any new tables. */
smp_rmb();
@@ -620,8 +622,6 @@ next:
return ERR_PTR(-EAGAIN);
}
- iter->p = NULL;
-
return NULL;
}
EXPORT_SYMBOL_GPL(rhashtable_walk_next);
OpenPOWER on IntegriCloud