net/avf: enable MAC VLAN and promisc ops

 - promiscuous_enable
 - promiscuous_disable
 - allmulticast_enable
 - allmulticast_disable
 - mac_addr_add
 - mac_addr_remove
 - mac_addr_set
 - vlan_filter_set
 - vlan_offload_set

Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>

diff --git a/doc/guides/nics/features/avf.ini b/doc/guides/nics/features/avf.ini
index af84599..1dd6114 100644 (file)
--- a/doc/guides/nics/features/avf.ini
+++ b/doc/guides/nics/features/avf.ini
@@ -11,7 +11,12 @@ Queue start/stop     = Y
 Jumbo frame          = Y
 Scattered Rx         = Y
 TSO                  = Y
+Promiscuous mode     = Y
+Allmulticast mode    = Y
+Unicast MAC filter   = Y
+Multicast MAC filter = Y
 RSS hash             = Y
+VLAN filter          = Y
 CRC offload          = Y
 VLAN offload         = Y
 L3 checksum offload  = Y

diff --git a/drivers/net/avf/avf.h b/drivers/net/avf/avf.h
index 97ebbad..66986ea 100644 (file)
--- a/drivers/net/avf/avf.h
+++ b/drivers/net/avf/avf.h
@@ -203,4 +203,9 @@ int avf_dev_link_update(struct rte_eth_dev *dev,
                        __rte_unused int wait_to_complete);
 int avf_query_stats(struct avf_adapter *adapter,
                    struct virtchnl_eth_stats **pstats);
+int avf_config_promisc(struct avf_adapter *adapter, bool enable_unicast,
+                      bool enable_multicast);
+int avf_add_del_eth_addr(struct avf_adapter *adapter,
+                        struct ether_addr *addr, bool add);
+int avf_add_del_vlan(struct avf_adapter *adapter, uint16_t vlanid, bool add);
 #endif /* _AVF_ETHDEV_H_ */

diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
index f32d150..41869fc 100644 (file)
--- a/drivers/net/avf/avf_ethdev.c
+++ b/drivers/net/avf/avf_ethdev.c
@@ -42,6 +42,20 @@ static void avf_dev_info_get(struct rte_eth_dev *dev,
 static const uint32_t *avf_dev_supported_ptypes_get(struct rte_eth_dev *dev);
 static int avf_dev_stats_get(struct rte_eth_dev *dev,
                             struct rte_eth_stats *stats);
+static void avf_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static void avf_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static void avf_dev_allmulticast_enable(struct rte_eth_dev *dev);
+static void avf_dev_allmulticast_disable(struct rte_eth_dev *dev);
+static int avf_dev_add_mac_addr(struct rte_eth_dev *dev,
+                               struct ether_addr *addr,
+                               uint32_t index,
+                               uint32_t pool);
+static void avf_dev_del_mac_addr(struct rte_eth_dev *dev, uint32_t index);
+static int avf_dev_vlan_filter_set(struct rte_eth_dev *dev,
+                                  uint16_t vlan_id, int on);
+static int avf_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
+static void avf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
+                                        struct ether_addr *mac_addr);
 
 int avf_logtype_init;
 int avf_logtype_driver;
@@ -59,6 +73,14 @@ static const struct eth_dev_ops avf_eth_dev_ops = {
        .dev_supported_ptypes_get   = avf_dev_supported_ptypes_get,
        .link_update                = avf_dev_link_update,
        .stats_get                  = avf_dev_stats_get,
+       .promiscuous_enable         = avf_dev_promiscuous_enable,
+       .promiscuous_disable        = avf_dev_promiscuous_disable,
+       .allmulticast_enable        = avf_dev_allmulticast_enable,
+       .allmulticast_disable       = avf_dev_allmulticast_disable,
+       .mac_addr_add               = avf_dev_add_mac_addr,
+       .mac_addr_remove            = avf_dev_del_mac_addr,
+       .vlan_filter_set            = avf_dev_vlan_filter_set,
+       .vlan_offload_set           = avf_dev_vlan_offload_set,
        .rx_queue_start             = avf_dev_rx_queue_start,
        .rx_queue_stop              = avf_dev_rx_queue_stop,
        .tx_queue_start             = avf_dev_tx_queue_start,
@@ -67,6 +89,7 @@ static const struct eth_dev_ops avf_eth_dev_ops = {
        .rx_queue_release           = avf_dev_rx_queue_release,
        .tx_queue_setup             = avf_dev_tx_queue_setup,
        .tx_queue_release           = avf_dev_tx_queue_release,
+       .mac_addr_set               = avf_dev_set_default_mac_addr,
 };
 
 static int
@@ -480,6 +503,202 @@ avf_dev_link_update(struct rte_eth_dev *dev,
        return 0;
 }
 
+static void
+avf_dev_promiscuous_enable(struct rte_eth_dev *dev)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       int ret;
+
+       if (vf->promisc_unicast_enabled)
+               return;
+
+       ret = avf_config_promisc(adapter, TRUE, vf->promisc_multicast_enabled);
+       if (!ret)
+               vf->promisc_unicast_enabled = TRUE;
+}
+
+static void
+avf_dev_promiscuous_disable(struct rte_eth_dev *dev)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       int ret;
+
+       if (!vf->promisc_unicast_enabled)
+               return;
+
+       ret = avf_config_promisc(adapter, FALSE, vf->promisc_multicast_enabled);
+       if (!ret)
+               vf->promisc_unicast_enabled = FALSE;
+}
+
+static void
+avf_dev_allmulticast_enable(struct rte_eth_dev *dev)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       int ret;
+
+       if (vf->promisc_multicast_enabled)
+               return;
+
+       ret = avf_config_promisc(adapter, vf->promisc_unicast_enabled, TRUE);
+       if (!ret)
+               vf->promisc_multicast_enabled = TRUE;
+}
+
+static void
+avf_dev_allmulticast_disable(struct rte_eth_dev *dev)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       int ret;
+
+       if (!vf->promisc_multicast_enabled)
+               return;
+
+       ret = avf_config_promisc(adapter, vf->promisc_unicast_enabled, FALSE);
+       if (!ret)
+               vf->promisc_multicast_enabled = FALSE;
+}
+
+static int
+avf_dev_add_mac_addr(struct rte_eth_dev *dev, struct ether_addr *addr,
+                    __rte_unused uint32_t index,
+                    __rte_unused uint32_t pool)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       int err;
+
+       if (is_zero_ether_addr(addr)) {
+               PMD_DRV_LOG(ERR, "Invalid Ethernet Address");
+               return -EINVAL;
+       }
+
+       err = avf_add_del_eth_addr(adapter, addr, TRUE);
+       if (err) {
+               PMD_DRV_LOG(ERR, "fail to add MAC address");
+               return -EIO;
+       }
+
+       vf->mac_num++;
+
+       return 0;
+}
+
+static void
+avf_dev_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       struct ether_addr *addr;
+       int err;
+
+       addr = &dev->data->mac_addrs[index];
+
+       err = avf_add_del_eth_addr(adapter, addr, FALSE);
+       if (err)
+               PMD_DRV_LOG(ERR, "fail to delete MAC address");
+
+       vf->mac_num--;
+}
+
+static int
+avf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       int err;
+
+       if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN))
+               return -ENOTSUP;
+
+       err = avf_add_del_vlan(adapter, vlan_id, on);
+       if (err)
+               return -EIO;
+       return 0;
+}
+
+static int
+avf_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
+       int err;
+
+       if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN))
+               return -ENOTSUP;
+
+       /* Vlan stripping setting */
+       if (mask & ETH_VLAN_STRIP_MASK) {
+               /* Enable or disable VLAN stripping */
+               if (dev_conf->rxmode.hw_vlan_strip)
+                       err = avf_enable_vlan_strip(adapter);
+               else
+                       err = avf_disable_vlan_strip(adapter);
+       }
+
+       if (err)
+               return -EIO;
+       return 0;
+}
+
+static void
+avf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
+                            struct ether_addr *mac_addr)
+{
+       struct avf_adapter *adapter =
+               AVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct avf_hw *hw = AVF_DEV_PRIVATE_TO_HW(adapter);
+       struct ether_addr *perm_addr, *old_addr;
+       int ret;
+
+       old_addr = (struct ether_addr *)hw->mac.addr;
+       perm_addr = (struct ether_addr *)hw->mac.perm_addr;
+
+       if (is_same_ether_addr(mac_addr, old_addr))
+               return;
+
+       /* If the MAC address is configured by host, skip the setting */
+       if (is_valid_assigned_ether_addr(perm_addr))
+               return;
+
+       ret = avf_add_del_eth_addr(adapter, old_addr, FALSE);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Fail to delete old MAC:"
+                           " %02X:%02X:%02X:%02X:%02X:%02X",
+                           old_addr->addr_bytes[0],
+                           old_addr->addr_bytes[1],
+                           old_addr->addr_bytes[2],
+                           old_addr->addr_bytes[3],
+                           old_addr->addr_bytes[4],
+                           old_addr->addr_bytes[5]);
+
+       ret = avf_add_del_eth_addr(adapter, mac_addr, TRUE);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Fail to add new MAC:"
+                           " %02X:%02X:%02X:%02X:%02X:%02X",
+                           mac_addr->addr_bytes[0],
+                           mac_addr->addr_bytes[1],
+                           mac_addr->addr_bytes[2],
+                           mac_addr->addr_bytes[3],
+                           mac_addr->addr_bytes[4],
+                           mac_addr->addr_bytes[5]);
+
+       ether_addr_copy(mac_addr, (struct ether_addr *)hw->mac.addr);
+}
+
 static int
 avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {

diff --git a/drivers/net/avf/avf_vchnl.c b/drivers/net/avf/avf_vchnl.c
index e26527f..3b652bf 100644 (file)
--- a/drivers/net/avf/avf_vchnl.c
+++ b/drivers/net/avf/avf_vchnl.c
@@ -720,3 +720,93 @@ avf_query_stats(struct avf_adapter *adapter,
        *pstats = (struct virtchnl_eth_stats *)args.out_buffer;
        return 0;
 }
+
+int
+avf_config_promisc(struct avf_adapter *adapter,
+                  bool enable_unicast,
+                  bool enable_multicast)
+{
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       struct virtchnl_promisc_info promisc;
+       struct avf_cmd_info args;
+       int err;
+
+       promisc.flags = 0;
+       promisc.vsi_id = vf->vsi_res->vsi_id;
+
+       if (enable_unicast)
+               promisc.flags |= FLAG_VF_UNICAST_PROMISC;
+
+       if (enable_multicast)
+               promisc.flags |= FLAG_VF_MULTICAST_PROMISC;
+
+       args.ops = VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE;
+       args.in_args = (uint8_t *)&promisc;
+       args.in_args_size = sizeof(promisc);
+       args.out_buffer = vf->aq_resp;
+       args.out_size = AVF_AQ_BUF_SZ;
+
+       err = avf_execute_vf_cmd(adapter, &args);
+
+       if (err)
+               PMD_DRV_LOG(ERR,
+                           "fail to execute command CONFIG_PROMISCUOUS_MODE");
+       return err;
+}
+
+int
+avf_add_del_eth_addr(struct avf_adapter *adapter, struct ether_addr *addr,
+                    bool add)
+{
+       struct virtchnl_ether_addr_list *list;
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       uint8_t cmd_buffer[sizeof(struct virtchnl_ether_addr_list) +
+                          sizeof(struct virtchnl_ether_addr)];
+       struct avf_cmd_info args;
+       int err;
+
+       list = (struct virtchnl_ether_addr_list *)cmd_buffer;
+       list->vsi_id = vf->vsi_res->vsi_id;
+       list->num_elements = 1;
+       rte_memcpy(list->list[0].addr, addr->addr_bytes,
+                  sizeof(addr->addr_bytes));
+
+       args.ops = add ? VIRTCHNL_OP_ADD_ETH_ADDR : VIRTCHNL_OP_DEL_ETH_ADDR;
+       args.in_args = cmd_buffer;
+       args.in_args_size = sizeof(cmd_buffer);
+       args.out_buffer = vf->aq_resp;
+       args.out_size = AVF_AQ_BUF_SZ;
+       err = avf_execute_vf_cmd(adapter, &args);
+       if (err)
+               PMD_DRV_LOG(ERR, "fail to execute command %s",
+                           add ? "OP_ADD_ETH_ADDR" :  "OP_DEL_ETH_ADDR");
+       return err;
+}
+
+int
+avf_add_del_vlan(struct avf_adapter *adapter, uint16_t vlanid, bool add)
+{
+       struct virtchnl_vlan_filter_list *vlan_list;
+       struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
+       uint8_t cmd_buffer[sizeof(struct virtchnl_vlan_filter_list) +
+                                                       sizeof(uint16_t)];
+       struct avf_cmd_info args;
+       int err;
+
+       vlan_list = (struct virtchnl_vlan_filter_list *)cmd_buffer;
+       vlan_list->vsi_id = vf->vsi_res->vsi_id;
+       vlan_list->num_elements = 1;
+       vlan_list->vlan_id[0] = vlanid;
+
+       args.ops = add ? VIRTCHNL_OP_ADD_VLAN : VIRTCHNL_OP_DEL_VLAN;
+       args.in_args = cmd_buffer;
+       args.in_args_size = sizeof(cmd_buffer);
+       args.out_buffer = vf->aq_resp;
+       args.out_size = AVF_AQ_BUF_SZ;
+       err = avf_execute_vf_cmd(adapter, &args);
+       if (err)
+               PMD_DRV_LOG(ERR, "fail to execute command %s",
+                           add ? "OP_ADD_VLAN" :  "OP_DEL_VLAN");
+
+       return err;
+}