net/mlx5: refactor Linux MAC operations

Move OS specific MAC operations add, remove, modify VF into file
linux/mlx5_os.c.
Remove unused function mlx5_get_mac().

Signed-off-by: Ophir Munk <ophirmu@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 05072f2..dea4ee7 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -67,6 +67,30 @@
 #define MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP (1 << 4)
 #endif
 
+/**
+ * Get MAC address by querying netdevice.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[out] mac
+ *   MAC address output buffer.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN])
+{
+       struct ifreq request;
+       int ret;
+
+       ret = mlx5_ifreq(dev, SIOCGIFHWADDR, &request);
+       if (ret)
+               return ret;
+       memcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);
+       return 0;
+}
+
 /**
  * Get mlx5 device attributes. The glue function query_device_ex() is called
  * with out parameter of type 'struct ibv_device_attr_ex *'. Then fill in mlx5
@@ -2365,6 +2389,79 @@ mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb,
        *dereg_mr_cb = mlx5_verbs_ops.dereg_mr;
 }
 
+/**
+ * Remove a MAC address from device
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param index
+ *   MAC address index.
+ */
+void
+mlx5_os_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       const int vf = priv->config.vf;
+
+       if (vf)
+               mlx5_nl_mac_addr_remove(priv->nl_socket_route,
+                                       mlx5_ifindex(dev), priv->mac_own,
+                                       &dev->data->mac_addrs[index], index);
+}
+
+/**
+ * Adds a MAC address to the device
+ *
+ * @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
+ */
+int
+mlx5_os_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
+                    uint32_t index)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       const int vf = priv->config.vf;
+       int ret = 0;
+
+       if (vf)
+               ret = mlx5_nl_mac_addr_add(priv->nl_socket_route,
+                                          mlx5_ifindex(dev), priv->mac_own,
+                                          mac, index);
+       return ret;
+}
+
+/**
+ * Modify a VF MAC address
+ *
+ * @param priv
+ *   Pointer to device private data.
+ * @param mac_addr
+ *   MAC address to modify into.
+ * @param iface_idx
+ *   Net device interface index
+ * @param vf_index
+ *   VF index
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise
+ */
+int
+mlx5_os_vf_mac_addr_modify(struct mlx5_priv *priv,
+                          unsigned int iface_idx,
+                          struct rte_ether_addr *mac_addr,
+                          int vf_index)
+{
+       return mlx5_nl_vf_mac_addr_modify
+               (priv->nl_socket_route, iface_idx, mac_addr, vf_index);
+}
+
 const struct eth_dev_ops mlx5_os_dev_ops = {
        .dev_configure = mlx5_dev_configure,
        .dev_start = mlx5_dev_start,

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 2edec7a..88cfed8 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -861,7 +861,6 @@ int mlx5_dev_configure_rss_reta(struct rte_eth_dev *dev);
 
 /* mlx5_mac.c */
 
-int mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN]);
 void mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index);
 int mlx5_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
                      uint32_t index, uint32_t vmdq);
@@ -1026,6 +1025,12 @@ int mlx5_os_get_stats_n(struct rte_eth_dev *dev);
 void mlx5_os_stats_init(struct rte_eth_dev *dev);
 void mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb,
                           mlx5_dereg_mr_t *dereg_mr_cb);
+void mlx5_os_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index);
+int mlx5_os_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
+                        uint32_t index);
+int mlx5_os_vf_mac_addr_modify(struct mlx5_priv *priv, unsigned int iface_idx,
+                              struct rte_ether_addr *mac_addr,
+                              int vf_index);
 
 /* mlx5_txpp.c */
 

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 291f772..2a88086 100644 (file)
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -31,30 +31,6 @@
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
 
-/**
- * Get MAC address by querying netdevice.
- *
- * @param[in] dev
- *   Pointer to Ethernet device.
- * @param[out] mac
- *   MAC address output buffer.
- *
- * @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)[RTE_ETHER_ADDR_LEN])
-{
-       struct ifreq request;
-       int ret;
-
-       ret = mlx5_ifreq(dev, SIOCGIFHWADDR, &request);
-       if (ret)
-               return ret;
-       memcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);
-       return 0;
-}
-
 /**
  * Remove a MAC address from the internal array.
  *
@@ -66,16 +42,10 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN])
 static void
 mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
-       const int vf = priv->config.vf;
-
        MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES);
        if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index]))
                return;
-       if (vf)
-               mlx5_nl_mac_addr_remove(priv->nl_socket_route,
-                                       mlx5_ifindex(dev), priv->mac_own,
-                                       &dev->data->mac_addrs[index], index);
+       mlx5_os_mac_addr_remove(dev, index);
        memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
 }
 
@@ -96,9 +66,8 @@ static int
 mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
                           uint32_t index)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
-       const int vf = priv->config.vf;
        unsigned int i;
+       int ret;
 
        MLX5_ASSERT(index < MLX5_MAX_MAC_ADDRESSES);
        if (rte_is_zero_ether_addr(mac)) {
@@ -116,14 +85,10 @@ mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
                rte_errno = EADDRINUSE;
                return -rte_errno;
        }
-       if (vf) {
-               int ret = mlx5_nl_mac_addr_add(priv->nl_socket_route,
-                                              mlx5_ifindex(dev), priv->mac_own,
-                                              mac, index);
+       ret = mlx5_os_mac_addr_add(dev, mac, index);
+       if (ret)
+               return ret;
 
-               if (ret)
-                       return ret;
-       }
        dev->data->mac_addrs[index] = *mac;
        return 0;
 }
@@ -210,8 +175,8 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
                        priv = rte_eth_devices[port_id].data->dev_private;
                        if (priv->master == 1) {
                                priv = dev->data->dev_private;
-                               return mlx5_nl_vf_mac_addr_modify
-                                      (priv->nl_socket_route,
+                               return mlx5_os_vf_mac_addr_modify
+                                      (priv,
                                        mlx5_ifindex(&rte_eth_devices[port_id]),
                                        mac_addr, priv->representor_id);
                        }