net: xfrm: use core API for updating TX stats
Subsystems (3)
PATCH 3/3 net: xfrm: use core API for updating TX stats
Commit d3fd65484c781 ("net: core: add dev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats.
Use this function instead of own code.
--- net/xfrm/xfrm_interface.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
net/xfrm/xfrm_interface.c +1 -6
@@ -319,12 +319,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) err =dst_output (xi->net, skb->sk, skb);if (net_xmit_eval (err) ==0 ) { -struct pcpu_sw_netstats *tstats =this_cpu_ptr (dev->tstats); - -u64_stats_update_begin (&tstats->syncp); - tstats->tx_bytes += length; - tstats->tx_packets++; -u64_stats_update_end (&tstats->syncp); +dev_sw_netstats_tx_add (dev,1 , length); }else { stats->tx_errors++; stats->tx_aborted_errors++;
Signature · 1 line
2.25.1
Am 12.11.2020 um 12:13 schrieb Lev Stipakov:
Quoted 6 lines
Commit
d3fd65484c781("net: core: adddev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats.Use this function instead of own code.
LGTM. In addition you can replace xfrmi_get_stats64() with dev_get_tstats64().
Quoted 24 lines
Signed-off-by Lev Stipakov <[email protected]>--- net/xfrm/xfrm_interface.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)net/xfrm/xfrm_interface.c +1
-6@@ -319,12 +319,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) err =dst_output (xi->net, skb->sk, skb);if (net_xmit_eval (err) ==0 ) { -struct pcpu_sw_netstats *tstats =this_cpu_ptr (dev->tstats); - -u64_stats_update_begin (&tstats->syncp); - tstats->tx_bytes += length; - tstats->tx_packets++; -u64_stats_update_end (&tstats->syncp); +dev_sw_netstats_tx_add (dev,1 , length); }else { stats->tx_errors++; stats->tx_aborted_errors++;
PATCH v2 3/3 net: xfrm: use core API for updating/providing stats
Commit d3fd65484c781 ("net: core: add dev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats.
Use this function instead of own code.
While on it, remove xfrmi_get_stats64() and replace it with dev_get_tstats64().
---
v2: replace xfrmi_get_stats64() vs dev_get_tstats64()
net/xfrm/xfrm_interface.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
net/xfrm/xfrm_interface.c +2 -17
@@ -319,12 +319,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) err =dst_output (xi->net, skb->sk, skb);if (net_xmit_eval (err) ==0 ) { -struct pcpu_sw_netstats *tstats =this_cpu_ptr (dev->tstats); - -u64_stats_update_begin (&tstats->syncp); - tstats->tx_bytes += length; - tstats->tx_packets++; -u64_stats_update_end (&tstats->syncp); +dev_sw_netstats_tx_add (dev,1 , length); }else { stats->tx_errors++; stats->tx_aborted_errors++;
@@ -538,15 +533,6 @@ static int xfrmi_update(struct xfrm_if *xi, struct xfrm_if_parms *p)return err; } -static void xfrmi_get_stats64 (struct net_device *dev, -struct rtnl_link_stats64 *s) -{ -dev_fetch_sw_netstats (s, dev->tstats); - - s->rx_dropped = dev->stats.rx_dropped; - s->tx_dropped = dev->stats.tx_dropped; -} -static int xfrmi_get_iflink (const struct net_device *dev) {struct xfrm_if *xi =netdev_priv (dev);
@@ -554,12 +540,11 @@ static int xfrmi_get_iflink(const struct net_device *dev)return xi->p.link; } -static const struct net_device_ops xfrmi_netdev_ops = { .ndo_init = xfrmi_dev_init, .ndo_uninit = xfrmi_dev_uninit, .ndo_start_xmit = xfrmi_xmit, - .ndo_get_stats64 = xfrmi_get_stats64, + .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = xfrmi_get_iflink, };
Signature · 1 line
2.25.1
Re: [PATCH v2 3/3] net: xfrm: use core API for updating/providing stats
Am 13.11.2020 um 10:07 schrieb Lev Stipakov:
Quoted 4 lines
Commit
d3fd65484c781("net: core: adddev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats.
Quoted 8 lines
Use this function instead of own code.
While on it, remove
xfrmi_get_stats64()and replace it withdev_get_tstats64().Signed-off-by Lev Stipakov <[email protected]>---
PATCH v3 1/1 net: xfrm: use core API for updating/providing stats
Commit d3fd65484c781 ("net: core: add dev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats.
Use this function instead of own code.
While on it, remove xfrmi_get_stats64() and replace it with dev_get_tstats64().
---
v3: no code changes, just send separate patch instead of series as
requested
v2: replace xfrmi_get_stats64() vs dev_get_tstats64()
net/xfrm/xfrm_interface.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
net/xfrm/xfrm_interface.c +2 -17
@@ -319,12 +319,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) err =dst_output (xi->net, skb->sk, skb);if (net_xmit_eval (err) ==0 ) { -struct pcpu_sw_netstats *tstats =this_cpu_ptr (dev->tstats); - -u64_stats_update_begin (&tstats->syncp); - tstats->tx_bytes += length; - tstats->tx_packets++; -u64_stats_update_end (&tstats->syncp); +dev_sw_netstats_tx_add (dev,1 , length); }else { stats->tx_errors++; stats->tx_aborted_errors++;
@@ -538,15 +533,6 @@ static int xfrmi_update(struct xfrm_if *xi, struct xfrm_if_parms *p)return err; } -static void xfrmi_get_stats64 (struct net_device *dev, -struct rtnl_link_stats64 *s) -{ -dev_fetch_sw_netstats (s, dev->tstats); - - s->rx_dropped = dev->stats.rx_dropped; - s->tx_dropped = dev->stats.tx_dropped; -} -static int xfrmi_get_iflink (const struct net_device *dev) {struct xfrm_if *xi =netdev_priv (dev);
@@ -554,12 +540,11 @@ static int xfrmi_get_iflink(const struct net_device *dev)return xi->p.link; } -static const struct net_device_ops xfrmi_netdev_ops = { .ndo_init = xfrmi_dev_init, .ndo_uninit = xfrmi_dev_uninit, .ndo_start_xmit = xfrmi_xmit, - .ndo_get_stats64 = xfrmi_get_stats64, + .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = xfrmi_get_iflink, };
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerRe: [PATCH v3] net: xfrm: use core API for updating/providing stats
Quoted 11 lines · On Fri, 13 Nov 2020 23:59:40 +0200 Lev Stipakov wrote:
Commit
d3fd65484c781("net: core: adddev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats.Use this function instead of own code.
While on it, remove
xfrmi_get_stats64()and replace it withdev_get_tstats64().Signed-off-by Lev Stipakov <[email protected]>Reviewed-by Heiner Kallweit <[email protected]>
Since this is a follow up to Heiner's work I'll apply directly as well.
Thanks!