From patchwork Thu Jan 27 09:03:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Ke1X" X-Patchwork-Id: 106601 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E918FA0350; Thu, 27 Jan 2022 10:06:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8EB142779; Thu, 27 Jan 2022 10:06:23 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 19BC34067C for ; Thu, 27 Jan 2022 10:06:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643274382; x=1674810382; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=392ZRvCGm0tbkLcXmYjE4As8fZTb8EYg/gaw/aVk3pA=; b=RnQdraA/nGDNXf12sCrwtKMlH4Xg4DPAf03dBDOX/zmFtd2YBfuxT8wb lmBLRyngPiLUjbfA3UxX+JD0EwcTAXmYtWxwg9AdylntI0Ofgv4xTgNsb Ql7o6yiIs2vEbmXpm2UiVd/xfKZV7TDK+mEqALYYqveZPYbiVNBG5xXf5 6o1tkkxSW7n6Wrlo7hU1pEMouT+E7ALw3sJVwgP4RhbsX+NY762jcrpAI 9N8NDtjhQGvxDFOciQzD+rogZLReXhaq+VHBDPYmEI/a0T8+qJtDqMzk6 G9cyR7zfLjpkvjyvoBMN+eUW62cQP/wzjoIsredZiltCIvZG99+9g1aO+ g==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="271249348" X-IronPort-AV: E=Sophos;i="5.88,320,1635231600"; d="scan'208";a="271249348" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 01:06:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,320,1635231600"; d="scan'208";a="521144064" Received: from intel-corei7-64.sh.intel.com (HELO localhost.localdomain) ([10.239.251.104]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 01:06:18 -0800 From: Ke Zhang To: qiming.yang@intel.com, qi.z.zhang@intel.com Cc: dev@dpdk.org Subject: [DPDK 3/3] net/ice: Add / Remove VF mac address on DCF representor Date: Thu, 27 Jan 2022 09:03:12 +0000 Message-Id: <20220127090312.371891-1-ke1x.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org this feature need to update ice kernel driver (newer than v1.8.0_3) Signed-off-by: Ke Zhang --- drivers/net/ice/ice_dcf_ethdev.h | 1 + drivers/net/ice/ice_dcf_vf_representor.c | 81 +++++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h index 8510e37119..b1bdf39a74 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 bb353fb45f..9df3553508 100644 --- a/drivers/net/ice/ice_dcf_vf_representor.c +++ b/drivers/net/ice/ice_dcf_vf_representor.c @@ -136,7 +136,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; @@ -513,6 +513,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 int ice_dcf_add_del_vlan_v2(struct rte_eth_dev *dev, uint16_t vlanid, bool add) { @@ -581,6 +657,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, .vlan_filter_set = ice_dcf_vf_repr_vlan_filter_set, }; @@ -596,6 +674,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;