From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A5916429D0; Mon, 24 Apr 2023 04:23:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41725410EC; Mon, 24 Apr 2023 04:23:12 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 7C44D410DE for ; Mon, 24 Apr 2023 04:23:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682302990; x=1713838990; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BSn9TEOFXRotjufb3DRlE2PANPD4H92AVD0beR+SAUE=; b=G2uaq4iO0aSV1plb4JSy0t48srM89mgtTQTbFYqGqTaBN4sqV/SW62fm Tqbggl53mPlyjV2agW20PDw81tG7LnHDck3mv2U+PTpqsC3uyRxPiD0Th a/GABo6E1WMuYU8wEYrcS/5+WkTzSi79Kvi064MAOFQ4znnJ7loTeIybo cm+H0kuB8HZArXTMW8JrHAchq1u+kI4lanNKdAefPvh1iSEqdFttQOLh0 E0DUVge57pdMWgVbC9y5hyFk/vkRHqAmQGONYS2e2WTNbfRqTb2oRiXAQ OB/WrHdH5M91gQ616jw6HBNJlnjtqTHE7dhCJjuys7Y9nu9CAHZbLuyrE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="411617382" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="411617382" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 19:23:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="725529611" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="725529611" Received: from dpdk-mingxial-ice.sh.intel.com ([10.67.111.14]) by orsmga001.jf.intel.com with ESMTP; 23 Apr 2023 19:23:08 -0700 From: Mingxia Liu To: dev@dpdk.org Cc: jingjing.wu@intel.com, beilei.xing@intel.com, Mingxia Liu Subject: [PATCH v2] net/idpf: refine devargs parse functions Date: Mon, 24 Apr 2023 10:39:43 +0000 Message-Id: <20230424103943.64095-1-mingxia.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230421071456.297774-1-mingxia.liu@intel.com> References: <20230421071456.297774-1-mingxia.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 patch refines devargs parsing functions and use valid variable max_vport_nb to replace IDPF_MAX_VPORT_NUM. Signed-off-by: Mingxia Liu --- drivers/net/idpf/idpf_ethdev.c | 61 +++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index e02ec2ec5a..a8dd5a0a80 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -857,12 +857,6 @@ insert_value(struct idpf_devargs *devargs, uint16_t id) return 0; } - if (devargs->req_vport_nb >= RTE_DIM(devargs->req_vports)) { - PMD_INIT_LOG(ERR, "Total vport number can't be > %d", - IDPF_MAX_VPORT_NUM); - return -EINVAL; - } - devargs->req_vports[devargs->req_vport_nb] = id; devargs->req_vport_nb++; @@ -879,12 +873,10 @@ parse_range(const char *value, struct idpf_devargs *devargs) result = sscanf(value, "%hu%n-%hu%n", &lo, &n, &hi, &n); if (result == 1) { - if (lo >= IDPF_MAX_VPORT_NUM) - return NULL; if (insert_value(devargs, lo) != 0) return NULL; } else if (result == 2) { - if (lo > hi || hi >= IDPF_MAX_VPORT_NUM) + if (lo > hi) return NULL; for (i = lo; i <= hi; i++) { if (insert_value(devargs, i) != 0) @@ -969,40 +961,46 @@ idpf_parse_devargs(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adap return -EINVAL; } + ret = rte_kvargs_process(kvlist, IDPF_VPORT, &parse_vport, + idpf_args); + if (ret != 0) + goto fail; + + ret = rte_kvargs_process(kvlist, IDPF_TX_SINGLE_Q, &parse_bool, + &adapter->base.is_tx_singleq); + if (ret != 0) + goto fail; + + ret = rte_kvargs_process(kvlist, IDPF_RX_SINGLE_Q, &parse_bool, + &adapter->base.is_rx_singleq); + if (ret != 0) + goto fail; + /* check parsed devargs */ if (adapter->cur_vport_nb + idpf_args->req_vport_nb > - IDPF_MAX_VPORT_NUM) { + adapter->max_vport_nb) { PMD_INIT_LOG(ERR, "Total vport number can't be > %d", - IDPF_MAX_VPORT_NUM); + adapter->max_vport_nb); ret = -EINVAL; - goto bail; + goto fail; } for (i = 0; i < idpf_args->req_vport_nb; i++) { + if (idpf_args->req_vports[i] > adapter->max_vport_nb - 1) { + PMD_INIT_LOG(ERR, "Invalid vport id %d, it should be 0 ~ %d", + idpf_args->req_vports[i], adapter->max_vport_nb - 1); + ret = -EINVAL; + goto fail; + } if (adapter->cur_vports & RTE_BIT32(idpf_args->req_vports[i])) { - PMD_INIT_LOG(ERR, "Vport %d has been created", + PMD_INIT_LOG(ERR, "Vport %d has been requested", idpf_args->req_vports[i]); ret = -EINVAL; - goto bail; + goto fail; } } - ret = rte_kvargs_process(kvlist, IDPF_VPORT, &parse_vport, - idpf_args); - if (ret != 0) - goto bail; - - ret = rte_kvargs_process(kvlist, IDPF_TX_SINGLE_Q, &parse_bool, - &adapter->base.is_tx_singleq); - if (ret != 0) - goto bail; - - ret = rte_kvargs_process(kvlist, IDPF_RX_SINGLE_Q, &parse_bool, - &adapter->base.is_rx_singleq); - if (ret != 0) - goto bail; - -bail: +fail: rte_kvargs_free(kvlist); return ret; } @@ -1152,7 +1150,8 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *a rte_eal_alarm_set(IDPF_ALARM_INTERVAL, idpf_dev_alarm_handler, adapter); - adapter->max_vport_nb = adapter->base.caps.max_vports; + adapter->max_vport_nb = adapter->base.caps.max_vports > IDPF_MAX_VPORT_NUM ? + IDPF_MAX_VPORT_NUM : adapter->base.caps.max_vports; adapter->vports = rte_zmalloc("vports", adapter->max_vport_nb * -- 2.34.1