net: enetc: correct the statistics of rx bytes
Subsystems (3)
[email protected]
maintainercover net: enetc: correct the statistics of rx bytes
From: Wei Fang <[email protected]>
The purpose of this patch set is to fix the issue of rx bytes statistics. The first patch corrects the rx bytes statistics of normal kernel protocol stack path, and the second patch is used to correct the rx bytes statistics of XDP.
Wei Fang (2):
net: enetc: correct the statistics of rx bytes
net: enetc: correct rx_bytes statistics of XDP
drivers/net/ethernet/freescale/enetc/enetc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH 1/2 net: enetc: correct the statistics of rx bytes
From: Wei Fang <[email protected]>
The rx_bytes of struct net_device_stats should count the length of ethernet frames excluding the FCS. However, there are two problems with the rx_bytes statistics of the current enetc driver. one is that the length of VLAN header is not counted if the VLAN extraction feature is enabled. The other is that the length of L2 header is not counted, because eth_type_trans() is invoked before updating rx_bytes which will subtract the length of L2 header from skb->len. BTW, the rx_bytes statistics of XDP path also have similar problem, I will fix it in another patch.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +7 -1
@@ -1229,7 +1229,13 @@ static int enetc_clean_rx_ring(struct enetc_bdr *rx_ring,if (!skb)break ; - rx_byte_cnt += skb->len; +/* When set, the outer VLAN header is extracted and reported +* in the receive buffer descriptor. So rx_byte_cnt should +* add the length of the extracted VLAN header. +*/ +if (bd_status &ENETC_RXBD_FLAG_VLAN ) + rx_byte_cnt +=VLAN_HLEN ; + rx_byte_cnt += skb->len +ETH_HLEN ; rx_frm_cnt++;napi_gro_receive (napi, skb);
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerHi Wei,
Quoted 9 lines · On Fri, Jun 02, 2023 at 05:46:58PM +0800, [email protected] wrote:
From: Wei Fang <[email protected]>
The
rx_bytesof structnet_device_statsshould count the length of ethernet frames excluding the FCS. However, there are two problems with therx_bytesstatistics of the current enetc driver. one is that the length of VLAN header is not counted if the VLAN extraction feature is enabled. The other is that the length of L2 header is not counted, becauseeth_type_trans()is invoked before updatingrx_byteswhich will subtract the length of L2 header fromskb->len.
Thanks for noticing the issue and for sending a patch.
Quoted 15 lines
BTW, the
rx_bytesstatistics of XDP path also have similar problem, I will fix it in another patch.Fixes a800abd3ecb9 ("net: enetc: move skb creation into enetc_build_skb")Signed-off-by Wei Fang <[email protected]>--- drivers/net/ethernet/freescale/enetc/enetc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/net/ethernet/freescale/enetc/enetc.c +0
-0@@ -1229,7 +1229,13 @@ static int enetc_clean_rx_ring(struct enetc_bdr *rx_ring,if (!skb)
drivers/net/ethernet/freescale/enetc/enetc.c static int enetc_clean_rx_ring(struct enetc_bdr *rx_ring, · line 1238
Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc.c +7
-1break ; - rx_byte_cnt += skb->len; +/* When set, the outer VLAN header is extracted and reported +* in the receive buffer descriptor. So rx_byte_cnt should +* add the length of the extracted VLAN header. +*/ +if (bd_status &ENETC_RXBD_FLAG_VLAN ) + rx_byte_cnt +=VLAN_HLEN ; + rx_byte_cnt += skb->len +ETH_HLEN ;
Hmm, to avoid the conditional, have you considered adding an "int *rx_byte_cnt" argument to enetc_build_skb()? It can be updated with "(*rx_byte_cnt) += size" from all places where we already have "(*cleaned_cnt)++".
Quoted 6 lines
drivers/net/ethernet/freescale/enetc/enetc.c +0
-0rx_frm_cnt++;napi_gro_receive (napi, skb);Signature · 1 line
2.25.1
Vladimir Oltean
maintainerQuoted 3 lines · Vladimir Oltean
Hmm, to avoid the conditional, have you considered adding an "int
*rx_byte_cnt" argument toenetc_build_skb()? It can be updated with "(*rx_byte_cnt) += size" from all places where we already have "(*cleaned_cnt)++".
Ah, don't mind me. We can't avoid the conditional, since the VLAN header is offloaded as you said. It's not in the buffer.
Quoted 12 lines · On Fri, Jun 02, 2023 at 05:46:58PM +0800, [email protected] wrote:
From: Wei Fang <[email protected]>
The
rx_bytesof structnet_device_statsshould count the length of ethernet frames excluding the FCS. However, there are two problems with therx_bytesstatistics of the current enetc driver. one is that the length of VLAN header is not counted if the VLAN extraction feature is enabled. The other is that the length of L2 header is not counted, becauseeth_type_trans()is invoked before updatingrx_byteswhich will subtract the length of L2 header fromskb->len. BTW, therx_bytesstatistics of XDP path also have similar problem, I will fix it in another patch.
Quoted 3 lines
Fixes a800abd3ecb9 ("net: enetc: move skb creation into enetc_build_skb")Signed-off-by Wei Fang <[email protected]>---
By the way, you mangled Jakub's email ([email protected]) - I've fixed it up.
Wei Fang
maintainerQuoted 25 lines
-----Original Message-----
From: Vladimir Oltean <[email protected]>
Sent: 2023年6月2日 18:32
To: Wei Fang <[email protected]>
Cc: Claudiu Manoil <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH net 1/2] net: enetc: correct the statistics of rx bytesQuoted 12 lines · On Fri, Jun 02, 2023 at 05:46:58PM +0800, [email protected] wrote:
From: Wei Fang <[email protected]>
The
rx_bytesof structnet_device_statsshould count the length of ethernet frames excluding the FCS. However, there are two problems with therx_bytesstatistics of the current enetc driver. one is that the length of VLAN header is not counted if the VLAN extraction feature is enabled. The other is that the length of L2 header is not counted, becauseeth_type_trans()is invoked before updatingrx_byteswhich will subtract the length of L2 header fromskb->len. BTW, therx_bytesstatistics of XDP path also have similar problem, I will fix it in another patch.
Quoted 8 lines
Quoted 4 lines
Fixes a800abd3ecb9 ("net: enetc: move skb creation into
enetc_build_skb")Signed-off-by Wei Fang <[email protected]>---
Reviewed-by Vladimir Oltean <[email protected]>By the way, you mangled Jakub's email ([email protected]) - I've fixed it up.
Yes, I realized this after sending the email. Thank you so much!
[email protected]
maintainerPATCH 2/2 net: enetc: correct rx_bytes statistics of XDP
In reply to [email protected]From: Wei Fang <[email protected]>
The rx_bytes statistics of XDP are always zero, because rx_byte_cnt is not updated after it is initialized to 0. So fix it.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/freescale/enetc/enetc.c +8 -0
@@ -1571,6 +1571,14 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,enetc_build_xdp_buff (rx_ring, bd_status, &rxbd, &i, &cleaned_cnt, &xdp_buff); +/* When set, the outer VLAN header is extracted and reported +* in the receive buffer descriptor. So rx_byte_cnt should +* add the length of the extracted VLAN header. +*/ +if (bd_status &ENETC_RXBD_FLAG_VLAN ) + rx_byte_cnt +=VLAN_HLEN ; + rx_byte_cnt +=xdp_get_buff_len (&xdp_buff); + xdp_act =bpf_prog_run_xdp (prog, &xdp_buff);switch (xdp_act) {
Signature · 1 line
2.25.1
Re: [PATCH net 2/2] net: enetc: correct rx_bytes statistics of XDP
Quoted 8 lines · On Fri, Jun 02, 2023 at 05:46:59PM +0800, [email protected] wrote:
From: Wei Fang <[email protected]>
The
rx_bytesstatistics of XDP are always zero, becauserx_byte_cntis not updated after it is initialized to 0. So fix it.Fixes d1b15102dd16 ("net: enetc: add support for XDP_DROP and XDP_PASS")Signed-off-by Wei Fang <[email protected]>---
Thanks!
This series was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Fri, 2 Jun 2023 17:46:57 +0800 you wrote:
From: Wei Fang <[email protected]>
The purpose of this patch set is to fix the issue of rx bytes statistics. The first patch corrects the rx bytes statistics of normal kernel protocol stack path, and the second patch is used to correct the rx bytes statistics of XDP.
[...]
Here is the summary with links:
- [net,1/2] net: enetc: correct the statistics of rx bytes
https://git.kernel.org/netdev/net/c/7190d0ff0e17 - [net,2/2] net: enetc: correct rx_bytes statistics of XDP https://git.kernel.org/netdev/net/c/fdebd850cc06
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html