lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 548/917] nfp: fix NULL pointer access when scheduling dim work
    Date
    From: Yinjun Zhang <yinjun.zhang@corigine.com>

    [ Upstream commit f8d384a640dd32aaf0a05fec137ccbf0e986b09f ]

    Each rx/tx ring has a related dim work, when rx/tx ring number is
    decreased by `ethtool -L`, the corresponding rx_ring or tx_ring is
    assigned NULL, while its related work is not destroyed. When scheduled,
    the work will access NULL pointer.

    Fixes: 9d32e4e7e9e1 ("nfp: add support for coalesce adaptive feature")
    Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
    Signed-off-by: Louis Peens <louis.peens@corigine.com>
    Signed-off-by: Simon Horman <simon.horman@corigine.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
    index 5bfa22accf2c9..f8b880c8e5148 100644
    --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
    +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
    @@ -2067,7 +2067,7 @@ static int nfp_net_poll(struct napi_struct *napi, int budget)
    if (napi_complete_done(napi, pkts_polled))
    nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_entry);

    - if (r_vec->nfp_net->rx_coalesce_adapt_on) {
    + if (r_vec->nfp_net->rx_coalesce_adapt_on && r_vec->rx_ring) {
    struct dim_sample dim_sample = {};
    unsigned int start;
    u64 pkts, bytes;
    @@ -2082,7 +2082,7 @@ static int nfp_net_poll(struct napi_struct *napi, int budget)
    net_dim(&r_vec->rx_dim, dim_sample);
    }

    - if (r_vec->nfp_net->tx_coalesce_adapt_on) {
    + if (r_vec->nfp_net->tx_coalesce_adapt_on && r_vec->tx_ring) {
    struct dim_sample dim_sample = {};
    unsigned int start;
    u64 pkts, bytes;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:45    [W:3.252 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site