Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bonding: count master 3ad stats separately

Browse Source 
I made a dumb mistake when I summed up the slave stats, obviously slaves
can come and go which would make the master stats unreliable.
Count and export the master stats separately.

Fixes: a258aeacd7 ("bonding: add support for xstats and export 3ad stats")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2019-01-23 19:14:50 +02:00 committed by David S. Miller
parent 2ab64da68c
commit 949e7cea0c
3 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/bonding/bond_3ad.c
View File

@ -853,6 +853,7 @@ static int ad_lacpdu_send(struct port *port)
return -ENOMEM; return -ENOMEM;
atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_tx); atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_tx);
atomic64_inc(&BOND_AD_INFO(slave->bond).stats.lacpdu_tx);
skb->dev = slave->dev; skb->dev = slave->dev;
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
@ -898,9 +899,11 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)
switch (marker->tlv_type) { switch (marker->tlv_type) {
case AD_MARKER_INFORMATION_SUBTYPE: case AD_MARKER_INFORMATION_SUBTYPE:
atomic64_inc(&SLAVE_AD_INFO(slave)->stats.marker_tx); atomic64_inc(&SLAVE_AD_INFO(slave)->stats.marker_tx);
atomic64_inc(&BOND_AD_INFO(slave->bond).stats.marker_tx);
break; break;
case AD_MARKER_RESPONSE_SUBTYPE: case AD_MARKER_RESPONSE_SUBTYPE:
atomic64_inc(&SLAVE_AD_INFO(slave)->stats.marker_resp_tx); atomic64_inc(&SLAVE_AD_INFO(slave)->stats.marker_resp_tx);
atomic64_inc(&BOND_AD_INFO(slave->bond).stats.marker_resp_tx);
break; break;
} }
@ -1098,9 +1101,10 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
*/ */
last_state = port->sm_rx_state; last_state = port->sm_rx_state;
if (lacpdu) if (lacpdu) {
atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.lacpdu_rx); atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.lacpdu_rx);
atomic64_inc(&BOND_AD_INFO(port->slave->bond).stats.lacpdu_rx);
}
/* check if state machine should change state */ /* check if state machine should change state */
/* first, check if port was reinitialized */ /* first, check if port was reinitialized */
@ -1938,6 +1942,7 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
struct bond_marker marker; struct bond_marker marker;
atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.marker_rx); atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.marker_rx);
atomic64_inc(&BOND_AD_INFO(port->slave->bond).stats.marker_rx);
/* copy the received marker data to the response marker */ /* copy the received marker data to the response marker */
memcpy(&marker, marker_info, sizeof(struct bond_marker)); memcpy(&marker, marker_info, sizeof(struct bond_marker));
@ -1964,6 +1969,7 @@ static void ad_marker_response_received(struct bond_marker *marker,
struct port *port) struct port *port)
{ {
atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.marker_resp_rx); atomic64_inc(&SLAVE_AD_INFO(port->slave)->stats.marker_resp_rx);
atomic64_inc(&BOND_AD_INFO(port->slave->bond).stats.marker_resp_rx);
/* DO NOTHING, SINCE WE DECIDED NOT TO IMPLEMENT THIS FEATURE FOR NOW */ /* DO NOTHING, SINCE WE DECIDED NOT TO IMPLEMENT THIS FEATURE FOR NOW */
} }
@ -2374,6 +2380,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
*/ */
static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave) static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave)
{ {
struct bonding *bond = slave->bond;
int ret = RX_HANDLER_ANOTHER; int ret = RX_HANDLER_ANOTHER;
struct bond_marker *marker; struct bond_marker *marker;
struct port *port; struct port *port;
@ -2419,10 +2426,13 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave)
port->actor_port_number); port->actor_port_number);
stat = &SLAVE_AD_INFO(slave)->stats.marker_unknown_rx; stat = &SLAVE_AD_INFO(slave)->stats.marker_unknown_rx;
atomic64_inc(stat); atomic64_inc(stat);
stat = &BOND_AD_INFO(bond).stats.marker_unknown_rx;
atomic64_inc(stat);
} }
break; break;
default: default:
atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_unknown_rx); atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_unknown_rx);
atomic64_inc(&BOND_AD_INFO(bond).stats.lacpdu_unknown_rx);
} }
return ret; return ret;
@ -2662,6 +2672,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
lacpdu = skb_header_pointer(skb, 0, sizeof(_lacpdu), &_lacpdu); lacpdu = skb_header_pointer(skb, 0, sizeof(_lacpdu), &_lacpdu);
if (!lacpdu) { if (!lacpdu) {
atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_illegal_rx); atomic64_inc(&SLAVE_AD_INFO(slave)->stats.lacpdu_illegal_rx);
atomic64_inc(&BOND_AD_INFO(bond).stats.lacpdu_illegal_rx);
return RX_HANDLER_ANOTHER; return RX_HANDLER_ANOTHER;
} }
@ -2698,30 +2709,6 @@ void bond_3ad_update_lacp_rate(struct bonding *bond)
spin_unlock_bh(&bond->mode_lock); spin_unlock_bh(&bond->mode_lock);
} }
void bond_3ad_stats_add(struct slave *slave, struct bond_3ad_stats *stats)
{
struct bond_3ad_stats *rstats = &SLAVE_AD_INFO(slave)->stats;
u64 stat;
atomic64_add(atomic64_read(&rstats->lacpdu_rx), &stats->lacpdu_rx);
atomic64_add(atomic64_read(&rstats->lacpdu_tx), &stats->lacpdu_tx);
stat = atomic64_read(&rstats->lacpdu_unknown_rx);
atomic64_add(stat, &stats->lacpdu_unknown_rx);
stat = atomic64_read(&rstats->lacpdu_illegal_rx);
atomic64_add(stat, &stats->lacpdu_illegal_rx);
atomic64_add(atomic64_read(&rstats->marker_rx), &stats->marker_rx);
atomic64_add(atomic64_read(&rstats->marker_tx), &stats->marker_tx);
stat = atomic64_read(&rstats->marker_resp_rx);
atomic64_add(stat, &stats->marker_resp_rx);
stat = atomic64_read(&rstats->marker_resp_tx);
atomic64_add(stat, &stats->marker_resp_tx);
stat = atomic64_read(&rstats->marker_unknown_rx);
atomic64_add(stat, &stats->marker_unknown_rx);
}
size_t bond_3ad_stats_size(void) size_t bond_3ad_stats_size(void)
{ {
return nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_RX */ return nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_RX */

16
drivers/net/bonding/bond_netlink.c
View File

@ -715,16 +715,12 @@ static int bond_fill_linkxstats(struct sk_buff *skb,
if (!nest) if (!nest)
return -EMSGSIZE; return -EMSGSIZE;
if (BOND_MODE(bond) == BOND_MODE_8023AD) { if (BOND_MODE(bond) == BOND_MODE_8023AD) {
struct bond_3ad_stats stats; struct bond_3ad_stats *stats;
struct list_head *iter;
memset(&stats, 0, sizeof(stats)); if (slave)
if (slave) { stats = &SLAVE_AD_INFO(slave)->stats;
bond_3ad_stats_add(slave, &stats); else
} else { stats = &BOND_AD_INFO(bond).stats;
bond_for_each_slave(bond, slave, iter)
bond_3ad_stats_add(slave, &stats);
}
nest2 = nla_nest_start(skb, BOND_XSTATS_3AD); nest2 = nla_nest_start(skb, BOND_XSTATS_3AD);
if (!nest2) { if (!nest2) {
@ -732,7 +728,7 @@ static int bond_fill_linkxstats(struct sk_buff *skb,
return -EMSGSIZE; return -EMSGSIZE;
} }
if (bond_3ad_stats_fill(skb, &stats)) { if (bond_3ad_stats_fill(skb, stats)) {
nla_nest_cancel(skb, nest2); nla_nest_cancel(skb, nest2);
nla_nest_end(skb, nest); nla_nest_end(skb, nest);
return -EMSGSIZE; return -EMSGSIZE;

2
include/net/bond_3ad.h
View File

@ -278,6 +278,7 @@ struct ad_system {
struct ad_bond_info { struct ad_bond_info {
struct ad_system system; /* 802.3ad system structure */ struct ad_system system; /* 802.3ad system structure */
struct bond_3ad_stats stats;
u32 agg_select_timer; /* Timer to select aggregator after all adapter's hand shakes */ u32 agg_select_timer; /* Timer to select aggregator after all adapter's hand shakes */
u16 aggregator_identifier; u16 aggregator_identifier;
}; };
@ -321,7 +322,6 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
int bond_3ad_set_carrier(struct bonding *bond); int bond_3ad_set_carrier(struct bonding *bond);
void bond_3ad_update_lacp_rate(struct bonding *bond); void bond_3ad_update_lacp_rate(struct bonding *bond);
void bond_3ad_update_ad_actor_settings(struct bonding *bond); void bond_3ad_update_ad_actor_settings(struct bonding *bond);
void bond_3ad_stats_add(struct slave *slave, struct bond_3ad_stats *stats);
int bond_3ad_stats_fill(struct sk_buff *skb, struct bond_3ad_stats *stats); int bond_3ad_stats_fill(struct sk_buff *skb, struct bond_3ad_stats *stats);
size_t bond_3ad_stats_size(void); size_t bond_3ad_stats_size(void);
#endif /* _NET_BOND_3AD_H */ #endif /* _NET_BOND_3AD_H */