lkml.org 
[lkml]   [2015]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 115/159] rhashtable: fix for resize events during table walk
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Phil Sutter <phil@nwl.cc>

    [ Upstream commit 142b942a75cb10ede1b42bf85368d41449ab4e3b ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    lib/rhashtable.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/lib/rhashtable.c
    +++ b/lib/rhashtable.c
    @@ -612,6 +612,8 @@ next:
    iter->skip = 0;
    }

    + iter->p = NULL;
    +
    /* Ensure we see any new tables. */
    smp_rmb();

    @@ -622,8 +624,6 @@ next:
    return ERR_PTR(-EAGAIN);
    }

    - iter->p = NULL;
    -
    out:

    return obj;



    \
     
     \ /
      Last update: 2015-09-27 00:01    [W:4.126 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site