X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_mac.c;h=19981d26d846db52961f1259c401ca206efd5ffd;hb=da573c0e4205d818cd602eaa27c720896f3b6f1c;hp=0fb4a3e0f9d63588c1793d798440a0a15f61cc61;hpb=ccdcba53a3f4d12583c4378e7d8b702ce91e0499;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 0fb4a3e0f9..19981d26d8 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -4,55 +4,79 @@ */ #include -#include #include #include #include #include -#include -#include -#include - -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-Wpedantic" -#endif -#include -#ifdef PEDANTIC -#pragma GCC diagnostic error "-Wpedantic" -#endif #include -#include +#include #include +#include "mlx5_defs.h" #include "mlx5.h" #include "mlx5_utils.h" #include "mlx5_rxtx.h" -#include "mlx5_defs.h" /** - * Get MAC address by querying netdevice. + * Remove a MAC address from the internal array. + * + * @param dev + * Pointer to Ethernet device structure. + * @param index + * MAC address index. + */ +static void +mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) +{ + MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES); + if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index])) + return; + mlx5_os_mac_addr_remove(dev, index); + memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr)); +} + +/** + * Adds a MAC address to the internal array. * - * @param[in] dev - * Pointer to Ethernet device. - * @param[out] mac - * MAC address output buffer. + * @param dev + * Pointer to Ethernet device structure. + * @param mac_addr + * MAC address to register. + * @param index + * MAC address index. * * @return * 0 on success, a negative errno value otherwise and rte_errno is set. */ -int -mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[ETHER_ADDR_LEN]) +static int +mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac, + uint32_t index) { - struct ifreq request; + unsigned int i; int ret; - ret = mlx5_ifreq(dev, SIOCGIFHWADDR, &request); + MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES); + if (rte_is_zero_ether_addr(mac)) { + rte_errno = EINVAL; + return -rte_errno; + } + /* First, make sure this address isn't already configured. */ + for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) { + /* Skip this index, it's going to be reconfigured. */ + if (i == index) + continue; + if (memcmp(&dev->data->mac_addrs[i], mac, sizeof(*mac))) + continue; + /* Address already configured elsewhere, return with error. */ + rte_errno = EADDRINUSE; + return -rte_errno; + } + ret = mlx5_os_mac_addr_add(dev, mac, index); if (ret) return ret; - memcpy(mac, request.ifr_hwaddr.sa_data, ETHER_ADDR_LEN); + + dev->data->mac_addrs[index] = *mac; return 0; } @@ -67,15 +91,11 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[ETHER_ADDR_LEN]) void mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) { - struct priv *priv = dev->data->dev_private; - const int vf = priv->config.vf; int ret; - assert(index < MLX5_MAX_MAC_ADDRESSES); - if (vf) - mlx5_nl_mac_addr_remove(dev, &dev->data->mac_addrs[index], - index); - memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr)); + if (index >= MLX5_MAX_UC_MAC_ADDRESSES) + return; + mlx5_internal_mac_addr_remove(dev, index); if (!dev->data->promiscuous) { ret = mlx5_traffic_restart(dev); if (ret) @@ -100,32 +120,18 @@ mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) * 0 on success, a negative errno value otherwise and rte_errno is set. */ int -mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, +mlx5_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac, uint32_t index, uint32_t vmdq __rte_unused) { - struct priv *priv = dev->data->dev_private; - const int vf = priv->config.vf; - unsigned int i; + int ret; - assert(index < MLX5_MAX_MAC_ADDRESSES); - /* First, make sure this address isn't already configured. */ - for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) { - /* Skip this index, it's going to be reconfigured. */ - if (i == index) - continue; - if (memcmp(&dev->data->mac_addrs[i], mac, sizeof(*mac))) - continue; - /* Address already configured elsewhere, return with error. */ - rte_errno = EADDRINUSE; + if (index >= MLX5_MAX_UC_MAC_ADDRESSES) { + rte_errno = EINVAL; return -rte_errno; } - if (vf) { - int ret = mlx5_nl_mac_addr_add(dev, mac, index); - - if (ret) - return ret; - } - dev->data->mac_addrs[index] = *mac; + ret = mlx5_internal_mac_addr_add(dev, mac, index); + if (ret < 0) + return ret; if (!dev->data->promiscuous) return mlx5_traffic_restart(dev); return 0; @@ -138,17 +144,74 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, * Pointer to Ethernet device structure. * @param mac_addr * MAC address to register. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. */ -void -mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr) +int +mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { - int ret; + uint16_t port_id; + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_priv *pf_priv; + + /* + * Configuring the VF instead of its representor, + * need to skip the special case of HPF on Bluefield. + */ + if (priv->representor && !mlx5_is_hpf(dev)) { + DRV_LOG(DEBUG, "VF represented by port %u setting primary MAC address", + dev->data->port_id); + if (priv->pf_bond >= 0) { + /* Bonding, get owner PF ifindex from shared data. */ + return mlx5_os_vf_mac_addr_modify + (priv, + priv->sh->bond.ports[priv->pf_bond].ifindex, + mac_addr, + MLX5_REPRESENTOR_REPR(priv->representor_id)); + } + RTE_ETH_FOREACH_DEV_SIBLING(port_id, dev->data->port_id) { + pf_priv = rte_eth_devices[port_id].data->dev_private; + if (pf_priv->master == 1) + return mlx5_os_vf_mac_addr_modify + (priv, pf_priv->if_index, mac_addr, + MLX5_REPRESENTOR_REPR + (priv->representor_id)); + } + rte_errno = -ENOTSUP; + return rte_errno; + } DRV_LOG(DEBUG, "port %u setting primary MAC address", dev->data->port_id); + return mlx5_mac_addr_add(dev, mac_addr, 0, 0); +} - ret = mlx5_mac_addr_add(dev, mac_addr, 0, 0); - if (ret) - DRV_LOG(ERR, "port %u cannot set mac address: %s", - dev->data->port_id, strerror(rte_errno)); +/** + * DPDK callback to set multicast addresses list. + * + * @see rte_eth_dev_set_mc_addr_list() + */ +int +mlx5_set_mc_addr_list(struct rte_eth_dev *dev, + struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr) +{ + uint32_t i; + int ret; + + if (nb_mc_addr >= MLX5_MAX_MC_MAC_ADDRESSES) { + rte_errno = ENOSPC; + return -rte_errno; + } + for (i = MLX5_MAX_UC_MAC_ADDRESSES; i != MLX5_MAX_MAC_ADDRESSES; ++i) + mlx5_internal_mac_addr_remove(dev, i); + i = MLX5_MAX_UC_MAC_ADDRESSES; + while (nb_mc_addr--) { + ret = mlx5_internal_mac_addr_add(dev, mc_addr_set++, i++); + if (ret) + return ret; + } + if (!dev->data->promiscuous) + return mlx5_traffic_restart(dev); + return 0; }