mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: dsa: Add support for 64-bit statistics

Browse source 
DSA slave network devices maintain a pair of bytes and packets counters
for each directions, but these are not 64-bit capable. Re-use
pcpu_sw_netstats which contains exactly what we need for that purpose
and update the code path to report 64-bit capable statistics.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-08-01 15:00:36 -07:00 committed by David S. Miller
parent b2f9d432de
commit f613ed665b
3 changed files with 38 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
net/dsa/dsa.c
View file

@ -190,6 +190,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct sk_buff *nskb = NULL; struct sk_buff *nskb = NULL;
struct dsa_slave_priv *p;
if (unlikely(dst == NULL)) { if (unlikely(dst == NULL)) {
kfree_skb(skb); kfree_skb(skb);
@ -207,12 +208,15 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
} }
skb = nskb; skb = nskb;
p = netdev_priv(skb->dev);
skb_push(skb, ETH_HLEN); skb_push(skb, ETH_HLEN);
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, skb->dev); skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->stats.rx_packets++; u64_stats_update_begin(&p->stats64.syncp);
skb->dev->stats.rx_bytes += skb->len; p->stats64.rx_packets++;
p->stats64.rx_bytes += skb->len;
u64_stats_update_end(&p->stats64.syncp);
netif_receive_skb(skb); netif_receive_skb(skb);

2
net/dsa/dsa_priv.h
View file

@ -77,6 +77,8 @@ struct dsa_slave_priv {
struct sk_buff * (*xmit)(struct sk_buff *skb, struct sk_buff * (*xmit)(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
struct pcpu_sw_netstats stats64;
/* DSA port data, such as switch, port index, etc. */ /* DSA port data, such as switch, port index, etc. */
struct dsa_port *dp; struct dsa_port *dp;

36
net/dsa/slave.c
View file

@ -354,8 +354,10 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev)
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct sk_buff *nskb; struct sk_buff *nskb;
dev->stats.tx_packets++; u64_stats_update_begin(&p->stats64.syncp);
dev->stats.tx_bytes += skb->len; p->stats64.tx_packets++;
p->stats64.tx_bytes += skb->len;
u64_stats_update_end(&p->stats64.syncp);
/* Transmit function may have to reallocate the original SKB, /* Transmit function may have to reallocate the original SKB,
* in which case it must have freed it. Only free it here on error. * in which case it must have freed it. Only free it here on error.
@ -594,11 +596,15 @@ static void dsa_slave_get_ethtool_stats(struct net_device *dev,
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->dp->ds; struct dsa_switch *ds = p->dp->ds;
unsigned int start;
data[0] = dev->stats.tx_packets; do {
data[1] = dev->stats.tx_bytes; start = u64_stats_fetch_begin_irq(&p->stats64.syncp);
data[2] = dev->stats.rx_packets; data[0] = p->stats64.tx_packets;
data[3] = dev->stats.rx_bytes; data[1] = p->stats64.tx_bytes;
data[2] = p->stats64.rx_packets;
data[3] = p->stats64.rx_bytes;
} while (u64_stats_fetch_retry_irq(&p->stats64.syncp, start));
if (ds->ops->get_ethtool_stats) if (ds->ops->get_ethtool_stats)
ds->ops->get_ethtool_stats(ds, p->dp->index, data + 4); ds->ops->get_ethtool_stats(ds, p->dp->index, data + 4);
} }
@ -869,6 +875,22 @@ static int dsa_slave_setup_tc(struct net_device *dev, u32 handle,
} }
} }
static void dsa_slave_get_stats64(struct net_device *dev,
struct rtnl_link_stats64 *stats)
{
struct dsa_slave_priv *p = netdev_priv(dev);
unsigned int start;
netdev_stats_to_stats64(stats, &dev->stats);
do {
start = u64_stats_fetch_begin_irq(&p->stats64.syncp);
stats->tx_packets = p->stats64.tx_packets;
stats->tx_bytes = p->stats64.tx_bytes;
stats->rx_packets = p->stats64.rx_packets;
stats->rx_bytes = p->stats64.rx_bytes;
} while (u64_stats_fetch_retry_irq(&p->stats64.syncp, start));
}
void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops) void dsa_cpu_port_ethtool_init(struct ethtool_ops *ops)
{ {
ops->get_sset_count = dsa_cpu_port_get_sset_count; ops->get_sset_count = dsa_cpu_port_get_sset_count;
@ -944,6 +966,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
.ndo_bridge_dellink = switchdev_port_bridge_dellink, .ndo_bridge_dellink = switchdev_port_bridge_dellink,
.ndo_get_phys_port_name = dsa_slave_get_phys_port_name, .ndo_get_phys_port_name = dsa_slave_get_phys_port_name,
.ndo_setup_tc = dsa_slave_setup_tc, .ndo_setup_tc = dsa_slave_setup_tc,
.ndo_get_stats64 = dsa_slave_get_stats64,
}; };
static const struct switchdev_ops dsa_slave_switchdev_ops = { static const struct switchdev_ops dsa_slave_switchdev_ops = {
@ -1179,6 +1202,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
slave_dev->vlan_features = master->vlan_features; slave_dev->vlan_features = master->vlan_features;
p = netdev_priv(slave_dev); p = netdev_priv(slave_dev);
u64_stats_init(&p->stats64.syncp);
p->dp = &ds->ports[port]; p->dp = &ds->ports[port];
INIT_LIST_HEAD(&p->mall_tc_list); INIT_LIST_HEAD(&p->mall_tc_list);
p->xmit = dst->tag_ops->xmit; p->xmit = dst->tag_ops->xmit;