From: Heiner Kallweit <hkallweit1@gmail.com>
To: "David Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>, "Bjørn Mork" <bjorn@mork.no>,
"Oliver Neukum" <oneukum@suse.com>,
"Igor Mitsyanko" <imitsyanko@quantenna.com>,
"Sergey Matyukevich" <geomatsi@gmail.com>,
"Kalle Valo" <kvalo@codeaurora.org>,
"Roopa Prabhu" <roopa@nvidia.com>,
"Nikolay Aleksandrov" <nikolay@nvidia.com>,
"Andrew Lunn" <andrew@lunn.ch>,
"Vivien Didelot" <vivien.didelot@gmail.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Vladimir Oltean" <olteanv@gmail.com>,
"Alexey Kuznetsov" <kuznet@ms2.inr.ac.ru>,
"Hideaki YOSHIFUJI" <yoshfuji@linux-ipv6.org>,
"Johannes Berg" <johannes@sipsolutions.net>,
"Pravin B Shelar" <pshelar@ovn.org>,
"Steffen Klassert" <steffen.klassert@secunet.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
linux-rdma@vger.kernel.org,
Linux USB Mailing List <linux-usb@vger.kernel.org>,
linux-wireless <linux-wireless@vger.kernel.org>,
bridge@lists.linux-foundation.org
Subject: [PATCH net-next 01/12] net: core: add function dev_fetch_sw_netstats for fetching pcpu_sw_netstats
Date: Sun, 11 Oct 2020 21:36:43 +0200 [thread overview]
Message-ID: <5bb71143-0dac-c413-7e97-50eed8a57862@gmail.com> (raw)
In-Reply-To: <a46f539e-a54d-7e92-0372-cd96bb280729@gmail.com>
In several places the same code is used to populate rtnl_link_stats64
fields with data from pcpu_sw_netstats. Therefore factor out this code
to a new function dev_fetch_sw_netstats().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
include/linux/netdevice.h | 2 ++
net/core/dev.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a0df43b13..ca4736349 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4495,6 +4495,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
struct rtnl_link_stats64 *storage);
void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
const struct net_device_stats *netdev_stats);
+void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,
+ struct pcpu_sw_netstats __percpu *netstats);
extern int netdev_max_backlog;
extern int netdev_tstamp_prequeue;
diff --git a/net/core/dev.c b/net/core/dev.c
index 7d18560b2..ba91bf16b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10323,6 +10323,42 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
}
EXPORT_SYMBOL(dev_get_stats);
+/**
+ * dev_fetch_sw_netstats - get per-cpu network device statistics
+ * @s: place to store stats
+ * @netstats: per-cpu network stats to read from
+ *
+ * Read per-cpu network statistics and populate the related fields in s.
+ */
+void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,
+ struct pcpu_sw_netstats __percpu *netstats)
+{
+ int cpu;
+
+ if (IS_ERR_OR_NULL(netstats))
+ return;
+
+ for_each_possible_cpu(cpu) {
+ struct pcpu_sw_netstats *stats, tmp;
+ unsigned int start;
+
+ stats = per_cpu_ptr(netstats, cpu);
+ do {
+ start = u64_stats_fetch_begin_irq(&stats->syncp);
+ tmp.rx_packets = stats->rx_packets;
+ tmp.rx_bytes = stats->rx_bytes;
+ tmp.tx_packets = stats->tx_packets;
+ tmp.tx_bytes = stats->tx_bytes;
+ } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+
+ s->rx_packets += tmp.rx_packets;
+ s->rx_bytes += tmp.rx_bytes;
+ s->tx_packets += tmp.tx_packets;
+ s->tx_bytes += tmp.tx_bytes;
+ }
+}
+EXPORT_SYMBOL(dev_fetch_sw_netstats);
+
struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
{
struct netdev_queue *queue = dev_ingress_queue(dev);
--
2.28.0
next prev parent reply other threads:[~2020-10-11 19:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-11 19:34 [PATCH net-next 00/12] net: add and use function dev_fetch_sw_netstats for fetching pcpu_sw_netstats Heiner Kallweit
2020-10-11 19:36 ` Heiner Kallweit [this message]
2020-10-11 19:54 ` [PATCH net-next 01/12] net: core: add " Stephen Hemminger
2020-10-11 20:18 ` Heiner Kallweit
2020-10-11 22:07 ` Jakub Kicinski
2020-10-11 19:37 ` [PATCH net-next 02/12] IB/hfi1: use new function dev_fetch_sw_netstats Heiner Kallweit
2020-10-11 19:38 ` [PATCH net-next 03/12] net: macsec: " Heiner Kallweit
2020-10-11 19:38 ` [PATCH net-next 04/12] net: usb: qmi_wwan: " Heiner Kallweit
2020-10-12 6:47 ` Bjørn Mork
2020-10-11 19:39 ` [PATCH net-next 05/12] net: usbnet: " Heiner Kallweit
2020-10-11 19:40 ` [PATCH net-next 06/12] qtnfmac: " Heiner Kallweit
2020-10-12 7:10 ` Kalle Valo
2020-10-11 19:40 ` [PATCH net-next 07/12] net: bridge: " Heiner Kallweit
2020-10-11 19:41 ` [PATCH net-next 08/12] net: dsa: " Heiner Kallweit
2020-10-11 20:15 ` Vladimir Oltean
2020-10-12 1:49 ` Florian Fainelli
2020-10-11 19:42 ` [PATCH net-next 09/12] iptunnel: " Heiner Kallweit
2020-10-11 19:42 ` [PATCH net-next 10/12] mac80211: " Heiner Kallweit
2020-10-11 19:43 ` [PATCH net-next 11/12] net: openvswitch: " Heiner Kallweit
2020-10-11 19:44 ` [PATCH net-next 12/12] xfrm: " Heiner Kallweit
2020-10-11 22:10 ` [PATCH net-next 00/12] net: add and use function dev_fetch_sw_netstats for fetching pcpu_sw_netstats Jakub Kicinski
2020-10-11 22:29 ` Heiner Kallweit
2020-10-11 22:41 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5bb71143-0dac-c413-7e97-50eed8a57862@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=bjorn@mork.no \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=geomatsi@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=imitsyanko@quantenna.com \
--cc=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=kvalo@codeaurora.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=olteanv@gmail.com \
--cc=oneukum@suse.com \
--cc=pshelar@ovn.org \
--cc=roopa@nvidia.com \
--cc=steffen.klassert@secunet.com \
--cc=vivien.didelot@gmail.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).