diff mbox

[SRU,Yakkety,Zesty,Artful,1/2] bonding: add 802.3ad support for 25G speeds

Message ID d9165affa58edb61ab1ecfec1a2a7fb206626ec7.1497445155.git.joseph.salisbury@canonical.com
State New
Headers show

Commit Message

Joseph Salisbury July 14, 2017, 2:53 p.m. UTC 
From: Jarod Wilson <jarod@redhat.com>

BugLink: http://bugs.launchpad.net/bugs/1697892

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

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Veaceslav Falico <vfalico@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 19ddde1eeca1ee81f4add5e04da66055e09281ac)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 drivers/net/bonding/bond_3ad.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Stefan Bader July 17, 2017, 10:33 a.m. UTC | #1 
On 14.07.2017 16:53, Joseph Salisbury wrote:
> From: Jarod Wilson <jarod@redhat.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1697892
> 
> Cut-n-paste enablement of 802.3ad bonding on 25G NICs, which currently
> report 0 as their bandwidth.
> 
> CC: Jay Vosburgh <j.vosburgh@gmail.com>
> CC: Veaceslav Falico <vfalico@gmail.com>
> CC: Andy Gospodarek <andy@greyhouse.net>
> CC: netdev@vger.kernel.org
> Signed-off-by: Jarod Wilson <jarod@redhat.com>
> Acked-by: Andy Gospodarek <andy@greyhouse.net>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit 19ddde1eeca1ee81f4add5e04da66055e09281ac)
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---

Might have been better grouped under the submission of "Fixes for LP:1697892".
Sounds reasonable though testing only could be done for 100G in Xenial.

-Stefan

>  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 edc70ff..12240f8 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;
>
Thadeu Lima de Souza Cascardo Aug. 3, 2017, 7:39 p.m. UTC | #2 
On Mon, Jul 17, 2017 at 12:33:18PM +0200, Stefan Bader wrote:
> On 14.07.2017 16:53, Joseph Salisbury wrote:
> > From: Jarod Wilson <jarod@redhat.com>
> > 
> > BugLink: http://bugs.launchpad.net/bugs/1697892
> > 
> > Cut-n-paste enablement of 802.3ad bonding on 25G NICs, which currently
> > report 0 as their bandwidth.
> > 
> > CC: Jay Vosburgh <j.vosburgh@gmail.com>
> > CC: Veaceslav Falico <vfalico@gmail.com>
> > CC: Andy Gospodarek <andy@greyhouse.net>
> > CC: netdev@vger.kernel.org
> > Signed-off-by: Jarod Wilson <jarod@redhat.com>
> > Acked-by: Andy Gospodarek <andy@greyhouse.net>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > (cherry picked from commit 19ddde1eeca1ee81f4add5e04da66055e09281ac)
> > Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> Acked-by: Stefan Bader <stefan.bader@canonical.com>
> 
> > ---
> 
> Might have been better grouped under the submission of "Fixes for LP:1697892".
> Sounds reasonable though testing only could be done for 100G in Xenial.

It was grouped. I took it as an ACK for the entire series.

Cascardo.

> 
> -Stefan
> 
> >  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 edc70ff..12240f8 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;
> > 
> 
> 




> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox

Patch

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index edc70ff..12240f8 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;