Skip to content

Commit

Permalink
net: fec: dynamically set the NETDEV_XDP_ACT_NDO_XMIT feature of XDP
Browse files Browse the repository at this point in the history
When a XDP program is installed or uninstalled, fec_restart() will
be invoked to reset MAC and buffer descriptor rings. It's reasonable
not to transmit any packet during the process of reset. However, the
NETDEV_XDP_ACT_NDO_XMIT bit of xdp_features is enabled by default,
that is to say, it's possible that the fec_enet_xdp_xmit() will be
invoked even if the process of reset is not finished. In this case,
the redirected XDP frames might be dropped and available transmit BDs
may be incorrectly deemed insufficient. So this patch disable the
NETDEV_XDP_ACT_NDO_XMIT feature by default and dynamically configure
this feature when the bpf program is installed or uninstalled.

Fixes: e4ac7cc ("net: fec: turn on XDP features")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Wei Fang authored and Paolo Abeni committed Jul 11, 2023
1 parent 9d0aba9 commit be7ecbe
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/net/ethernet/freescale/fec_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3732,21 +3732,27 @@ static int fec_enet_bpf(struct net_device *dev, struct netdev_bpf *bpf)
if (fep->quirks & FEC_QUIRK_SWAP_FRAME)
return -EOPNOTSUPP;

if (!bpf->prog)
xdp_features_clear_redirect_target(dev);

if (is_run) {
napi_disable(&fep->napi);
netif_tx_disable(dev);
}

old_prog = xchg(&fep->xdp_prog, bpf->prog);
if (old_prog)
bpf_prog_put(old_prog);

fec_restart(dev);

if (is_run) {
napi_enable(&fep->napi);
netif_tx_start_all_queues(dev);
}

if (old_prog)
bpf_prog_put(old_prog);
if (bpf->prog)
xdp_features_set_redirect_target(dev, false);

return 0;

Expand Down Expand Up @@ -4016,8 +4022,7 @@ static int fec_enet_init(struct net_device *ndev)

if (!(fep->quirks & FEC_QUIRK_SWAP_FRAME))
ndev->xdp_features = NETDEV_XDP_ACT_BASIC |
NETDEV_XDP_ACT_REDIRECT |
NETDEV_XDP_ACT_NDO_XMIT;
NETDEV_XDP_ACT_REDIRECT;

fec_restart(ndev);

Expand Down

0 comments on commit be7ecbe

Please sign in to comment.