* [dpdk-stable] [PATCH v2] net/mlx5: fix get link settings call for speed and duplex values [not found] <f4f3ef7e89eb42d415ad6cfe8e875d93b28a3547.1500359265.git.gowrishankar.m@linux.vnet.ibm.com> @ 2017-07-24 14:30 ` Gowrishankar 2017-07-25 8:07 ` [dpdk-stable] [PATCH] net/mlx5: fix inconsistent link status query Gowrishankar 0 siblings, 1 reply; 6+ messages in thread From: Gowrishankar @ 2017-07-24 14:30 UTC (permalink / raw) To: Adrien Mazarguil, Nelio Laranjeiro Cc: dev, Thomas Monjalon, stable, Gowrishankar Muthukrishnan From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> ETHTOOL_GLINKSETTINGS ioctl call in mlx5 pmd returns inconsistent link status due to which any application relying on it would not function correctly. Changes: v2 - coding style update Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") Cc: stable@dpdk.org Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> --- drivers/net/mlx5/mlx5_ethdev.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index b70b7b9..3ceb13a 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -119,6 +119,7 @@ struct ethtool_link_settings { #define ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT 38 #define ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT 39 #endif +#define ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 (SCHAR_MAX) /** * Return private structure associated with an Ethernet device. @@ -807,9 +808,12 @@ struct priv * mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); - struct ethtool_link_settings edata = { - .cmd = ETHTOOL_GLINKSETTINGS, - }; + struct { + struct ethtool_link_settings edata; + __u32 link_mode_data[ + 3 * ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32]; + } ecmd; + struct ifreq ifr; struct rte_eth_link dev_link; uint64_t sc; @@ -822,15 +826,23 @@ struct priv * memset(&dev_link, 0, sizeof(dev_link)); dev_link.link_status = ((ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING)); - ifr.ifr_data = (void *)&edata; + memset(&ecmd, 0, sizeof(ecmd)); + ecmd.edata.cmd = ETHTOOL_GLINKSETTINGS; + ifr.ifr_data = (void *)&ecmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - dev_link.link_speed = edata.speed; - sc = edata.link_mode_masks[0] | - ((uint64_t)edata.link_mode_masks[1] << 32); + ecmd.edata.link_mode_masks_nwords = -ecmd.edata.link_mode_masks_nwords; + if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { + DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", + strerror(errno)); + return -1; + } + dev_link.link_speed = ecmd.edata.speed; + sc = ecmd.edata.link_mode_masks[0] | + ((uint64_t)ecmd.edata.link_mode_masks[1] << 32); priv->link_speed_capa = 0; if (sc & ETHTOOL_LINK_MODE_Autoneg_BIT) priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG; @@ -866,7 +878,7 @@ struct priv * ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT | ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)) priv->link_speed_capa |= ETH_LINK_SPEED_100G; - dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ? + dev_link.link_duplex = ((ecmd.edata.duplex == DUPLEX_HALF) ? ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [PATCH] net/mlx5: fix inconsistent link status query 2017-07-24 14:30 ` [dpdk-stable] [PATCH v2] net/mlx5: fix get link settings call for speed and duplex values Gowrishankar @ 2017-07-25 8:07 ` Gowrishankar 2017-07-25 9:41 ` Nélio Laranjeiro 2017-07-25 13:38 ` [dpdk-stable] [PATCH v4] " Gowrishankar 0 siblings, 2 replies; 6+ messages in thread From: Gowrishankar @ 2017-07-25 8:07 UTC (permalink / raw) To: Adrien Mazarguil, Nelio Laranjeiro Cc: dev, Thomas Monjalon, stable, Gowrishankar Muthukrishnan From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> ETHTOOL_GLINKSETTINGS ioctl call in mlx5 pmd returns inconsistent link status due to which any application relying on it would not function correctly. Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") Cc: stable@dpdk.org Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> --- v3: - stick with C standard for uint32_t drivers/net/mlx5/mlx5_ethdev.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index b70b7b9..01f881e 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -119,6 +119,7 @@ struct ethtool_link_settings { #define ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT 38 #define ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT 39 #endif +#define ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 (SCHAR_MAX) /** * Return private structure associated with an Ethernet device. @@ -807,9 +808,12 @@ struct priv * mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); - struct ethtool_link_settings edata = { - .cmd = ETHTOOL_GLINKSETTINGS, - }; + struct { + struct ethtool_link_settings edata; + uint32_t link_mode_data[3 * + ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32]; + } ecmd; + struct ifreq ifr; struct rte_eth_link dev_link; uint64_t sc; @@ -822,15 +826,23 @@ struct priv * memset(&dev_link, 0, sizeof(dev_link)); dev_link.link_status = ((ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING)); - ifr.ifr_data = (void *)&edata; + memset(&ecmd, 0, sizeof(ecmd)); + ecmd.edata.cmd = ETHTOOL_GLINKSETTINGS; + ifr.ifr_data = (void *)&ecmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - dev_link.link_speed = edata.speed; - sc = edata.link_mode_masks[0] | - ((uint64_t)edata.link_mode_masks[1] << 32); + ecmd.edata.link_mode_masks_nwords = -ecmd.edata.link_mode_masks_nwords; + if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { + DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", + strerror(errno)); + return -1; + } + dev_link.link_speed = ecmd.edata.speed; + sc = ecmd.edata.link_mode_masks[0] | + ((uint64_t)ecmd.edata.link_mode_masks[1] << 32); priv->link_speed_capa = 0; if (sc & ETHTOOL_LINK_MODE_Autoneg_BIT) priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG; @@ -866,7 +878,7 @@ struct priv * ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT | ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)) priv->link_speed_capa |= ETH_LINK_SPEED_100G; - dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ? + dev_link.link_duplex = ((ecmd.edata.duplex == DUPLEX_HALF) ? ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH] net/mlx5: fix inconsistent link status query 2017-07-25 8:07 ` [dpdk-stable] [PATCH] net/mlx5: fix inconsistent link status query Gowrishankar @ 2017-07-25 9:41 ` Nélio Laranjeiro 2017-07-25 13:38 ` [dpdk-stable] [PATCH v4] " Gowrishankar 1 sibling, 0 replies; 6+ messages in thread From: Nélio Laranjeiro @ 2017-07-25 9:41 UTC (permalink / raw) To: Gowrishankar Cc: Adrien Mazarguil, dev, Thomas Monjalon, stable, Ferruh Yigit, Yuanhan Liu On Tue, Jul 25, 2017 at 01:37:39PM +0530, Gowrishankar wrote: > From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> > > ETHTOOL_GLINKSETTINGS ioctl call in mlx5 pmd returns inconsistent > link status due to which any application relying on it would not > function correctly. > > Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") > Cc: stable@dpdk.org > > Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> > --- > v3: > - stick with C standard for uint32_t > > drivers/net/mlx5/mlx5_ethdev.c | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c > index b70b7b9..01f881e 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -119,6 +119,7 @@ struct ethtool_link_settings { > #define ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT 38 > #define ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT 39 > #endif > +#define ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 (SCHAR_MAX) As I have another comment about compilation stuff, I would also ask to remove those extra spaces. > /** > * Return private structure associated with an Ethernet device. > @@ -807,9 +808,12 @@ struct priv * > mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) > { > struct priv *priv = mlx5_get_priv(dev); > - struct ethtool_link_settings edata = { > - .cmd = ETHTOOL_GLINKSETTINGS, > - }; > + struct { Misses the __extension__ before struct here. struct ethtool_link_settings is finishing with a flexible array (e.g. [0]) which avoids it to be included in another structure as it breaks the standard. > + struct ethtool_link_settings edata; > + uint32_t link_mode_data[3 * > + ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32]; > + } ecmd; Please add this __extension__ and it will be good ;) Thanks, -- Nélio Laranjeiro 6WIND ^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [PATCH v4] net/mlx5: fix inconsistent link status query 2017-07-25 8:07 ` [dpdk-stable] [PATCH] net/mlx5: fix inconsistent link status query Gowrishankar 2017-07-25 9:41 ` Nélio Laranjeiro @ 2017-07-25 13:38 ` Gowrishankar 2017-07-25 14:01 ` Nélio Laranjeiro 1 sibling, 1 reply; 6+ messages in thread From: Gowrishankar @ 2017-07-25 13:38 UTC (permalink / raw) To: Adrien Mazarguil, Nelio Laranjeiro Cc: dev, Thomas Monjalon, stable, Gowrishankar Muthukrishnan From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> ETHTOOL_GLINKSETTINGS ioctl call in mlx5 pmd returns inconsistent link status due to which any application relying on it would not function correctly. Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") Cc: stable@dpdk.org Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> --- v4: - use __extension__ for GNU C standard (struct in struct) drivers/net/mlx5/mlx5_ethdev.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index b70b7b9..1644546 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -119,6 +119,7 @@ struct ethtool_link_settings { #define ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT 38 #define ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT 39 #endif +#define ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 (SCHAR_MAX) /** * Return private structure associated with an Ethernet device. @@ -807,9 +808,12 @@ struct priv * mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); - struct ethtool_link_settings edata = { - .cmd = ETHTOOL_GLINKSETTINGS, - }; + __extension__ struct { + struct ethtool_link_settings edata; + uint32_t link_mode_data[3 * + ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32]; + } ecmd; + struct ifreq ifr; struct rte_eth_link dev_link; uint64_t sc; @@ -822,15 +826,23 @@ struct priv * memset(&dev_link, 0, sizeof(dev_link)); dev_link.link_status = ((ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING)); - ifr.ifr_data = (void *)&edata; + memset(&ecmd, 0, sizeof(ecmd)); + ecmd.edata.cmd = ETHTOOL_GLINKSETTINGS; + ifr.ifr_data = (void *)&ecmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - dev_link.link_speed = edata.speed; - sc = edata.link_mode_masks[0] | - ((uint64_t)edata.link_mode_masks[1] << 32); + ecmd.edata.link_mode_masks_nwords = -ecmd.edata.link_mode_masks_nwords; + if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { + DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", + strerror(errno)); + return -1; + } + dev_link.link_speed = ecmd.edata.speed; + sc = ecmd.edata.link_mode_masks[0] | + ((uint64_t)ecmd.edata.link_mode_masks[1] << 32); priv->link_speed_capa = 0; if (sc & ETHTOOL_LINK_MODE_Autoneg_BIT) priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG; @@ -866,7 +878,7 @@ struct priv * ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT | ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)) priv->link_speed_capa |= ETH_LINK_SPEED_100G; - dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ? + dev_link.link_duplex = ((ecmd.edata.duplex == DUPLEX_HALF) ? ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH v4] net/mlx5: fix inconsistent link status query 2017-07-25 13:38 ` [dpdk-stable] [PATCH v4] " Gowrishankar @ 2017-07-25 14:01 ` Nélio Laranjeiro 2017-07-31 12:36 ` [dpdk-stable] [dpdk-dev] " Ferruh Yigit 0 siblings, 1 reply; 6+ messages in thread From: Nélio Laranjeiro @ 2017-07-25 14:01 UTC (permalink / raw) To: Gowrishankar; +Cc: Adrien Mazarguil, dev, Thomas Monjalon, stable, Ferruh Yigit On Tue, Jul 25, 2017 at 07:08:07PM +0530, Gowrishankar wrote: > From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> > > ETHTOOL_GLINKSETTINGS ioctl call in mlx5 pmd returns inconsistent > link status due to which any application relying on it would not > function correctly. > > Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") > Cc: stable@dpdk.org > > Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com> -- Nélio Laranjeiro 6WIND ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v4] net/mlx5: fix inconsistent link status query 2017-07-25 14:01 ` Nélio Laranjeiro @ 2017-07-31 12:36 ` Ferruh Yigit 0 siblings, 0 replies; 6+ messages in thread From: Ferruh Yigit @ 2017-07-31 12:36 UTC (permalink / raw) To: Nélio Laranjeiro, Gowrishankar Cc: Adrien Mazarguil, dev, Thomas Monjalon, stable On 7/25/2017 3:01 PM, Nélio Laranjeiro wrote: > On Tue, Jul 25, 2017 at 07:08:07PM +0530, Gowrishankar wrote: >> From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> >> >> ETHTOOL_GLINKSETTINGS ioctl call in mlx5 pmd returns inconsistent >> link status due to which any application relying on it would not >> function correctly. >> >> Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") >> Cc: stable@dpdk.org >> >> Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> > > Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com> Applied to dpdk-next-net/master, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-07-31 12:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <f4f3ef7e89eb42d415ad6cfe8e875d93b28a3547.1500359265.git.gowrishankar.m@linux.vnet.ibm.com>
2017-07-24 14:30 ` [dpdk-stable] [PATCH v2] net/mlx5: fix get link settings call for speed and duplex values Gowrishankar
2017-07-25 8:07 ` [dpdk-stable] [PATCH] net/mlx5: fix inconsistent link status query Gowrishankar
2017-07-25 9:41 ` Nélio Laranjeiro
2017-07-25 13:38 ` [dpdk-stable] [PATCH v4] " Gowrishankar
2017-07-25 14:01 ` Nélio Laranjeiro
2017-07-31 12:36 ` [dpdk-stable] [dpdk-dev] " Ferruh Yigit
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).