From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5D22BA0613 for ; Sat, 28 Sep 2019 04:55:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E7564C74; Sat, 28 Sep 2019 04:55:39 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id F3E8731FC; Sat, 28 Sep 2019 04:55:34 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Sep 2019 19:55:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,557,1559545200"; d="scan'208";a="215052763" Received: from npg-dpdk-cvl-yingwang-117d84.sh.intel.com ([10.67.117.96]) by fmsmga004.fm.intel.com with ESMTP; 27 Sep 2019 19:55:32 -0700 From: Ying Wang To: xiaolong.ye@intel.com, qi.z.zhang@intel.com Cc: dev@dpdk.org, qiming.yang@intel.com, ying.a.wang@intel.com, stable@dpdk.org Date: Sat, 28 Sep 2019 02:32:58 +0800 Message-Id: <20190927183258.44578-1-ying.a.wang@intel.com> X-Mailer: git-send-email 2.15.1 Subject: [dpdk-stable] [PATCH] net/ice: cleanup RSS/FDIR profile when device init X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The patch cleanup RSS/FDIR profile resources when device init to fix profile ID increase issue. Fixes: d7d150b93070 ("net/ice: enable RSS when device init") Cc: stable@dpdk.org Signed-off-by: Ying Wang --- --- This patch depends on the following patches in patchwork: (1) http://patchwork.dpdk.org/project/dpdk/list/?series=6557 (2) http://patches.dpdk.org/project/dpdk/list/?series=6579 (3) http://patches.dpdk.org/project/dpdk/list/?series=6577 --- drivers/net/ice/ice_ethdev.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 3abdaffbc..04102728f 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -13,6 +13,7 @@ #include "base/ice_sched.h" #include "base/ice_flow.h" #include "base/ice_dcb.h" +#include "base/ice_common.h" #include "ice_ethdev.h" #include "ice_rxtx.h" #include "ice_generic_flow.h" @@ -40,6 +41,7 @@ static const char * const ice_valid_args[] = { #define ICE_OS_DEFAULT_PKG_NAME "ICE OS Default Package" #define ICE_COMMS_PKG_NAME "ICE COMMS Package" #define ICE_MAX_PKG_FILENAME_SIZE 256 +#define ICE_MAX_RES_DESC_NUM 1024 int ice_logtype_init; int ice_logtype_driver; @@ -1851,6 +1853,113 @@ ice_vsi_config_sw_lldp(struct ice_vsi *vsi, bool on) return ret; } +static enum ice_status +ice_aq_get_res_profs(struct ice_hw *hw, uint16_t num_entries, + struct ice_aqc_get_allocd_res_desc_resp *resp_buf, + uint16_t buf_size, uint16_t res_type, + bool res_shared, uint16_t *desc_id, + struct ice_sq_cd *cd, uint16_t *num_prof) +{ + struct ice_aq_desc aq_desc; + int ret; + + struct ice_aqc_get_allocd_res_desc *cmd = + &aq_desc.params.get_res_desc; + + if (!resp_buf) + return ICE_ERR_PARAM; + + if (buf_size != (num_entries * sizeof(*resp_buf))) + return ICE_ERR_PARAM; + + ice_fill_dflt_direct_cmd_desc(&aq_desc, + ice_aqc_opc_get_allocd_res_desc); + + cmd->ops.cmd.res = CPU_TO_LE16(((res_type << ICE_AQC_RES_TYPE_S) & + ICE_AQC_RES_TYPE_M) | (res_shared ? + ICE_AQC_RES_TYPE_FLAG_SHARED : 0)); + cmd->ops.cmd.first_desc = CPU_TO_LE16(*desc_id); + ret = ice_aq_send_cmd(hw, &aq_desc, resp_buf, buf_size, cd); + if (!ret) { + *desc_id = LE16_TO_CPU(cmd->ops.resp.next_desc); + *num_prof = LE16_TO_CPU(cmd->ops.resp.num_desc); + } + return ret; +} + +static enum ice_status +ice_get_hw_res(struct ice_hw *hw, uint16_t type, uint16_t num, uint16_t *res, + uint16_t *prof_buf, uint16_t *num_prof) +{ + struct ice_aqc_get_allocd_res_desc_resp *resp_buf; + int ret; + uint16_t buf_len; + + buf_len = sizeof(*resp_buf) + sizeof(resp_buf->elem) * (num - 1); + resp_buf = (struct ice_aqc_get_allocd_res_desc_resp *) + ice_malloc(hw, buf_len); + if (!resp_buf) + return -ENOMEM; + + ret = ice_aq_get_res_profs(hw, num, resp_buf, buf_len, type, 1, + res, NULL, num_prof); + if (ret) + goto exit; + + ice_memcpy(prof_buf, resp_buf->elem, sizeof(resp_buf->elem) * + (*num_prof), ICE_NONDMA_TO_NONDMA); +exit: + rte_free(resp_buf); + return ret; +} + +static int +ice_clearup_resource(struct ice_hw *hw, uint16_t res_type) +{ + int ret; + uint16_t prof_id; + uint16_t prof_buf[ICE_MAX_RES_DESC_NUM]; + uint16_t first_desc = 1; + uint16_t num_prof = 0; + + ret = ice_get_hw_res(hw, res_type, ICE_MAX_RES_DESC_NUM, + &first_desc, prof_buf, &num_prof); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to get fxp resource"); + return ret; + } + + for (prof_id = 0; prof_id < num_prof; prof_id++) { + ret = ice_free_hw_res(hw, res_type, 1, &prof_buf[prof_id]); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to free fxp resource"); + return ret; + } + } + + return 0; +} + +static int +ice_reset_fxp_resource(struct ice_hw *hw) +{ + int ret; + + ret = ice_clearup_resource(hw, ICE_AQC_RES_TYPE_FD_PROF_BLDR_PROFID); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to clearup fdir resource"); + return ret; + } + + ret = ice_clearup_resource(hw, ICE_AQC_RES_TYPE_HASH_PROF_BLDR_PROFID); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to clearup rss resource"); + return ret; + } + + return 0; +} + static int ice_dev_init(struct rte_eth_dev *dev) { @@ -1983,6 +2092,12 @@ ice_dev_init(struct rte_eth_dev *dev) return ret; } + ret = ice_reset_fxp_resource(hw); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to reset fxp resource"); + return ret; + } + return 0; err_pf_setup: -- 2.15.1