From patchwork Wed Jul 10 03:54:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 56280 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6EB691B970; Wed, 10 Jul 2019 05:52:09 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id A93EE3195; Wed, 10 Jul 2019 05:52:06 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 20:52:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,473,1557212400"; d="scan'208";a="364348422" Received: from dpdk51.sh.intel.com ([10.67.110.245]) by fmsmga005.fm.intel.com with ESMTP; 09 Jul 2019 20:52:03 -0700 From: Qi Zhang To: qiming.yang@intel.com, wenzhuo.lu@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Date: Wed, 10 Jul 2019 11:54:33 +0800 Message-Id: <20190710035434.6393-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH 1/2] net/ice: remove unused devargs 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" Remove devarg "max_queue_pair_num" related code since it is not complete implemented. Fixes: f9cf4f864150 ("net/ice: support device initialization") Cc: stable@dpdk.org Signed-off-by: Qi Zhang --- doc/guides/nics/ice.rst | 8 ------ drivers/net/ice/ice_ethdev.c | 66 ++------------------------------------------ 2 files changed, 3 insertions(+), 71 deletions(-) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 666b1b272..e9b3a48bc 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -49,14 +49,6 @@ Please note that enabling debugging options may affect system performance. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ -- ``Maximum Number of Queue Pairs`` - - The maximum number of queue pairs is decided by HW. If not configured, APP - uses the number from HW. Users can check the number by calling the API - ``rte_eth_dev_info_get``. - If users want to limit the number of queues, they can set a smaller number - using EAL parameter like ``max_queue_pair_num=n``. - Driver compilation and testing ------------------------------ diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 9ce730cd4..4b5cd8269 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -17,7 +17,6 @@ #include "ice_rxtx.h" #include "ice_switch_filter.h" -#define ICE_MAX_QP_NUM "max_queue_pair_num" #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100 #define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg" @@ -251,59 +250,6 @@ ice_init_controlq_parameter(struct ice_hw *hw) } static int -ice_check_qp_num(const char *key, const char *qp_value, - __rte_unused void *opaque) -{ - char *end = NULL; - int num = 0; - - while (isblank(*qp_value)) - qp_value++; - - num = strtoul(qp_value, &end, 10); - - if (!num || (*end == '-') || errno) { - PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", " - "value must be > 0", - qp_value, key); - return -1; - } - - return num; -} - -static int -ice_config_max_queue_pair_num(struct rte_devargs *devargs) -{ - struct rte_kvargs *kvlist; - const char *queue_num_key = ICE_MAX_QP_NUM; - int ret; - - if (!devargs) - return 0; - - kvlist = rte_kvargs_parse(devargs->args, NULL); - if (!kvlist) - return 0; - - if (!rte_kvargs_count(kvlist, queue_num_key)) { - rte_kvargs_free(kvlist); - return 0; - } - - if (rte_kvargs_process(kvlist, queue_num_key, - ice_check_qp_num, NULL) < 0) { - rte_kvargs_free(kvlist); - return 0; - } - ret = rte_kvargs_process(kvlist, queue_num_key, - ice_check_qp_num, NULL); - rte_kvargs_free(kvlist); - - return ret; -} - -static int ice_res_pool_init(struct ice_res_pool_info *pool, uint32_t base, uint32_t num) { @@ -1128,13 +1074,9 @@ ice_pf_sw_init(struct rte_eth_dev *dev) struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct ice_hw *hw = ICE_PF_TO_HW(pf); - if (ice_config_max_queue_pair_num(dev->device->devargs) > 0) - pf->lan_nb_qp_max = - ice_config_max_queue_pair_num(dev->device->devargs); - else - pf->lan_nb_qp_max = - (uint16_t)RTE_MIN(hw->func_caps.common_cap.num_txq, - hw->func_caps.common_cap.num_rxq); + pf->lan_nb_qp_max = + (uint16_t)RTE_MIN(hw->func_caps.common_cap.num_txq, + hw->func_caps.common_cap.num_rxq); pf->lan_nb_qps = pf->lan_nb_qp_max; @@ -3751,8 +3693,6 @@ static struct rte_pci_driver rte_ice_pmd = { RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map); RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); -RTE_PMD_REGISTER_PARAM_STRING(net_ice, - ICE_MAX_QP_NUM "="); RTE_INIT(ice_init_log) { From patchwork Wed Jul 10 03:54:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 56281 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D7B831B99B; Wed, 10 Jul 2019 05:52:11 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id B8D834C94 for ; Wed, 10 Jul 2019 05:52:07 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 20:52:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,473,1557212400"; d="scan'208";a="364348426" Received: from dpdk51.sh.intel.com ([10.67.110.245]) by fmsmga005.fm.intel.com with ESMTP; 09 Jul 2019 20:52:04 -0700 From: Qi Zhang To: qiming.yang@intel.com, wenzhuo.lu@intel.com Cc: dev@dpdk.org, Qi Zhang Date: Wed, 10 Jul 2019 11:54:34 +0800 Message-Id: <20190710035434.6393-2-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20190710035434.6393-1-qi.z.zhang@intel.com> References: <20190710035434.6393-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH 2/2] net/ice: add safe mode support devarg 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" Safe mode support is not necessary by default. Driver be initialized without OS package silently may confuse users since most advanced feature are disabled. Add devarg for safe mode enabling only for when user intend to do this. Signed-off-by: Qi Zhang --- doc/guides/nics/ice.rst | 10 +++++++ drivers/net/ice/ice_ethdev.c | 63 +++++++++++++++++++++++++++++++++++++++++++- drivers/net/ice/ice_ethdev.h | 8 ++++++ 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index e9b3a48bc..a29d17c83 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -49,6 +49,16 @@ Please note that enabling debugging options may affect system performance. Runtime Config Options ~~~~~~~~~~~~~~~~~~~~~~ +- ``Safe Mode Support`` (default ``0``) + + If driver failed to load OS package, by default driver's initialization failed. + But if user intend to use the device in safe mode, user can use ``devargs`` + parameter ``safe-mode-support``. For example:: + + -w 80:00.0,safe-mode-support=1 + + NOTE: In Safe mode, only very limited features are available, features like RSS, + checksum, fdir, tunneling ... are all disabled. Driver compilation and testing ------------------------------ diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 4b5cd8269..c348b2956 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -17,6 +17,14 @@ #include "ice_rxtx.h" #include "ice_switch_filter.h" +/* devargs */ +#define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" + +static const char * const ice_valid_args[] = { + ICE_SAFE_MODE_SUPPORT_ARG, + NULL +}; + #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100 #define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg" @@ -1334,6 +1342,50 @@ ice_base_queue_get(struct ice_pf *pf) } static int +parse_bool(const char *key, const char *value, void *args) +{ + int *i = (int *)args; + char *end; + int num; + + num = strtoul(value, &end, 10); + + if (num != 0 || num != 1) { + PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", " + "value must be 0 or 1", + value, key); + return -1; + } + + *i = num; + return 0; +} + +static int ice_parse_devargs(struct rte_eth_dev *dev) +{ + struct ice_adapter *ad = + ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct rte_devargs *devargs = dev->device->devargs; + struct rte_kvargs *kvlist; + int ret; + + if (devargs == NULL) + return 0; + + kvlist = rte_kvargs_parse(devargs->args, ice_valid_args); + if (kvlist == NULL) { + PMD_INIT_LOG(ERR, "Invalid kvargs key\n"); + return -EINVAL; + } + + ret = rte_kvargs_process(kvlist, ICE_SAFE_MODE_SUPPORT_ARG, + &parse_bool, &ad->devargs.safe_mode_support); + + rte_kvargs_free(kvlist); + return ret; +} + +static int ice_dev_init(struct rte_eth_dev *dev) { struct rte_pci_device *pci_dev; @@ -1366,6 +1418,7 @@ ice_dev_init(struct rte_eth_dev *dev) hw->bus.device = pci_dev->addr.devid; hw->bus.func = pci_dev->addr.function; + ice_parse_devargs(dev); ice_init_controlq_parameter(hw); ret = ice_init_hw(hw); @@ -1376,8 +1429,14 @@ ice_dev_init(struct rte_eth_dev *dev) ret = ice_load_pkg(dev); if (ret) { + if (ad->devargs.safe_mode_support == 0) { + PMD_INIT_LOG(ERR, "Failed to load the DDP package," + "Use --safe-mode-support=1 to enter Safe Mode"); + return ret; + } + PMD_INIT_LOG(WARNING, "Failed to load the DDP package," - "Entering Safe Mode"); + "Entering Safe Mode"); ad->is_safe_mode = 1; } @@ -3693,6 +3752,8 @@ static struct rte_pci_driver rte_ice_pmd = { RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map); RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); +RTE_PMD_REGISTER_PARAM_STRING(net_ice, + ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"); RTE_INIT(ice_init_log) { diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index 8a52239f5..f569da833 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -274,6 +274,13 @@ struct ice_pf { }; /** + * Cache devargs parse result. + */ +struct ice_devargs { + int safe_mode_support; +}; + +/** * Structure to store private data for each PF/VF instance. */ struct ice_adapter { @@ -286,6 +293,7 @@ struct ice_adapter { /* ptype mapping table */ uint32_t ptype_tbl[ICE_MAX_PKT_TYPE] __rte_cache_min_aligned; bool is_safe_mode; + struct ice_devargs devargs; }; struct ice_vsi_vlan_pvid_info {