From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4CCC2A0C46;
Mon, 27 Sep 2021 16:59:32 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id F3E8F41151;
Mon, 27 Sep 2021 16:58:21 +0200 (CEST)
Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com
[209.85.215.180])
by mails.dpdk.org (Postfix) with ESMTP id EEA5440E3C
for <dev@dpdk.org>; Mon, 27 Sep 2021 15:36:34 +0200 (CEST)
Received: by mail-pg1-f180.google.com with SMTP id y186so6468283pgd.0
for <dev@dpdk.org>; Mon, 27 Sep 2021 06:36:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=oneconvergence.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=jjj81VcOGWMeFPTi1Dt1PaeNl2epNC8ctghXFqFAst0=;
b=OqS6cvTmuNaIo/gs1T+QWtY8C62+nIJ2V2dd2noD6Yt/i/uNorAyyLqaYm/Q054WNT
pqJl6q+/Ipy3arQA2qubZAWqZ540ovHZcYhcgtMU7C4Q7d4dkPJdsuHmTN1/DmPR3Rf0
O9UZMVPipB8dUpdxDAKiCk9XbR5b7FIM69TOY=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=jjj81VcOGWMeFPTi1Dt1PaeNl2epNC8ctghXFqFAst0=;
b=gQXH2HG+y9Vl0aBnPdxlftVNttYhoJ2n4sVGH5eyuIbOabGRuVKqsOIevtzchYWPHp
E6DxptDYK63+07I3jANX/Dcq/A0AcuZun8tsUBnwZhxe/oMAtOH5y5MZqm2u/4M8nOfw
ojlNqceIKvK6qVE5nFoxvK0GZJjoW1r4wFIXlCBS6WmZQQ7vqqG2jGev9xRKrNoYXrvS
akKGjvkXWgnpDpafAKawW91M4RD2lcrloYxjIbPHg93OBbcfoHMA0K87GuZ3kUtE2QmZ
7dmtsoxpY6HGcLw/o7Pb7l71xw3qoWDWa9Lg8a6ImLFOVbG0BRSaEx98S2msfNXpK1ZR
3n1g==
X-Gm-Message-State: AOAM531Q/dSsH3eGxnUpX/OxIDOabvE6v2YR7tpGt+O++Pm8OqAx6UoH
f7+pCyQplErTcBtUXZVYBCix/jz3Q3NjEw==
X-Google-Smtp-Source: ABdhPJxcyedf/84/CyY8emEQAATGon/+ehfdEcKmAJOVQeg71KPmTge/lyawJagss2Qg+F9nua0Kug==
X-Received: by 2002:a62:15c3:0:b0:43d:e6be:156a with SMTP id
186-20020a6215c3000000b0043de6be156amr23602776pfv.1.1632749794077;
Mon, 27 Sep 2021 06:36:34 -0700 (PDT)
Received: from srikanth-ThinkPad-T450.domain.name ([223.178.22.200])
by smtp.gmail.com with ESMTPSA id t6sm17342274pfh.63.2021.09.27.06.36.32
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 27 Sep 2021 06:36:33 -0700 (PDT)
From: Srikanth Kaka <srikanth.k@oneconvergence.com>
To: Matan Azrad <matan@nvidia.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Cc: dev@dpdk.org, Vag Singh <vag.singh@oneconvergence.com>,
Anand Thulasiram <avelu@juniper.net>,
Srikanth Kaka <srikanth.k@oneconvergence.com>
Date: Mon, 27 Sep 2021 19:04:43 +0530
Message-Id: <20210927133450.10653-13-srikanth.k@oneconvergence.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210927133450.10653-1-srikanth.k@oneconvergence.com>
References: <20210927133450.10653-1-srikanth.k@oneconvergence.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Mon, 27 Sep 2021 16:58:07 +0200
Subject: [dpdk-dev] [PATCH 12/19] net/mlx5: Added procedure to detect link
state
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Defined callback to retrieve physical link information - status,
speed and capability using ioctl
Signed-off-by: Srikanth Kaka <srikanth.k@oneconvergence.com>
Signed-off-by: Vag Singh <vag.singh@oneconvergence.com>
Signed-off-by: Anand Thulasiram <avelu@juniper.net>
---
drivers/net/mlx5/freebsd/mlx5_ethdev_os.c | 349 +++++++---------------
1 file changed, 108 insertions(+), 241 deletions(-)
diff --git a/drivers/net/mlx5/freebsd/mlx5_ethdev_os.c b/drivers/net/mlx5/freebsd/mlx5_ethdev_os.c
index 268649d16c..b046b6e347 100644
--- a/drivers/net/mlx5/freebsd/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/freebsd/mlx5_ethdev_os.c
@@ -14,6 +14,7 @@
#include <errno.h>
#include <dirent.h>
#include <net/if.h>
+#include <net/if_media.h>
#include <sys/sockio.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -308,265 +309,133 @@ mlx5_read_clock(struct rte_eth_dev *dev, uint64_t *clock)
return 0;
}
-/**
- * Retrieve the master device for representor in the same switch domain.
- *
- * @param dev
- * Pointer to representor Ethernet device structure.
- *
- * @return
- * Master device structure on success, NULL otherwise.
- */
-static struct rte_eth_dev *
-mlx5_find_master_dev(struct rte_eth_dev *dev)
-{
- struct mlx5_priv *priv;
- uint16_t port_id;
- uint16_t domain_id;
-
- priv = dev->data->dev_private;
- domain_id = priv->domain_id;
- MLX5_ASSERT(priv->representor);
- MLX5_ETH_FOREACH_DEV(port_id, dev->device) {
- struct mlx5_priv *opriv =
- rte_eth_devices[port_id].data->dev_private;
- if (opriv &&
- opriv->master &&
- opriv->domain_id == domain_id &&
- opriv->sh == priv->sh)
- return &rte_eth_devices[port_id];
- }
- return NULL;
-}
+static const struct ifmedia_baudrate ifmedia_baudrate_desc[] =
+ IFM_BAUDRATE_DESCRIPTIONS;
-/**
- * DPDK callback to retrieve physical link information.
- *
- * @param dev
- * Pointer to Ethernet device structure.
- * @param[out] link
- * Storage for current link status.
- *
- * @return
- * 0 on success, a negative errno value otherwise and rte_errno is set.
- */
-static int
-mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
+static uint64_t
+mlx5_ifmedia_baudrate(int mword)
{
- struct mlx5_priv *priv = dev->data->dev_private;
- struct ethtool_cmd edata = {
- .cmd = ETHTOOL_GSET /* Deprecated since Linux v4.5. */
- };
- struct ifreq ifr;
- struct rte_eth_link dev_link;
- int link_speed = 0;
- int ret;
+ int i;
- ret = mlx5_ifreq(dev, SIOCGIFFLAGS, &ifr);
- if (ret) {
- DRV_LOG(WARNING, "port %u ioctl(SIOCGIFFLAGS) failed: %s",
- dev->data->port_id, strerror(rte_errno));
- return ret;
+ for (i = 0; ifmedia_baudrate_desc[i].ifmb_word != 0; i++) {
+ if (IFM_TYPE_MATCH(mword, ifmedia_baudrate_desc[i].ifmb_word))
+ return (ifmedia_baudrate_desc[i].ifmb_baudrate);
}
- dev_link = (struct rte_eth_link) {
- .link_status = ((ifr.ifr_flags & IFF_UP) &&
- (ifr.ifr_flags & IFF_RUNNING)),
- };
- ifr = (struct ifreq) {
- .ifr_data = (void *)&edata,
- };
- ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
- if (ret) {
- if (ret == -ENOTSUP && priv->representor) {
- struct rte_eth_dev *master;
- /*
- * For representors we can try to inherit link
- * settings from the master device. Actually
- * link settings do not make a lot of sense
- * for representors due to missing physical
- * link. The old kernel drivers supported
- * emulated settings query for representors,
- * the new ones do not, so we have to add
- * this code for compatibility issues.
- */
- master = mlx5_find_master_dev(dev);
- if (master) {
- ifr = (struct ifreq) {
- .ifr_data = (void *)&edata,
- };
- ret = mlx5_ifreq(master, SIOCETHTOOL, &ifr);
- }
- }
- if (ret) {
- DRV_LOG(WARNING,
- "port %u ioctl(SIOCETHTOOL,"
- " ETHTOOL_GSET) failed: %s",
- dev->data->port_id, strerror(rte_errno));
- return ret;
- }
- }
- link_speed = ethtool_cmd_speed(&edata);
- if (link_speed == -1)
- dev_link.link_speed = ETH_SPEED_NUM_UNKNOWN;
- else
- dev_link.link_speed = link_speed;
- priv->link_speed_capa = 0;
- if (edata.supported & (SUPPORTED_1000baseT_Full |
- SUPPORTED_1000baseKX_Full))
- priv->link_speed_capa |= ETH_LINK_SPEED_1G;
- if (edata.supported & SUPPORTED_10000baseKR_Full)
- priv->link_speed_capa |= ETH_LINK_SPEED_10G;
- if (edata.supported & (SUPPORTED_40000baseKR4_Full |
- SUPPORTED_40000baseCR4_Full |
- SUPPORTED_40000baseSR4_Full |
- SUPPORTED_40000baseLR4_Full))
- priv->link_speed_capa |= ETH_LINK_SPEED_40G;
- dev_link.link_duplex = ((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);
- *link = dev_link;
- return 0;
+ return (0);
}
-/**
- * Retrieve physical link information (unlocked version using new ioctl).
- *
- * @param dev
- * Pointer to Ethernet device structure.
- * @param[out] link
- * Storage for current link status.
- *
- * @return
- * 0 on success, a negative errno value otherwise and rte_errno is set.
- */
static int
-mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-
+mlx5_link_update_bsd(struct rte_eth_dev *dev,
+ struct rte_eth_link *link)
{
struct mlx5_priv *priv = dev->data->dev_private;
- struct ethtool_link_settings gcmd = { .cmd = ETHTOOL_GLINKSETTINGS };
- struct ifreq ifr;
struct rte_eth_link dev_link;
- struct rte_eth_dev *master = NULL;
- uint64_t sc;
- int ret;
+ int link_speed = 0, sock;
+ struct ifmediareq ifmr;
+ char ifname[IF_NAMESIZE];
+ int *media_list;
- ret = mlx5_ifreq(dev, SIOCGIFFLAGS, &ifr);
- if (ret) {
- DRV_LOG(WARNING, "port %u ioctl(SIOCGIFFLAGS) failed: %s",
+ sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+ if (sock == -1) {
+ DRV_LOG(ERR,
+ "port %u CANT OPEN SOCKET FOR MEDIA REQUEST on FREEBSD: %s",
dev->data->port_id, strerror(rte_errno));
- return ret;
+ return sock;
}
- dev_link = (struct rte_eth_link) {
- .link_status = ((ifr.ifr_flags & IFF_UP) &&
- (ifr.ifr_flags & IFF_RUNNING)),
- };
- ifr = (struct ifreq) {
- .ifr_data = (void *)&gcmd,
- };
- ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
- if (ret) {
- if (ret == -ENOTSUP && priv->representor) {
- /*
- * For representors we can try to inherit link
- * settings from the master device. Actually
- * link settings do not make a lot of sense
- * for representors due to missing physical
- * link. The old kernel drivers supported
- * emulated settings query for representors,
- * the new ones do not, so we have to add
- * this code for compatibility issues.
- */
- master = mlx5_find_master_dev(dev);
- if (master) {
- ifr = (struct ifreq) {
- .ifr_data = (void *)&gcmd,
- };
- ret = mlx5_ifreq(master, SIOCETHTOOL, &ifr);
- }
- }
- if (ret) {
- DRV_LOG(DEBUG,
- "port %u ioctl(SIOCETHTOOL,"
- " ETHTOOL_GLINKSETTINGS) failed: %s",
- dev->data->port_id, strerror(rte_errno));
- return ret;
- }
+
+ mlx5_get_ifname(dev, &ifname);
+ memset(&ifmr, 0, sizeof(struct ifmediareq));
+ strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
+
+ if (ioctl(sock, SIOCGIFXMEDIA, (caddr_t)&ifmr) < 0) {
+ DRV_LOG(ERR,
+ "ioctl(SIOCGIFMEDIA) on %s: %s",
+ ifname, strerror(errno));
+ close(sock);
+ return errno;
}
- gcmd.link_mode_masks_nwords = -gcmd.link_mode_masks_nwords;
- alignas(struct ethtool_link_settings)
- uint8_t data[offsetof(struct ethtool_link_settings, link_mode_masks) +
- sizeof(uint32_t) * gcmd.link_mode_masks_nwords * 3];
- struct ethtool_link_settings *ecmd = (void *)data;
+ media_list = (int *)malloc(ifmr.ifm_count * sizeof(int));
+ ifmr.ifm_ulist = media_list;
- *ecmd = gcmd;
- ifr.ifr_data = (void *)ecmd;
- ret = mlx5_ifreq(master ? master : dev, SIOCETHTOOL, &ifr);
- if (ret) {
- DRV_LOG(DEBUG,
- "port %u ioctl(SIOCETHTOOL,"
- "ETHTOOL_GLINKSETTINGS) failed: %s",
- dev->data->port_id, strerror(rte_errno));
- return ret;
+ if (ioctl(sock, SIOCGIFXMEDIA, (caddr_t)&ifmr) < 0) {
+ DRV_LOG(ERR,
+ "ioctl(SIOCGIFMEDIA) on %s: %s",
+ ifname, strerror(errno));
+ close(sock);
+ return errno;
}
- dev_link.link_speed = (ecmd->speed == UINT32_MAX) ?
- ETH_SPEED_NUM_UNKNOWN : ecmd->speed;
- sc = ecmd->link_mode_masks[0] |
- ((uint64_t)ecmd->link_mode_masks[1] << 32);
+
+ if (ifmr.ifm_status == (IFM_AVALID | IFM_ACTIVE))
+ dev_link.link_status = ETH_LINK_UP;
+ else
+ dev_link.link_status = ETH_LINK_DOWN;
+
+ link_speed = ifmr.ifm_status & IFM_AVALID ?
+ mlx5_ifmedia_baudrate(ifmr.ifm_active) / (1000 * 1000) : 0;
+
+ if (link_speed == 0)
+ dev_link.link_speed = ETH_SPEED_NUM_NONE;
+ else
+ dev_link.link_speed = link_speed;
+
priv->link_speed_capa = 0;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_1000baseT_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_1G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_10000baseR_FEC_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_10G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_20000baseMLD2_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_20000baseKR2_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_20G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_40G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_56G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_25000baseCR_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_25000baseKR_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_25G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_50G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_100G;
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_200G;
-
- sc = ecmd->link_mode_masks[2] |
- ((uint64_t)ecmd->link_mode_masks[3] << 32);
- if (sc & (MLX5_BITSHIFT(ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT) |
- MLX5_BITSHIFT
- (ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT) |
- MLX5_BITSHIFT(ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT)))
- priv->link_speed_capa |= ETH_LINK_SPEED_200G;
- dev_link.link_duplex = ((ecmd->duplex == DUPLEX_HALF) ?
- ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX);
+ /* Add support for duplex types */
+ dev_link.link_duplex = ETH_LINK_FULL_DUPLEX;
+ /* FreeBSD automatically negotiates speed,
+ * so it is displayed in its capabilities.
+ */
+ priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG;
+
+ for (int i = 1; i < ifmr.ifm_count; i += 2) {
+ switch (mlx5_ifmedia_baudrate(media_list[i]) / (1000 * 1000)) {
+ case 100000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_100G;
+ break;
+ case 56000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_56G;
+ break;
+ case 50000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_50G;
+ break;
+ case 40000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_40G;
+ break;
+ case 25000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_25G;
+ break;
+ case 10000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_10G;
+ break;
+ case 2500:
+ priv->link_speed_capa |= ETH_LINK_SPEED_2_5G;
+ break;
+ case 1000:
+ priv->link_speed_capa |= ETH_LINK_SPEED_1G;
+ break;
+ case 100:
+ priv->link_speed_capa |= (dev_link.link_duplex ==
+ ETH_LINK_FULL_DUPLEX) ?
+ ETH_LINK_SPEED_100M :
+ ETH_LINK_SPEED_100M_HD;
+ break;
+ case 10:
+ priv->link_speed_capa |= (dev_link.link_duplex ==
+ ETH_LINK_FULL_DUPLEX) ?
+ ETH_LINK_SPEED_10M :
+ ETH_LINK_SPEED_10M_HD;
+ break;
+ case 0:
+ default:
+ break;
+ }
+ }
dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
- ETH_LINK_SPEED_FIXED);
+ ETH_LINK_SPEED_FIXED);
+ free(media_list);
*link = dev_link;
+ close(sock);
return 0;
}
@@ -591,9 +460,7 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
int retry = MLX5_GET_LINK_STATUS_RETRY_COUNT;
do {
- ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
- if (ret == -ENOTSUP)
- ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
+ ret = mlx5_link_update_bsd(dev, &dev_link);
if (ret == 0)
break;
/* Handle wait to complete situation. */
--
2.30.2