Commit 142b942a authored Jul 06, 2015 by Phil Sutter Committed by David S. Miller Jul 08, 2015

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>

parent f7e2965d

lib/rhashtable.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message