From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH net-next 2/9] net: provide dev_lstats_add() helper
Date: Thu, 7 Nov 2019 16:27:15 -0800 [thread overview]
Message-ID: <20191108002722.129055-3-edumazet@google.com> (raw)
In-Reply-To: <20191108002722.129055-1-edumazet@google.com>
Many network drivers need it and hand-coded the same function.
In order to ease u64_stats_t adoption, it is time to factorize.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
drivers/net/loopback.c | 12 ++----------
include/linux/netdevice.h | 10 ++++++++++
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 92336ac4c5e68f63b814d6a70e7361b8954a91cf..47ad2478b9f350f8bf3b103bd2a9a956379c75fa 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -68,7 +68,6 @@ EXPORT_SYMBOL(blackhole_netdev);
static netdev_tx_t loopback_xmit(struct sk_buff *skb,
struct net_device *dev)
{
- struct pcpu_lstats *lb_stats;
int len;
skb_tx_timestamp(skb);
@@ -85,16 +84,9 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
skb->protocol = eth_type_trans(skb, dev);
- /* it's OK to use per_cpu_ptr() because BHs are off */
- lb_stats = this_cpu_ptr(dev->lstats);
-
len = skb->len;
- if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {
- u64_stats_update_begin(&lb_stats->syncp);
- lb_stats->bytes += len;
- lb_stats->packets++;
- u64_stats_update_end(&lb_stats->syncp);
- }
+ if (likely(netif_rx(skb) == NET_RX_SUCCESS))
+ dev_lstats_add(dev, len);
return NETDEV_TX_OK;
}
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 75561992c31f7c32f5a50e3879bafb5a54bc5fa3..461a36220cf46d62114efac0c4fb2b7b9a2ee386 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2403,6 +2403,16 @@ struct pcpu_lstats {
void dev_lstats_read(struct net_device *dev, u64 *packets, u64 *bytes);
+static inline void dev_lstats_add(struct net_device *dev, unsigned int len)
+{
+ struct pcpu_lstats *lstats = this_cpu_ptr(dev->lstats);
+
+ u64_stats_update_begin(&lstats->syncp);
+ lstats->bytes += len;
+ lstats->packets++;
+ u64_stats_update_end(&lstats->syncp);
+}
+
#define __netdev_alloc_pcpu_stats(type, gfp) \
({ \
typeof(type) __percpu *pcpu_stats = alloc_percpu_gfp(type, gfp);\
--
2.24.0.432.g9d3f5f5b63-goog
next prev parent reply other threads:[~2019-11-08 0:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 0:27 [PATCH net-next 0/9] net: introduce u64_stats_t Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 1/9] net: provide dev_lstats_read() helper Eric Dumazet
2019-11-08 0:27 ` Eric Dumazet [this message]
2019-11-08 0:27 ` [PATCH net-next 3/9] net: nlmon: use standard dev_lstats_add() and dev_lstats_read() Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 4/9] veth: " Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 5/9] vsockmon: " Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 6/9] net: dummy: " Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 7/9] u64_stats: provide u64_stats_t type Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 8/9] tun: switch to u64_stats_t Eric Dumazet
2019-11-08 0:27 ` [PATCH net-next 9/9] net: use u64_stats_t in struct pcpu_lstats Eric Dumazet
2019-11-08 4:04 ` [PATCH net-next 0/9] net: introduce u64_stats_t David Miller
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=20191108002722.129055-3-edumazet@google.com \
--to=edumazet@google.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.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).