lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 175/254] octeontx2-af: Fix irq free in rvu teardown
    Date
    From: Geetha sowjanya <gakula@marvell.com>

    [ Upstream commit ae2619dd4fccdad9876aa5f900bd85484179c50f ]

    Current devlink code try to free already freed irqs as the
    irq_allocate flag is not cleared after free leading to kernel
    crash while removing rvu driver. The patch fixes the irq free
    sequence and clears the irq_allocate flag on free.

    Fixes: 7304ac4567bc ("octeontx2-af: Add mailbox IRQ and msg handlers")
    Signed-off-by: Geetha sowjanya <gakula@marvell.com>
    Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
    Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
    index e8fd712860a1..e3fc6d1c0ec3 100644
    --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
    +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
    @@ -2358,8 +2358,10 @@ static void rvu_unregister_interrupts(struct rvu *rvu)
    INTR_MASK(rvu->hw->total_pfs) & ~1ULL);

    for (irq = 0; irq < rvu->num_vec; irq++) {
    - if (rvu->irq_allocated[irq])
    + if (rvu->irq_allocated[irq]) {
    free_irq(pci_irq_vector(rvu->pdev, irq), rvu);
    + rvu->irq_allocated[irq] = false;
    + }
    }

    pci_free_irq_vectors(rvu->pdev);
    @@ -2873,8 +2875,8 @@ static void rvu_remove(struct pci_dev *pdev)
    struct rvu *rvu = pci_get_drvdata(pdev);

    rvu_dbg_exit(rvu);
    - rvu_unregister_interrupts(rvu);
    rvu_unregister_dl(rvu);
    + rvu_unregister_interrupts(rvu);
    rvu_flr_wq_destroy(rvu);
    rvu_cgx_exit(rvu);
    rvu_fwdata_exit(rvu);
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-29 11:02    [W:4.282 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site