[v6,3/4] net/ice: add support for add/remove mac addr by DCF

Message ID 20220302063052.347122-4-ke1x.zhang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series ice repr functions by DCF |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Zhang, Ke1X March 2, 2022, 6:30 a.m. UTC
  allow to add/remove VF's mac addr over VF0.
this feature need to update ice kernel driver (newer than v1.8.0)

Signed-off-by: Ke Zhang <ke1x.zhang@intel.com>
---
 drivers/net/ice/ice_dcf_ethdev.h         |  1 +
 drivers/net/ice/ice_dcf_vf_representor.c | 81 +++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
  

Patch

diff --git a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h
index 11a1305038..ea5c020d61 100644
--- a/drivers/net/ice/ice_dcf_ethdev.h
+++ b/drivers/net/ice/ice_dcf_ethdev.h
@@ -50,6 +50,7 @@  struct ice_dcf_vf_repr {
 	struct rte_ether_addr mac_addr;
 	uint16_t switch_domain_id;
 	uint16_t vf_id;
+	uint16_t mac_num;	  /* Number of MAC addresses */
 
 	struct ice_dcf_vlan outer_vlan_info; /* DCF always handle outer VLAN */
 };
diff --git a/drivers/net/ice/ice_dcf_vf_representor.c b/drivers/net/ice/ice_dcf_vf_representor.c
index 765f5d4c95..8a387461c4 100644
--- a/drivers/net/ice/ice_dcf_vf_representor.c
+++ b/drivers/net/ice/ice_dcf_vf_representor.c
@@ -159,7 +159,7 @@  ice_dcf_vf_repr_dev_info_get(struct rte_eth_dev *dev,
 		return -EIO;
 
 	dev_info->device = dev->device;
-	dev_info->max_mac_addrs = 1;
+	dev_info->max_mac_addrs = ICE_NUM_MACADDR_MAX;
 	dev_info->max_rx_queues = dcf_hw->vsi_res->num_queue_pairs;
 	dev_info->max_tx_queues = dcf_hw->vsi_res->num_queue_pairs;
 	dev_info->min_rx_bufsize = ICE_BUF_SIZE_MIN;
@@ -536,6 +536,82 @@  ice_dcf_vf_repr_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 	}
 	return ret;
 }
+static int
+ice_dcf_repr_add_del_eth_addr(struct ice_dcf_hw *hw,
+			uint16_t vf_id,
+			struct rte_ether_addr *addr,
+			bool add, uint8_t type)
+{
+	struct virtchnl_ether_addr_list *list;
+	struct dcf_virtchnl_cmd args;
+	uint8_t cmd_buffer[sizeof(struct virtchnl_ether_addr_list) +
+			   sizeof(struct virtchnl_ether_addr)];
+	int err;
+
+	list = (struct virtchnl_ether_addr_list *)cmd_buffer;
+	list->vsi_id = hw->vf_vsi_map[vf_id] & ~VIRTCHNL_DCF_VF_VSI_VALID;
+	list->num_elements = 1;
+	list->list[0].type = type;
+	rte_memcpy(list->list[0].addr, addr->addr_bytes,
+	    sizeof(addr->addr_bytes));
+
+	args.v_op = add ? VIRTCHNL_OP_ADD_ETH_ADDR : VIRTCHNL_OP_DEL_ETH_ADDR;
+	args.req_msg = cmd_buffer;
+	args.req_msglen = sizeof(cmd_buffer);
+
+	err = ice_dcf_execute_virtchnl_cmd(hw, &args);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Fail to execute command %s",
+			    add ? "OP_ADD_ETH_ADDR" :  "OP_DEL_ETH_ADDR");
+		return err;
+	}
+
+	return 0;
+}
+
+static int
+ice_dcf_vf_repr_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *addr,
+		     __rte_unused uint32_t index,
+		     __rte_unused uint32_t pool)
+{
+	struct ice_dcf_vf_repr *repr = dev->data->dev_private;
+	struct ice_dcf_hw *hw = ice_dcf_vf_repr_hw(repr);
+	int err;
+
+	if (rte_is_zero_ether_addr(addr)) {
+		PMD_DRV_LOG(ERR, "Invalid Ethernet Address");
+		return -EINVAL;
+	}
+
+	err = ice_dcf_repr_add_del_eth_addr(hw, repr->vf_id, addr, true, VIRTCHNL_ETHER_ADDR_EXTRA);
+	if (err) {
+		PMD_DRV_LOG(ERR, "fail to add MAC address");
+		return -EIO;
+	}
+
+	repr->mac_num++;
+
+	return 0;
+}
+
+static void
+ice_dcf_vf_repr_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)
+{
+	struct ice_dcf_vf_repr *repr = dev->data->dev_private;
+	struct ice_dcf_hw *hw = ice_dcf_vf_repr_hw(repr);
+	struct rte_ether_addr *addr;
+	int err;
+
+	addr = &dev->data->mac_addrs[index];
+
+	err = ice_dcf_repr_add_del_eth_addr(hw, repr->vf_id, addr,
+					false, VIRTCHNL_ETHER_ADDR_EXTRA);
+	if (err)
+		PMD_DRV_LOG(ERR, "fail to del MAC address");
+
+	repr->mac_num--;
+}
+
 static const struct eth_dev_ops ice_dcf_vf_repr_dev_ops = {
 	.dev_configure        = ice_dcf_vf_repr_dev_configure,
 	.dev_start            = ice_dcf_vf_repr_dev_start,
@@ -554,6 +630,8 @@  static const struct eth_dev_ops ice_dcf_vf_repr_dev_ops = {
 	.vlan_tpid_set        = ice_dcf_vf_repr_vlan_tpid_set,
 	.stats_reset          = ice_dcf_vf_repr_stats_reset,
 	.stats_get            = ice_dcf_vf_repr_stats_get,
+	.mac_addr_add         = ice_dcf_vf_repr_add_mac_addr,
+	.mac_addr_remove      = ice_dcf_vf_repr_del_mac_addr,
 };
 
 int
@@ -568,6 +646,7 @@  ice_dcf_vf_repr_init(struct rte_eth_dev *vf_rep_eth_dev, void *init_param)
 	repr->outer_vlan_info.port_vlan_ena = false;
 	repr->outer_vlan_info.stripping_ena = false;
 	repr->outer_vlan_info.tpid = RTE_ETHER_TYPE_VLAN;
+	repr->mac_num = 1;
 
 	vf_rep_eth_dev->dev_ops = &ice_dcf_vf_repr_dev_ops;