netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] bond: add support to read speed and duplex via ethtool
@ 2013-03-06 18:39 Andy Gospodarek
  2013-03-06 19:13 ` Veaceslav Falico
                   ` (3 more replies)
  0 siblings, 4 replies; 14+ messages in thread
From: Andy Gospodarek @ 2013-03-06 18:39 UTC (permalink / raw)
  To: netdev

This patch adds support for the get_settings ethtool op to the bonding
driver.  This was motivated by users who wanted to get the speed of the
bond and compare that against throughput to understand utilization.
The behavior before this patch was added was problematic when computing
line utilization after trying to get link-speed and throughput via SNMP.

The general plan for computing link-speed was as follows:

Mode                 Formula
----                 -------
active-backup        speed of current active slave
broadcast            speed of first slave with known speed
all other modes      aggregate speed of all slaves with known speed

Output from ethtool looks like this for a round-robin bond:

Settings for bond0:
	Supported ports: [ ]
	Supported link modes:   Not reported
	Supported pause frame use: No
	Supports auto-negotiation: No
	Advertised link modes:  Not reported
	Advertised pause frame use: No
	Advertised auto-negotiation: No
	Speed: 11000Mb/s
	Duplex: Full
	Port: Twisted Pair
	PHYAD: 0
	Transceiver: internal
	Auto-negotiation: off
	MDI-X: Unknown
	Link detected: yes

I tested this and verified it works as expected.  A test was also done
on a version backported to an older kernel and it worked well there.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
---
 drivers/net/bonding/bond_main.c | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 7bd068a..6e70ff0 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4224,6 +4224,52 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
 	}
 }
 
+static int bond_ethtool_get_settings(struct net_device *bond_dev,
+				     struct ethtool_cmd *ecmd)
+{
+	struct bonding *bond = netdev_priv(bond_dev);
+	struct slave *slave;
+	int i;
+	unsigned long speed = 0;
+
+	ecmd->speed = SPEED_UNKNOWN;
+	ecmd->duplex = DUPLEX_UNKNOWN;
+
+	read_lock(&bond->lock);
+	switch (bond->params.mode) {
+	case BOND_MODE_ACTIVEBACKUP:
+		read_lock(&bond->curr_slave_lock);
+		if (bond->curr_active_slave &&
+		    bond->curr_active_slave->speed != SPEED_UNKNOWN) {
+			ecmd->speed = bond->curr_active_slave->speed;
+			ecmd->duplex = bond->curr_active_slave->duplex;
+		}
+		read_unlock(&bond->curr_slave_lock);
+		break;
+	case BOND_MODE_BROADCAST:
+		bond_for_each_slave(bond, slave, i) {
+			if (slave->speed != SPEED_UNKNOWN) {
+				ecmd->speed = slave->speed;
+				ecmd->duplex = slave->duplex;
+				break;
+			}
+		}
+		break;
+	default:
+		bond_for_each_slave(bond, slave, i) {
+			if (slave->speed != SPEED_UNKNOWN) {
+				speed += slave->speed;
+			}
+			if (ecmd->duplex == DUPLEX_UNKNOWN &&
+			    slave->duplex != DUPLEX_UNKNOWN)
+				ecmd->duplex = slave->duplex;
+		}
+		ecmd->speed = speed;
+	}
+	read_unlock(&bond->lock);
+	return 0;
+}
+
 static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
 				     struct ethtool_drvinfo *drvinfo)
 {
@@ -4235,6 +4281,7 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
 
 static const struct ethtool_ops bond_ethtool_ops = {
 	.get_drvinfo		= bond_ethtool_get_drvinfo,
+	.get_settings		= bond_ethtool_get_settings,
 	.get_link		= ethtool_op_get_link,
 };
 
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2013-04-16 22:33 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-06 18:39 [PATCH net-next] bond: add support to read speed and duplex via ethtool Andy Gospodarek
2013-03-06 19:13 ` Veaceslav Falico
2013-03-06 19:48   ` Andy Gospodarek
2013-03-06 19:25 ` Jay Vosburgh
2013-03-06 20:01   ` Andy Gospodarek
2013-03-06 21:46     ` Jay Vosburgh
2013-03-07 12:11       ` Glen Turner
2013-03-08 15:35         ` Andy Gospodarek
2013-03-14  6:57           ` Glen Turner
2013-03-06 20:17 ` Ben Hutchings
2013-03-08 14:57   ` Andy Gospodarek
2013-04-16 21:10 ` [PATCH v2] " Andy Gospodarek
2013-04-16 21:32   ` Ben Hutchings
2013-04-16 22:33   ` Sergei Shtylyov

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).