From patchwork Tue Sep 29 01:56:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simei Su X-Patchwork-Id: 79126 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 dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 382D5A04C0; Tue, 29 Sep 2020 04:03:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CFD8C1D8CB; Tue, 29 Sep 2020 04:02:50 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id D31831D59E for ; Tue, 29 Sep 2020 04:02:43 +0200 (CEST) IronPort-SDR: KoR3yQn21XxkY0unn7sxCx5mINBdKS98jz0PG0e3begqOIRBazL1kiMwAFJ5E0gGc5CS5ixFQI N8uhrZkc3SUw== X-IronPort-AV: E=McAfee;i="6000,8403,9758"; a="141498643" X-IronPort-AV: E=Sophos;i="5.77,316,1596524400"; d="scan'208";a="141498643" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2020 19:02:43 -0700 IronPort-SDR: KZlfr5R4OyU6eJM3aZmNSzuJOqTw/TecEXpOsxa42Q5/2d/tX+lXNdTm21u/0vAhqqMfLrZf2R 3J9XfiYUVigw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,316,1596524400"; d="scan'208";a="415204415" Received: from unknown (HELO npg-dpdk-cvl-simeisu-118d193.sh.intel.com) ([10.67.110.178]) by fmsmga001.fm.intel.com with ESMTP; 28 Sep 2020 19:02:41 -0700 From: Simei Su To: qi.z.zhang@intel.com, qiming.yang@intel.com Cc: dev@dpdk.org, haiyue.wang@intel.com, beilei.xing@intel.com, Simei Su Date: Tue, 29 Sep 2020 09:56:30 +0800 Message-Id: <20200929015632.109364-3-simei.su@intel.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200929015632.109364-1-simei.su@intel.com> References: <1599723455-353059-1-git-send-email-simei.su@intel.com> <20200929015632.109364-1-simei.su@intel.com> Subject: [dpdk-dev] [PATCH v2 2/4] net/ice: get PF VSI map X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch gets PF vsi number when issuing ACL rule in DCF. Signed-off-by: Simei Su --- drivers/net/ice/ice_dcf.c | 1 + drivers/net/ice/ice_dcf.h | 1 + drivers/net/ice/ice_dcf_parent.c | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 2d803c5..d20e2b3 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -318,6 +318,7 @@ ice_dcf_get_vf_vsi_map(struct ice_dcf_hw *hw) } hw->num_vfs = vsi_map->num_vfs; + hw->pf_vsi_id = vsi_map->pf_vsi; } if (!memcmp(hw->vf_vsi_map, vsi_map->vf_vsi, len)) { diff --git a/drivers/net/ice/ice_dcf.h b/drivers/net/ice/ice_dcf.h index a44a01e..ff02996 100644 --- a/drivers/net/ice/ice_dcf.h +++ b/drivers/net/ice/ice_dcf.h @@ -43,6 +43,7 @@ struct ice_dcf_hw { uint16_t num_vfs; uint16_t *vf_vsi_map; + uint16_t pf_vsi_id; struct virtchnl_version_info virtchnl_version; struct virtchnl_vf_resource *vf_res; /* VF resource */ diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c index c5dfdd3..30ead4c 100644 --- a/drivers/net/ice/ice_dcf_parent.c +++ b/drivers/net/ice/ice_dcf_parent.c @@ -78,6 +78,35 @@ ice_dcf_update_vf_vsi_map(struct ice_hw *hw, uint16_t num_vfs, ice_dcf_update_vsi_ctx(hw, vf_id, vf_vsi_map[vf_id]); } +static void +ice_dcf_update_pf_vsi_map(struct ice_hw *hw, uint16_t pf_vsi_idx, + uint16_t pf_vsi_num) +{ + struct ice_vsi_ctx *vsi_ctx; + + if (unlikely(pf_vsi_idx >= ICE_MAX_VSI)) { + PMD_DRV_LOG(ERR, "Invalid vsi handle %u", pf_vsi_idx); + return; + } + + vsi_ctx = hw->vsi_ctx[pf_vsi_idx]; + + if (!vsi_ctx) + vsi_ctx = ice_malloc(hw, sizeof(*vsi_ctx)); + + if (!vsi_ctx) { + PMD_DRV_LOG(ERR, "No memory for vsi context %u", + pf_vsi_idx); + return; + } + + vsi_ctx->vsi_num = pf_vsi_num; + hw->vsi_ctx[pf_vsi_idx] = vsi_ctx; + + PMD_DRV_LOG(DEBUG, "VF%u is assigned with vsi number %u", + pf_vsi_idx, vsi_ctx->vsi_num); +} + static void* ice_dcf_vsi_update_service_handler(void *param) { @@ -368,14 +397,18 @@ ice_dcf_init_parent_adapter(struct rte_eth_dev *eth_dev) } parent_adapter->active_pkg_type = ice_load_pkg_type(parent_hw); + parent_adapter->pf.main_vsi->idx = hw->num_vfs; + ice_dcf_update_pf_vsi_map(parent_hw, + parent_adapter->pf.main_vsi->idx, hw->pf_vsi_id); + + ice_dcf_update_vf_vsi_map(parent_hw, hw->num_vfs, hw->vf_vsi_map); + err = ice_flow_init(parent_adapter); if (err) { PMD_INIT_LOG(ERR, "Failed to initialize flow"); goto uninit_hw; } - ice_dcf_update_vf_vsi_map(parent_hw, hw->num_vfs, hw->vf_vsi_map); - mac = (const struct rte_ether_addr *)hw->avf.mac.addr; if (rte_is_valid_assigned_ether_addr(mac)) rte_ether_addr_copy(mac, &parent_adapter->pf.dev_addr);