mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
a6451192da
After free xsk_pool, there is possibility that napi polling is still
running in the middle, thus causes a kernel crash due to kernel NULL
pointer dereference of rx_q->xsk_pool and tx_q->xsk_pool.
Fix this by changing the XDP pool setup sequence to:
1. disable napi before free xsk_pool
2. enable napi after init xsk_pool
The following kernel panic is observed without this patch:
RIP: 0010:xsk_uses_need_wakeup+0x5/0x10
Call Trace:
stmmac_napi_poll_rxtx+0x3a9/0xae0 [stmmac]
__napi_poll+0x27/0x130
net_rx_action+0x233/0x280
__do_softirq+0xe2/0x2b6
run_ksoftirqd+0x1a/0x20
smpboot_thread_fn+0xac/0x140
? sort_range+0x20/0x20
kthread+0x124/0x150
? set_kthread_struct+0x40/0x40
ret_from_fork+0x1f/0x30
---[ end trace a77c8956b79ac107 ]---
Fixes: bba2556efa ("net: stmmac: Enable RX via AF_XDP zero-copy")
Cc: <stable@vger.kernel.org> # 5.13.x
Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
136 lines
3.2 KiB
C
136 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2021, Intel Corporation. */
|
|
|
|
#include <net/xdp_sock_drv.h>
|
|
|
|
#include "stmmac.h"
|
|
#include "stmmac_xdp.h"
|
|
|
|
static int stmmac_xdp_enable_pool(struct stmmac_priv *priv,
|
|
struct xsk_buff_pool *pool, u16 queue)
|
|
{
|
|
struct stmmac_channel *ch = &priv->channel[queue];
|
|
bool need_update;
|
|
u32 frame_size;
|
|
int err;
|
|
|
|
if (queue >= priv->plat->rx_queues_to_use ||
|
|
queue >= priv->plat->tx_queues_to_use)
|
|
return -EINVAL;
|
|
|
|
frame_size = xsk_pool_get_rx_frame_size(pool);
|
|
/* XDP ZC does not span multiple frame, make sure XSK pool buffer
|
|
* size can at least store Q-in-Q frame.
|
|
*/
|
|
if (frame_size < ETH_FRAME_LEN + VLAN_HLEN * 2)
|
|
return -EOPNOTSUPP;
|
|
|
|
err = xsk_pool_dma_map(pool, priv->device, STMMAC_RX_DMA_ATTR);
|
|
if (err) {
|
|
netdev_err(priv->dev, "Failed to map xsk pool\n");
|
|
return err;
|
|
}
|
|
|
|
need_update = netif_running(priv->dev) && stmmac_xdp_is_enabled(priv);
|
|
|
|
if (need_update) {
|
|
napi_disable(&ch->rx_napi);
|
|
napi_disable(&ch->tx_napi);
|
|
stmmac_disable_rx_queue(priv, queue);
|
|
stmmac_disable_tx_queue(priv, queue);
|
|
}
|
|
|
|
set_bit(queue, priv->af_xdp_zc_qps);
|
|
|
|
if (need_update) {
|
|
stmmac_enable_rx_queue(priv, queue);
|
|
stmmac_enable_tx_queue(priv, queue);
|
|
napi_enable(&ch->rxtx_napi);
|
|
|
|
err = stmmac_xsk_wakeup(priv->dev, queue, XDP_WAKEUP_RX);
|
|
if (err)
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int stmmac_xdp_disable_pool(struct stmmac_priv *priv, u16 queue)
|
|
{
|
|
struct stmmac_channel *ch = &priv->channel[queue];
|
|
struct xsk_buff_pool *pool;
|
|
bool need_update;
|
|
|
|
if (queue >= priv->plat->rx_queues_to_use ||
|
|
queue >= priv->plat->tx_queues_to_use)
|
|
return -EINVAL;
|
|
|
|
pool = xsk_get_pool_from_qid(priv->dev, queue);
|
|
if (!pool)
|
|
return -EINVAL;
|
|
|
|
need_update = netif_running(priv->dev) && stmmac_xdp_is_enabled(priv);
|
|
|
|
if (need_update) {
|
|
napi_disable(&ch->rxtx_napi);
|
|
stmmac_disable_rx_queue(priv, queue);
|
|
stmmac_disable_tx_queue(priv, queue);
|
|
synchronize_rcu();
|
|
}
|
|
|
|
xsk_pool_dma_unmap(pool, STMMAC_RX_DMA_ATTR);
|
|
|
|
clear_bit(queue, priv->af_xdp_zc_qps);
|
|
|
|
if (need_update) {
|
|
stmmac_enable_rx_queue(priv, queue);
|
|
stmmac_enable_tx_queue(priv, queue);
|
|
napi_enable(&ch->rx_napi);
|
|
napi_enable(&ch->tx_napi);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int stmmac_xdp_setup_pool(struct stmmac_priv *priv, struct xsk_buff_pool *pool,
|
|
u16 queue)
|
|
{
|
|
return pool ? stmmac_xdp_enable_pool(priv, pool, queue) :
|
|
stmmac_xdp_disable_pool(priv, queue);
|
|
}
|
|
|
|
int stmmac_xdp_set_prog(struct stmmac_priv *priv, struct bpf_prog *prog,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct net_device *dev = priv->dev;
|
|
struct bpf_prog *old_prog;
|
|
bool need_update;
|
|
bool if_running;
|
|
|
|
if_running = netif_running(dev);
|
|
|
|
if (prog && dev->mtu > ETH_DATA_LEN) {
|
|
/* For now, the driver doesn't support XDP functionality with
|
|
* jumbo frames so we return error.
|
|
*/
|
|
NL_SET_ERR_MSG_MOD(extack, "Jumbo frames not supported");
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
need_update = !!priv->xdp_prog != !!prog;
|
|
if (if_running && need_update)
|
|
stmmac_release(dev);
|
|
|
|
old_prog = xchg(&priv->xdp_prog, prog);
|
|
if (old_prog)
|
|
bpf_prog_put(old_prog);
|
|
|
|
/* Disable RX SPH for XDP operation */
|
|
priv->sph = priv->sph_cap && !stmmac_xdp_is_enabled(priv);
|
|
|
|
if (if_running && need_update)
|
|
stmmac_open(dev);
|
|
|
|
return 0;
|
|
}
|