From: Jarod Wilson <jarod@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jarod Wilson <jarod@redhat.com>, Jiri Pirko <jiri@resnulli.us>,
netdev@vger.kernel.org
Subject: [PATCH net v3 3/4] team: track sum of rx_nohandler for all slaves
Date: Mon, 1 Feb 2016 18:51:06 -0500 [thread overview]
Message-ID: <1454370667-2328-4-git-send-email-jarod@redhat.com> (raw)
In-Reply-To: <1454370667-2328-1-git-send-email-jarod@redhat.com>
CC: Jiri Pirko <jiri@resnulli.us>
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
drivers/net/team/team.c | 10 +++++++---
include/linux/if_team.h | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 718ceea..00558e1 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -758,6 +758,8 @@ static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
u64_stats_update_end(&pcpu_stats->syncp);
skb->dev = team->dev;
+ } else if (res == RX_HANDLER_EXACT) {
+ this_cpu_inc(team->pcpu_stats->rx_nohandler);
} else {
this_cpu_inc(team->pcpu_stats->rx_dropped);
}
@@ -1807,7 +1809,7 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
struct team *team = netdev_priv(dev);
struct team_pcpu_stats *p;
u64 rx_packets, rx_bytes, rx_multicast, tx_packets, tx_bytes;
- u32 rx_dropped = 0, tx_dropped = 0;
+ u32 rx_dropped = 0, tx_dropped = 0, rx_nohandler = 0;
unsigned int start;
int i;
@@ -1828,14 +1830,16 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
stats->tx_packets += tx_packets;
stats->tx_bytes += tx_bytes;
/*
- * rx_dropped & tx_dropped are u32, updated
- * without syncp protection.
+ * rx_dropped, tx_dropped & rx_nohandler are u32,
+ * updated without syncp protection.
*/
rx_dropped += p->rx_dropped;
tx_dropped += p->tx_dropped;
+ rx_nohandler += p->rx_nohandler;
}
stats->rx_dropped = rx_dropped;
stats->tx_dropped = tx_dropped;
+ stats->rx_nohandler = rx_nohandler;
return stats;
}
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index b84e49c..174f43f 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -24,6 +24,7 @@ struct team_pcpu_stats {
struct u64_stats_sync syncp;
u32 rx_dropped;
u32 tx_dropped;
+ u32 rx_nohandler;
};
struct team;
--
1.8.3.1
next prev parent reply other threads:[~2016-02-01 23:52 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 19:11 [RFC PATCH net] net/core: don't increment rx_dropped on inactive slaves Jarod Wilson
2016-01-22 20:59 ` Jay Vosburgh
2016-01-23 8:26 ` Jiri Pirko
2016-01-23 8:07 ` Jiri Pirko
2016-01-23 14:19 ` Andy Gospodarek
2016-01-23 15:23 ` Eric Dumazet
2016-01-26 21:14 ` Jarod Wilson
2016-01-26 21:21 ` David Miller
2016-01-26 21:36 ` Jarod Wilson
2016-01-26 21:24 ` Eric Dumazet
2016-01-26 21:35 ` Jarod Wilson
2016-01-25 6:42 ` David Miller
2016-01-25 14:27 ` Jarod Wilson
2016-01-26 4:45 ` Jarod Wilson
2016-01-27 20:21 ` [PATCH net 0/4] net: add rx_unhandled stat counter Jarod Wilson
2016-01-27 20:21 ` [PATCH net 1/4] " Jarod Wilson
2016-01-27 20:21 ` [PATCH net 2/4] net-procfs: show rx_unhandled counters Jarod Wilson
2016-01-27 20:21 ` [PATCH net 3/4] team: track sum of rx_unhandled for all slaves Jarod Wilson
2016-01-27 20:21 ` [PATCH net 4/4] bond: " Jarod Wilson
2016-01-27 21:09 ` [PATCH net 0/4] net: add rx_unhandled stat counter Eric Dumazet
2016-01-28 6:02 ` Jarod Wilson
2016-01-28 6:10 ` Jarod Wilson
2016-01-28 6:18 ` Jarod Wilson
2016-01-28 13:00 ` Eric Dumazet
2016-01-28 14:38 ` Jarod Wilson
2016-01-28 14:42 ` Eric Dumazet
2016-01-28 14:44 ` Eric Dumazet
2016-01-28 14:46 ` Eric Dumazet
2016-01-28 15:11 ` Jarod Wilson
2016-01-28 13:00 ` Eric Dumazet
2016-01-28 15:49 ` [PATCH net v2 0/4] net: add and use rx_nohandler " Jarod Wilson
2016-01-28 15:49 ` [PATCH net v2 1/4] net/core: relax BUILD_BUG_ON in netdev_stats_to_stats64 Jarod Wilson
2016-01-28 15:49 ` [PATCH net v2 2/4] net: add rx_nohandler stat counter Jarod Wilson
2016-01-28 15:49 ` [PATCH net v2 3/4] team: track sum of rx_nohandler for all slaves Jarod Wilson
2016-01-28 15:49 ` [PATCH net v2 4/4] bond: " Jarod Wilson
2016-01-30 3:37 ` [PATCH net v2 0/4] net: add and use rx_nohandler stat counter David Miller
2016-01-30 18:16 ` Jarod Wilson
2016-01-30 18:19 ` [PATCH net v2 1/4] net/core: relax BUILD_BUG_ON in netdev_stats_to_stats64 Jarod Wilson
2016-01-30 18:34 ` Eric Dumazet
2016-01-30 20:39 ` Jarod Wilson
2016-01-30 20:53 ` Jarod Wilson
2016-01-30 23:26 ` David Miller
2016-01-31 18:07 ` Jarod Wilson
2016-02-01 23:51 ` [PATCH net v3 0/4] net: add and use rx_nohandler stat counter Jarod Wilson
2016-02-01 23:51 ` [PATCH net v3 1/4] net/core: relax BUILD_BUG_ON in netdev_stats_to_stats64 Jarod Wilson
2016-02-01 23:51 ` [PATCH net v3 2/4] net: add rx_nohandler stat counter Jarod Wilson
2016-02-07 19:37 ` Stephen Hemminger
2016-02-07 19:46 ` David Miller
2016-02-07 20:19 ` Eric Dumazet
2016-02-08 18:32 ` Jarod Wilson
2016-02-08 19:38 ` Stephen Hemminger
2016-02-08 22:57 ` Eric Dumazet
2016-02-09 8:40 ` David Miller
2016-02-09 10:56 ` Jamal Hadi Salim
2016-02-09 19:17 ` [PATCH net-next iproute2] iplink: display rx nohandler stats Stephen Hemminger
2016-02-09 23:51 ` Jarod Wilson
2016-02-10 1:41 ` Stephen Hemminger
2016-02-10 4:52 ` Eric Dumazet
2016-02-10 13:20 ` Jarod Wilson
2016-02-10 15:06 ` Andy Gospodarek
2016-02-01 23:51 ` Jarod Wilson [this message]
2016-02-01 23:51 ` [PATCH net v3 4/4] bond: track sum of rx_nohandler for all slaves Jarod Wilson
2016-02-06 8:00 ` [PATCH net v3 0/4] net: add and use rx_nohandler stat counter David Miller
2016-01-28 16:22 ` [PATCH net v3 1/4] net/core: relax BUILD_BUG_ON in netdev_stats_to_stats64 Jarod Wilson
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=1454370667-2328-4-git-send-email-jarod@redhat.com \
--to=jarod@redhat.com \
--cc=jiri@resnulli.us \
--cc=linux-kernel@vger.kernel.org \
--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).