From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 8D1F8354D; Fri, 12 Jan 2018 10:12:37 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jan 2018 01:12:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,348,1511856000"; d="scan'208";a="26577928" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga002.jf.intel.com with ESMTP; 12 Jan 2018 01:12:35 -0800 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 12 Jan 2018 01:12:35 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 12 Jan 2018 01:12:35 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.159]) with mapi id 14.03.0319.002; Fri, 12 Jan 2018 17:12:33 +0800 From: "Peng, Yuan" To: "Dai, Wei" , "Ananyev, Konstantin" , "Lu, Wenzhuo" , "Xing, Beilei" CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH v5 2/2] app/testpmd: fix invalid txq number setting Thread-Index: AQHTi38RgXXEzEUYOUWj74nJQyPMxaNv8/Fw Date: Fri, 12 Jan 2018 09:12:33 +0000 Message-ID: <67D543A150B29E4CAAE53918F64EDAEA3746DC6F@SHSMSX103.ccr.corp.intel.com> References: <1515646700-56892-1-git-send-email-wei.dai@intel.com> <1515744603-60457-1-git-send-email-wei.dai@intel.com> <1515744603-60457-3-git-send-email-wei.dai@intel.com> In-Reply-To: <1515744603-60457-3-git-send-email-wei.dai@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH v5 2/2] app/testpmd: fix invalid txq number setting 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: , X-List-Received-Date: Fri, 12 Jan 2018 09:12:38 -0000 Tested-by: Peng Yuan - Tested Branch: master - Tested commit 6c7001480ac6356ff0a4995f3ed495ed9c866061 - OS: 4.5.5-300.fc24.x86_64 - GCC: gcc version 5.3.1 20151207 (Red Hat 5.3.1-2) (GCC) - CPU: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz - NIC: Intel Corporation Device Fortville [8086:1572] - Default x86_64-native-linuxapp-gcc configuration - Prerequisites: - Total 1 cases, 1 passed, 0 failed - Case:=20 ./usertools/dpdk-devbind.py -b igb_uio 05:00:0 echo 1 >/sys/bus/pci/device= s/0000:05:00.0/max_vfs ./usertools/dpdk-devbind.py -b vfio-pci 05:02.0 pf: ./x86_64-native-linuxapp-gcc/app/testpmd -c f -n 4 -w 05:00.0,queue-num-pe= r-vf=3D4 --file-prefix=3Dtest1 --socket-mem 1024,1024 - -I vf: ./x86_64-native-linuxapp-gcc/app/testpmd -c f -n 4 -w 05:02.0 --file-prefi= x=3Dtest2 --socket-mem 1024,1024 - -i --rxq=3D4 --txq=3D4 EAL: Detected 88 lcore(s) EAL: Probing VFIO support... EAL: VFIO support initialized EAL: PCI device 0000:05:02.0 on NUMA socket 0 EAL: probe driver: 8086:154c net_i40e_vf EAL: using IOMMU type 1 (Type 1) Interactive-mode selected USER1: create a new mbuf pool : n=3D171456, size=3D217= 6, socket=3D0 USER1: create a new mbuf pool : n=3D171456, size=3D217= 6, socket=3D1 Configuring Port 0 (socket 0) Port 0: 7E:AC:58:44:3C:94 Ch= ecking link statuses... Done testpmd> port stop all Stopping ports... Checking link statuses... Done testpmd> port config all txq 5 Fail: input txq (5) can't be greater than max_tx_queues (4) of port 0 tes= tpmd> port config all rxq 5 Fail: input rxq (5) can't be greater than max_rx_queues (4) of port 0 tes= tpmd> port start all Port 0: 5A:19:E4:5C:A3:C7 Checking link statuses... Done testpmd> show port info all Current number of RX queues: 4 Max possible RX queues: 4 Current number of TX queues: 4 Max possible TX queues: 4 there is no core dump, and the actual queue number doesn't change. The case passed. -----Original Message----- From: Dai, Wei=20 Sent: Friday, January 12, 2018 4:10 PM To: Peng, Yuan ; Ananyev, Konstantin ; Lu, Wenzhuo ; Xing, Beilei Cc: dev@dpdk.org; Dai, Wei ; stable@dpdk.org Subject: [PATCH v5 2/2] app/testpmd: fix invalid txq number setting If an invalid number of TX queues is configured from testpmd run-time comma= nd like "port config all txq number" or from --txq in the command to start = testpmd, the global variable nb_txq is updated by this invalid value withou= t this patch. It may cause testpmd crash. This patch refuses invalid txq se= tting and keeps its last correct value. Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") Cc: stable@dpdk.org Signed-off-by: Wei Dai Acked-by: Konstantin Ananyev --- app/test-pmd/cmdline.c | 2 ++ app/test-pmd/parameters.c | 6 +++--- app/test-pmd/testpmd.c | 46 +++++++++++++++++++++++++++++++++++++++++++= +++ app/test-pmd/testpmd.h | 2 ++ 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index f0623b1.= .6619cb8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1527,6 +1527,8 @@ cmd_config_rx_tx_parsed(void *parsed_result, printf("Warning: Either rx or tx queues should be non zero\n"); return; } + if (check_nb_txq(res->value) !=3D 0) + return; nb_txq =3D res->value; } else if (!strcmp(res->name, "rxd")) { diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index c4= 6e734..ca2af65 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -932,12 +932,12 @@ launch_args_parse(int argc, char** argv) } if (!strcmp(lgopts[opt_idx].name, "txq")) { n =3D atoi(optarg); - if (n >=3D 0 && n <=3D (int) MAX_QUEUE_ID) + if (n >=3D 0 && check_nb_txq((queueid_t)n) =3D=3D 0) nb_txq =3D (queueid_t) n; else rte_exit(EXIT_FAILURE, "txq %d invalid - must be" - " >=3D 0 && <=3D %d\n", n, - (int) MAX_QUEUE_ID); + " >=3D 0 && <=3D %u\n", n, + get_allowed_max_nb_txq(&pid)); } if (!nb_rxq && !nb_txq) { rte_exit(EXIT_FAILURE, "Either rx or tx queues should " diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 4e8667d.= .493e028 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -586,6 +586,52 @@ check_nb_rxq(queueid_t rxq) return 0; } =20 +/* + * Get the allowed maximum number of TX queues. + * *pid return the port id which has minimal value of + * max_tx_queues in all ports. + */ +queueid_t +get_allowed_max_nb_txq(portid_t *pid) +{ + queueid_t allowed_max_txq =3D MAX_QUEUE_ID; + portid_t pi; + struct rte_eth_dev_info dev_info; + + RTE_ETH_FOREACH_DEV(pi) { + rte_eth_dev_info_get(pi, &dev_info); + if (dev_info.max_tx_queues < allowed_max_txq) { + allowed_max_txq =3D dev_info.max_tx_queues; + *pid =3D pi; + } + } + return allowed_max_txq; +} + +/* + * Check input txq is valid or not. + * If input txq is not greater than any of maximum number + * of TX queues of all ports, it is valid. + * if valid, return 0, else return -1 + */ +int +check_nb_txq(queueid_t txq) +{ + queueid_t allowed_max_txq; + portid_t pid =3D 0; + + allowed_max_txq =3D get_allowed_max_nb_txq(&pid); + if (txq > allowed_max_txq) { + printf("Fail: input txq (%u) can't be greater " + "than max_tx_queues (%u) of port %u\n", + txq, + allowed_max_txq, + pid); + return -1; + } + return 0; +} + static void init_config(void) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index e815509.= .fe40892 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -702,6 +702,8 @@ int new_socket_id(unsigned int socket_id); =20 queueid_t get_allowed_max_nb_rxq(portid_t *pid); int check_nb_rxq(queueid= _t rxq); +queueid_t get_allowed_max_nb_txq(portid_t *pid); int=20 +check_nb_txq(queueid_t txq); =20 /* * Work-around of a compilation error with ICC on invocations of the -- 2.7.5