2017-03-14 15:49:49

by Jarod Wilson

Subject: [PATCH net-next] bonding: add 802.3ad support for 25G speeds

Cut-n-paste enablement of 802.3ad bonding on 25G NICs, which currently
report 0 as their bandwidth.

CC: Jay Vosburgh <[email protected]>
CC: Veaceslav Falico <[email protected]>
CC: Andy Gospodarek <[email protected]>
CC: [email protected]
Signed-off-by: Jarod Wilson <[email protected]>
---
note: I swear I saw a patch for this already, but I don't see it on the
list and it isn't committed, so here's this...

drivers/net/bonding/bond_3ad.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 431926bba9f4..508713b4e533 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -92,6 +92,7 @@ enum ad_link_speed_type {
AD_LINK_SPEED_2500MBPS,
AD_LINK_SPEED_10000MBPS,
AD_LINK_SPEED_20000MBPS,
+ AD_LINK_SPEED_25000MBPS,
AD_LINK_SPEED_40000MBPS,
AD_LINK_SPEED_56000MBPS,
AD_LINK_SPEED_100000MBPS,
@@ -260,6 +261,7 @@ static inline int __check_agg_selection_timer(struct port *port)
* %AD_LINK_SPEED_2500MBPS,
* %AD_LINK_SPEED_10000MBPS
* %AD_LINK_SPEED_20000MBPS
+ * %AD_LINK_SPEED_25000MBPS
* %AD_LINK_SPEED_40000MBPS
* %AD_LINK_SPEED_56000MBPS
* %AD_LINK_SPEED_100000MBPS
@@ -302,6 +304,10 @@ static u16 __get_link_speed(struct port *port)
speed = AD_LINK_SPEED_20000MBPS;
break;

+ case SPEED_25000:
+ speed = AD_LINK_SPEED_25000MBPS;
+ break;
+
case SPEED_40000:
speed = AD_LINK_SPEED_40000MBPS;
break;
@@ -707,6 +713,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator)
case AD_LINK_SPEED_20000MBPS:
bandwidth = nports * 20000;
break;
+ case AD_LINK_SPEED_25000MBPS:
+ bandwidth = nports * 25000;
+ break;
case AD_LINK_SPEED_40000MBPS:
bandwidth = nports * 40000;
break;
--
2.11.0

2017-03-14 18:17:22

by Andy Gospodarek

Subject: Re: [PATCH net-next] bonding: add 802.3ad support for 25G speeds

On Tue, Mar 14, 2017 at 11:48:32AM -0400, Jarod Wilson wrote:
> Cut-n-paste enablement of 802.3ad bonding on 25G NICs, which currently
> report 0 as their bandwidth.
>
> CC: Jay Vosburgh <[email protected]>
> CC: Veaceslav Falico <[email protected]>
> CC: Andy Gospodarek <[email protected]>
> CC: [email protected]
> Signed-off-by: Jarod Wilson <[email protected]>

Look good, Jarod. Probably time for a 50Gbps option, too....

Acked-by: Andy Gospodarek <[email protected]>

> ---
> note: I swear I saw a patch for this already, but I don't see it on the
> list and it isn't committed, so here's this...
>
> drivers/net/bonding/bond_3ad.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
> index 431926bba9f4..508713b4e533 100644
> --- a/drivers/net/bonding/bond_3ad.c
> +++ b/drivers/net/bonding/bond_3ad.c
> @@ -92,6 +92,7 @@ enum ad_link_speed_type {
> AD_LINK_SPEED_2500MBPS,
> AD_LINK_SPEED_10000MBPS,
> AD_LINK_SPEED_20000MBPS,
> + AD_LINK_SPEED_25000MBPS,
> AD_LINK_SPEED_40000MBPS,
> AD_LINK_SPEED_56000MBPS,
> AD_LINK_SPEED_100000MBPS,
> @@ -260,6 +261,7 @@ static inline int __check_agg_selection_timer(struct port *port)
> * %AD_LINK_SPEED_2500MBPS,
> * %AD_LINK_SPEED_10000MBPS
> * %AD_LINK_SPEED_20000MBPS
> + * %AD_LINK_SPEED_25000MBPS
> * %AD_LINK_SPEED_40000MBPS
> * %AD_LINK_SPEED_56000MBPS
> * %AD_LINK_SPEED_100000MBPS
> @@ -302,6 +304,10 @@ static u16 __get_link_speed(struct port *port)
> speed = AD_LINK_SPEED_20000MBPS;
> break;
>
> + case SPEED_25000:
> + speed = AD_LINK_SPEED_25000MBPS;
> + break;
> +
> case SPEED_40000:
> speed = AD_LINK_SPEED_40000MBPS;
> break;
> @@ -707,6 +713,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator)
> case AD_LINK_SPEED_20000MBPS:
> bandwidth = nports * 20000;
> break;
> + case AD_LINK_SPEED_25000MBPS:
> + bandwidth = nports * 25000;
> + break;
> case AD_LINK_SPEED_40000MBPS:
> bandwidth = nports * 40000;
> break;
> --
> 2.11.0
>

2017-03-17 03:28:13

by David Miller

Subject: Re: [PATCH net-next] bonding: add 802.3ad support for 25G speeds

From: Jarod Wilson <[email protected]>
Date: Tue, 14 Mar 2017 11:48:32 -0400

> Cut-n-paste enablement of 802.3ad bonding on 25G NICs, which currently
> report 0 as their bandwidth.
>
> CC: Jay Vosburgh <[email protected]>
> CC: Veaceslav Falico <[email protected]>
> CC: Andy Gospodarek <[email protected]>
> CC: [email protected]
> Signed-off-by: Jarod Wilson <[email protected]>

Applied.