lkml.org 
[lkml]   [2018]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 152/168] net/mlx5e: Avoid using the ipv6 stub in the TC offload neigh update path
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Or Gerlitz <ogerlitz@mellanox.com>


    [ Upstream commit 423c9db29943cfc43e3a408192e9efa4178af6a1 ]

    Currently we use the global ipv6_stub var to access the ipv6 global
    nd table. This practice gets us to troubles when the stub is only partially
    set e.g when ipv6 is loaded under the disabled policy. In this case, as of commit
    343d60aada5a ("ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument")
    the stub is not null, but stub->nd_tbl is and we crash.

    As we can access the ipv6 nd_tbl directly, the fix is just to avoid the
    reference through the stub. There is one place in the code where we
    issue ipv6 route lookup and keep doing it through the stub, but that
    mentioned commit makes sure we get -EAFNOSUPPORT from the stack.

    Fixes: 232c001398ae ("net/mlx5e: Add support to neighbour update flow")
    Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
    Reviewed-by: Aviv Heller <avivh@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +++---
    drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +-
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
    @@ -231,7 +231,7 @@ void mlx5e_remove_sqs_fwd_rules(struct m
    static void mlx5e_rep_neigh_update_init_interval(struct mlx5e_rep_priv *rpriv)
    {
    #if IS_ENABLED(CONFIG_IPV6)
    - unsigned long ipv6_interval = NEIGH_VAR(&ipv6_stub->nd_tbl->parms,
    + unsigned long ipv6_interval = NEIGH_VAR(&nd_tbl.parms,
    DELAY_PROBE_TIME);
    #else
    unsigned long ipv6_interval = ~0UL;
    @@ -367,7 +367,7 @@ static int mlx5e_rep_netevent_event(stru
    case NETEVENT_NEIGH_UPDATE:
    n = ptr;
    #if IS_ENABLED(CONFIG_IPV6)
    - if (n->tbl != ipv6_stub->nd_tbl && n->tbl != &arp_tbl)
    + if (n->tbl != &nd_tbl && n->tbl != &arp_tbl)
    #else
    if (n->tbl != &arp_tbl)
    #endif
    @@ -415,7 +415,7 @@ static int mlx5e_rep_netevent_event(stru
    * done per device delay prob time parameter.
    */
    #if IS_ENABLED(CONFIG_IPV6)
    - if (!p->dev || (p->tbl != ipv6_stub->nd_tbl && p->tbl != &arp_tbl))
    + if (!p->dev || (p->tbl != &nd_tbl && p->tbl != &arp_tbl))
    #else
    if (!p->dev || p->tbl != &arp_tbl)
    #endif
    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
    @@ -495,7 +495,7 @@ void mlx5e_tc_update_neigh_used_value(st
    tbl = &arp_tbl;
    #if IS_ENABLED(CONFIG_IPV6)
    else if (m_neigh->family == AF_INET6)
    - tbl = ipv6_stub->nd_tbl;
    + tbl = &nd_tbl;
    #endif
    else
    return;

    \
     
     \ /
      Last update: 2018-04-11 01:12    [W:4.034 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site