lkml.org 
[lkml]   [2013]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[23/88] net: force a reload of first item in hlist_nulls_for_each_entry_rcu
    3.6.11.7-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Eric Dumazet <eric.dumazet@gmail.com>

    [ Upstream commit c87a124a5d5e8cf8e21c4363c3372bcaf53ea190 ]

    Roman Gushchin discovered that udp4_lib_lookup2() was not reloading
    first item in the rcu protected list, in case the loop was restarted.

    This produced soft lockups as in https://lkml.org/lkml/2013/4/16/37

    rcu_dereference(X)/ACCESS_ONCE(X) seem to not work as intended if X is
    ptr->field :

    In some cases, gcc caches the value or ptr->field in a register.

    Use a barrier() to disallow such caching, as documented in
    Documentation/atomic_ops.txt line 114

    Thanks a lot to Roman for providing analysis and numerous patches.

    Diagnosed-by: Roman Gushchin <klamm@yandex-team.ru>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: Boris Zhmurov <zhmurov@yandex-team.ru>
    Signed-off-by: Roman Gushchin <klamm@yandex-team.ru>
    Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    include/linux/rculist_nulls.h | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/include/linux/rculist_nulls.h b/include/linux/rculist_nulls.h
    index 2ae1371..1c33dd7 100644
    --- a/include/linux/rculist_nulls.h
    +++ b/include/linux/rculist_nulls.h
    @@ -105,9 +105,14 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,
    * @head: the head for your list.
    * @member: the name of the hlist_nulls_node within the struct.
    *
    + * The barrier() is needed to make sure compiler doesn't cache first element [1],
    + * as this loop can be restarted [2]
    + * [1] Documentation/atomic_ops.txt around line 114
    + * [2] Documentation/RCU/rculist_nulls.txt around line 146
    */
    #define hlist_nulls_for_each_entry_rcu(tpos, pos, head, member) \
    - for (pos = rcu_dereference_raw(hlist_nulls_first_rcu(head)); \
    + for (({barrier();}), \
    + pos = rcu_dereference_raw(hlist_nulls_first_rcu(head)); \
    (!is_a_nulls(pos)) && \
    ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1; }); \
    pos = rcu_dereference_raw(hlist_nulls_next_rcu(pos)))
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-08-13 19:01    [W:6.652 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site