| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 12 Jul 2022 12:08:05 +0200
From: Paolo Abeni <pabeni@...hat.com>
To: Lorenzo Bianconi <lorenzo@...nel.org>, netdev@...r.kernel.org
Cc: nbd@....name, john@...ozen.org, sean.wang@...iatek.com,
Mark-MC.Lee@...iatek.com, davem@...emloft.net, edumazet@...gle.com,
kuba@...nel.org, matthias.bgg@...il.com,
linux-mediatek@...ts.infradead.org, ilias.apalodimas@...aro.org,
lorenzo.bianconi@...hat.com, jbrouer@...hat.com
Subject: Re: [PATCH net-next 3/4] net: ethernet: mtk_eth_soc: introduce xdp
ethtool counters
On Sat, 2022-07-09 at 17:48 +0200, Lorenzo Bianconi wrote:
> Report xdp stats through ethtool
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@...nel.org>
> ---
> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 54 +++++++++++++++++----
> drivers/net/ethernet/mediatek/mtk_eth_soc.h | 12 +++++
> 2 files changed, 57 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> index 3b583abb599d..ae7ba2e09df8 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> @@ -34,6 +34,10 @@ MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");
> #define MTK_ETHTOOL_STAT(x) { #x, \
> offsetof(struct mtk_hw_stats, x) / sizeof(u64) }
>
> +#define MTK_ETHTOOL_XDP_STAT(x) { #x, \
> + offsetof(struct mtk_hw_stats, xdp_stats.x) / \
> + sizeof(u64) }
> +
> static const struct mtk_reg_map mtk_reg_map = {
> .tx_irq_mask = 0x1a1c,
> .tx_irq_status = 0x1a18,
> @@ -141,6 +145,13 @@ static const struct mtk_ethtool_stats {
> MTK_ETHTOOL_STAT(rx_long_errors),
> MTK_ETHTOOL_STAT(rx_checksum_errors),
> MTK_ETHTOOL_STAT(rx_flow_control_packets),
> + MTK_ETHTOOL_XDP_STAT(rx_xdp_redirect),
> + MTK_ETHTOOL_XDP_STAT(rx_xdp_pass),
> + MTK_ETHTOOL_XDP_STAT(rx_xdp_drop),
> + MTK_ETHTOOL_XDP_STAT(rx_xdp_tx),
> + MTK_ETHTOOL_XDP_STAT(rx_xdp_tx_errors),
> + MTK_ETHTOOL_XDP_STAT(tx_xdp_xmit),
> + MTK_ETHTOOL_XDP_STAT(tx_xdp_xmit_errors),
> };
>
> static const char * const mtk_clks_source_name[] = {
> @@ -1495,7 +1506,8 @@ static void mtk_rx_put_buff(struct mtk_rx_ring *ring, void *data, bool napi)
> }
>
> static u32 mtk_xdp_run(struct mtk_rx_ring *ring, struct bpf_prog *prog,
> - struct xdp_buff *xdp, struct net_device *dev)
> + struct xdp_buff *xdp, struct net_device *dev,
> + struct mtk_xdp_stats *stats)
> {
> u32 act = XDP_PASS;
>
> @@ -1505,10 +1517,13 @@ static u32 mtk_xdp_run(struct mtk_rx_ring *ring, struct bpf_prog *prog,
> act = bpf_prog_run_xdp(prog, xdp);
> switch (act) {
> case XDP_PASS:
> + stats->rx_xdp_pass++;
> return XDP_PASS;
> case XDP_REDIRECT:
> if (unlikely(xdp_do_redirect(dev, xdp, prog)))
> break;
> +
> + stats->rx_xdp_redirect++;
> return XDP_REDIRECT;
> default:
> bpf_warn_invalid_xdp_action(dev, prog, act);
> @@ -1520,14 +1535,38 @@ static u32 mtk_xdp_run(struct mtk_rx_ring *ring, struct bpf_prog *prog,
> break;
> }
>
> + stats->rx_xdp_drop++;
> page_pool_put_full_page(ring->page_pool,
> virt_to_head_page(xdp->data), true);
> return XDP_DROP;
> }
>
> +static void mtk_xdp_rx_complete(struct mtk_eth *eth,
> + struct mtk_xdp_stats *stats)
> +{
> + int i, xdp_do_redirect = 0;
> +
> + /* update xdp ethtool stats */
> + for (i = 0; i < MTK_MAX_DEVS; i++) {
> + struct mtk_hw_stats *hw_stats = eth->mac[i]->hw_stats;
> + struct mtk_xdp_stats *xdp_stats = &hw_stats->xdp_stats;
> +
> + u64_stats_update_begin(&hw_stats->syncp);
> + xdp_stats->rx_xdp_redirect += stats[i].rx_xdp_redirect;
> + xdp_do_redirect += stats[i].rx_xdp_pass;
> + xdp_stats->rx_xdp_pass += stats[i].rx_xdp_pass;
> + xdp_stats->rx_xdp_drop += stats[i].rx_xdp_drop;
> + u64_stats_update_end(&hw_stats->syncp);
> + }
> +
> + if (xdp_do_redirect)
> + xdp_do_flush_map();
> +}
> +
> static int mtk_poll_rx(struct napi_struct *napi, int budget,
> struct mtk_eth *eth)
> {
> + struct mtk_xdp_stats xdp_stats[MTK_MAX_DEVS] = {};
This is allocating on the stack and clearing a relatively large struct
for every poll() call, which is not good.
Why can't you touch directly the eth->mac[i]->hw_stats.xdp_stats
counters where needed?
> struct bpf_prog *prog = READ_ONCE(eth->prog);
> struct dim_sample dim_sample = {};
> struct mtk_rx_ring *ring;
> @@ -1535,7 +1574,6 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
> struct sk_buff *skb;
> u8 *data, *new_data;
> struct mtk_rx_dma_v2 *rxd, trxd;
> - bool xdp_do_redirect = false;
> int done = 0, bytes = 0;
>
> while (done < budget) {
> @@ -1597,12 +1635,10 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
> false);
> xdp_buff_clear_frags_flag(&xdp);
>
> - ret = mtk_xdp_run(ring, prog, &xdp, netdev);
> - if (ret != XDP_PASS) {
> - if (ret == XDP_REDIRECT)
> - xdp_do_redirect = true;
> + ret = mtk_xdp_run(ring, prog, &xdp, netdev,
> + &xdp_stats[mac]);
> + if (ret != XDP_PASS)
> goto skip_rx;
> - }
>
> skb = build_skb(data, PAGE_SIZE);
> if (unlikely(!skb)) {
> @@ -1725,8 +1761,8 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
> &dim_sample);
> net_dim(ð->rx_dim, dim_sample);
>
> - if (prog && xdp_do_redirect)
> - xdp_do_flush_map();
> + if (prog)
> + mtk_xdp_rx_complete(eth, xdp_stats);
>
> return done;
> }
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
> index a1cea93300c1..629cdcdd632a 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
> @@ -570,6 +570,16 @@ struct mtk_tx_dma_v2 {
> struct mtk_eth;
> struct mtk_mac;
>
> +struct mtk_xdp_stats {
> + u64 rx_xdp_redirect;
> + u64 rx_xdp_pass;
> + u64 rx_xdp_drop;
> + u64 rx_xdp_tx;
> + u64 rx_xdp_tx_errors;
> + u64 tx_xdp_xmit;
> + u64 tx_xdp_xmit_errors;
> +};
> +
> /* struct mtk_hw_stats - the structure that holds the traffic statistics.
> * @stats_lock: make sure that stats operations are atomic
> * @reg_offset: the status register offset of the SoC
> @@ -593,6 +603,8 @@ struct mtk_hw_stats {
> u64 rx_checksum_errors;
> u64 rx_flow_control_packets;
>
> + struct mtk_xdp_stats xdp_stats;
> +
> spinlock_t stats_lock;
> u32 reg_offset;
> struct u64_stats_sync syncp;
Powered by blists - more mailing lists