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 patcheddee5ba
("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>
This commit is contained in:
parent
f7e2965db1
commit
142b942a75
1 changed files with 2 additions and 2 deletions
|
@ -610,6 +610,8 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter)
|
|||
iter->skip = 0;
|
||||
}
|
||||
|
||||
iter->p = NULL;
|
||||
|
||||
/* Ensure we see any new tables. */
|
||||
smp_rmb();
|
||||
|
||||
|
@ -620,8 +622,6 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter)
|
|||
return ERR_PTR(-EAGAIN);
|
||||
}
|
||||
|
||||
iter->p = NULL;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(rhashtable_walk_next);
|
||||
|
|
Loading…
Reference in a new issue