MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 18:05:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: mana: Fix error handling in mana_create_txq/rxq's NAPI cleanup

Browse Source 
commit b6ecc66203 upstream.

Currently napi_disable() gets called during rxq and txq cleanup,
even before napi is enabled and hrtimer is initialized. It causes
kernel panic.

? page_fault_oops+0x136/0x2b0
  ? page_counter_cancel+0x2e/0x80
  ? do_user_addr_fault+0x2f2/0x640
  ? refill_obj_stock+0xc4/0x110
  ? exc_page_fault+0x71/0x160
  ? asm_exc_page_fault+0x27/0x30
  ? __mmdrop+0x10/0x180
  ? __mmdrop+0xec/0x180
  ? hrtimer_active+0xd/0x50
  hrtimer_try_to_cancel+0x2c/0xf0
  hrtimer_cancel+0x15/0x30
  napi_disable+0x65/0x90
  mana_destroy_rxq+0x4c/0x2f0
  mana_create_rxq.isra.0+0x56c/0x6d0
  ? mana_uncfg_vport+0x50/0x50
  mana_alloc_queues+0x21b/0x320
  ? skb_dequeue+0x5f/0x80

Cc: stable@vger.kernel.org
Fixes: e1b5683ff6 ("net: mana: Move NAPI from EQ to CQ")
Signed-off-by: Souradeep Chakrabarti <schakrabarti@linux.microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Souradeep Chakrabarti 2024-09-02 05:43:47 -07:00 committed by Greg Kroah-Hartman
parent 05e08297c3
commit 9e0bff4900
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/microsoft/mana/mana_en.c
View File

@ -1858,10 +1858,12 @@ static void mana_destroy_txq(struct mana_port_context *apc)
for (i = 0; i < apc->num_queues; i++) { for (i = 0; i < apc->num_queues; i++) {
napi = &apc->tx_qp[i].tx_cq.napi; napi = &apc->tx_qp[i].tx_cq.napi;
napi_synchronize(napi); if (apc->tx_qp[i].txq.napi_initialized) {
napi_disable(napi); napi_synchronize(napi);
netif_napi_del(napi); napi_disable(napi);
netif_napi_del(napi);
apc->tx_qp[i].txq.napi_initialized = false;
}
mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object); mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object);
mana_deinit_cq(apc, &apc->tx_qp[i].tx_cq); mana_deinit_cq(apc, &apc->tx_qp[i].tx_cq);
@ -1917,6 +1919,7 @@ static int mana_create_txq(struct mana_port_context *apc,
txq->ndev = net; txq->ndev = net;
txq->net_txq = netdev_get_tx_queue(net, i); txq->net_txq = netdev_get_tx_queue(net, i);
txq->vp_offset = apc->tx_vp_offset; txq->vp_offset = apc->tx_vp_offset;
txq->napi_initialized = false;
skb_queue_head_init(&txq->pending_skbs); skb_queue_head_init(&txq->pending_skbs);
memset(&spec, 0, sizeof(spec)); memset(&spec, 0, sizeof(spec));
@ -1983,6 +1986,7 @@ static int mana_create_txq(struct mana_port_context *apc,
netif_napi_add_tx(net, &cq->napi, mana_poll); netif_napi_add_tx(net, &cq->napi, mana_poll);
napi_enable(&cq->napi); napi_enable(&cq->napi);
txq->napi_initialized = true;
mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT); mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT);
} }
@ -1994,7 +1998,7 @@ out:
} }
static void mana_destroy_rxq(struct mana_port_context *apc, static void mana_destroy_rxq(struct mana_port_context *apc,
struct mana_rxq *rxq, bool validate_state) struct mana_rxq *rxq, bool napi_initialized)
{ {
struct gdma_context *gc = apc->ac->gdma_dev->gdma_context; struct gdma_context *gc = apc->ac->gdma_dev->gdma_context;
@ -2009,15 +2013,15 @@ static void mana_destroy_rxq(struct mana_port_context *apc,
napi = &rxq->rx_cq.napi; napi = &rxq->rx_cq.napi;
if (validate_state) if (napi_initialized) {
napi_synchronize(napi); napi_synchronize(napi);
napi_disable(napi); napi_disable(napi);
netif_napi_del(napi);
}
xdp_rxq_info_unreg(&rxq->xdp_rxq); xdp_rxq_info_unreg(&rxq->xdp_rxq);
netif_napi_del(napi);
mana_destroy_wq_obj(apc, GDMA_RQ, rxq->rxobj); mana_destroy_wq_obj(apc, GDMA_RQ, rxq->rxobj);
mana_deinit_cq(apc, &rxq->rx_cq); mana_deinit_cq(apc, &rxq->rx_cq);

2
include/net/mana/mana.h
View File

@ -97,6 +97,8 @@ struct mana_txq {
atomic_t pending_sends; atomic_t pending_sends;
bool napi_initialized;
struct mana_stats_tx stats; struct mana_stats_tx stats;
}; };