net: fec: add exception tracing for XDP
Subsystems (4)
Wei Fang
maintainerPATCH 1/1 net: fec: add exception tracing for XDP
As we already added the exception tracing for XDP_TX, I think it is necessary to add the exception tracing for other XDP actions, such as XDP_REDIRECT, XDP_ABORTED and unknown error actions.
--- drivers/net/ethernet/freescale/fec_main.c | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +11 -15
@@ -1583,25 +1583,18 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog,case XDP_REDIRECT : rxq->stats[RX_XDP_REDIRECT ]++; err =xdp_do_redirect (fep->netdev, xdp, prog); -if (!err) { - ret =FEC_ENET_XDP_REDIR ; - }else { - ret =FEC_ENET_XDP_CONSUMED ; - page =virt_to_head_page (xdp->data); -page_pool_put_page (rxq->page_pool, page, sync, true); - } +if (unlikely (err)) + goto xdp_err; + + ret =FEC_ENET_XDP_REDIR ;break ;case XDP_TX : err =fec_enet_xdp_tx_xmit (fep, cpu, xdp, sync); -if (unlikely (err)) { - ret =FEC_ENET_XDP_CONSUMED ; - page =virt_to_head_page (xdp->data); -page_pool_put_page (rxq->page_pool, page, sync, true); -trace_xdp_exception (fep->netdev, prog, act); - }else { - ret =FEC_ENET_XDP_TX ; - } +if (unlikely (err)) + goto xdp_err; + + ret =FEC_ENET_XDP_TX ;break ;default :
@@ -1613,9 +1606,12 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog,case XDP_DROP : rxq->stats[RX_XDP_DROP ]++; +xdp_err: ret =FEC_ENET_XDP_CONSUMED ; page =virt_to_head_page (xdp->data);page_pool_put_page (rxq->page_pool, page, sync, true); +if (act !=XDP_DROP ) +trace_xdp_exception (fep->netdev, prog, act);break ; }
Signature · 1 line
2.25.1
Quoted 7 lines · Wei Fang
As we already added the exception tracing for
XDP_TX, I think it is necessary to add the exception tracing for other XDP actions, such asXDP_REDIRECT,XDP_ABORTEDand unknown error actions.Signed-off-by Wei Fang <[email protected]>Suggested-by Jakub Kicinski <[email protected]>---
Makes sense to me, and it ends up being a bit less code.
Quoted 42 lines
drivers/net/ethernet/freescale/fec_main.c | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-)drivers/net/ethernet/freescale/fec_main.c +8
-15@@ -1583,25 +1583,18 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog,case XDP_REDIRECT : rxq->stats[RX_XDP_REDIRECT ]++; err =xdp_do_redirect (fep->netdev, xdp, prog); -if (!err) { - ret =FEC_ENET_XDP_REDIR ; - }else { - ret =FEC_ENET_XDP_CONSUMED ; - page =virt_to_head_page (xdp->data); -page_pool_put_page (rxq->page_pool, page, sync, true); - } +if (unlikely (err)) + goto xdp_err; + + ret =FEC_ENET_XDP_REDIR ;break ;case XDP_TX : err =fec_enet_xdp_tx_xmit (fep, cpu, xdp, sync); -if (unlikely (err)) { - ret =FEC_ENET_XDP_CONSUMED ; - page =virt_to_head_page (xdp->data); -page_pool_put_page (rxq->page_pool, page, sync, true); -trace_xdp_exception (fep->netdev, prog, act); - }else { - ret =FEC_ENET_XDP_TX ; - } +if (unlikely (err)) + goto xdp_err; + + ret =FEC_ENET_XDP_TX ;break ;default :
drivers/net/ethernet/freescale/fec_main.c fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog, · line 1612
Quoted 7 lines
drivers/net/ethernet/freescale/fec_main.c +1
-0@@ -1613,9 +1606,12 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog,case XDP_DROP : rxq->stats[RX_XDP_DROP ]++; +xdp_err: ret =FEC_ENET_XDP_CONSUMED ; page =virt_to_head_page (xdp->data);page_pool_put_page (rxq->page_pool, page, sync, true);
Ok, so we handle the cleaning up of the page and such here, which is shared for both paths now. Nice!
Quoted 5 lines
drivers/net/ethernet/freescale/fec_main.c +2
-0+if (act !=XDP_DROP ) +trace_xdp_exception (fep->netdev, prog, act);break ; }
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 22 Aug 2023 14:52:55 +0800 you wrote:
As we already added the exception tracing for
XDP_TX, I think it is necessary to add the exception tracing for other XDP actions, such asXDP_REDIRECT,XDP_ABORTEDand unknown error actions.Signed-off-by Wei Fang <[email protected]>Suggested-by Jakub Kicinski <[email protected]>[...]
Here is the summary with links:
- [net-next] net: fec: add exception tracing for XDP
https://git.kernel.org/netdev/net-next/c/e83fabb797b9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html