From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <yuan.peng@intel.com>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
by dpdk.org (Postfix) with ESMTP id 79CFE44BE;
Fri, 12 Jan 2018 10:09:31 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
12 Jan 2018 01:09:30 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.46,348,1511856000"; d="scan'208";a="194397451"
Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204])
by fmsmga006.fm.intel.com with ESMTP; 12 Jan 2018 01:09:30 -0800
Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by
FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS)
id 14.3.319.2; Fri, 12 Jan 2018 01:09:30 -0800
Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by
fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS)
id 14.3.319.2; Fri, 12 Jan 2018 01:09:29 -0800
Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by
SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002;
Fri, 12 Jan 2018 17:09:27 +0800
From: "Peng, Yuan" <yuan.peng@intel.com>
To: "Dai, Wei" <wei.dai@intel.com>, "Ananyev, Konstantin"
<konstantin.ananyev@intel.com>, "Lu, Wenzhuo" <wenzhuo.lu@intel.com>, "Xing,
Beilei" <beilei.xing@intel.com>
CC: "dev@dpdk.org" <dev@dpdk.org>, "stable@dpdk.org" <stable@dpdk.org>
Thread-Topic: [PATCH v5 1/2] app/testpmd: fix invalid rxq number setting
Thread-Index: AQHTi38RBdL5nyBDGEufYnPTa+eulqNv8xTQ
Date: Fri, 12 Jan 2018 09:09:27 +0000
Message-ID: <67D543A150B29E4CAAE53918F64EDAEA3746DC53@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-2-git-send-email-wei.dai@intel.com>
In-Reply-To: <1515744603-60457-2-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-dev] [PATCH v5 1/2] app/testpmd: fix invalid rxq number
setting
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jan 2018 09:09:32 -0000
Tested-by: Peng Yuan<yuan.peng@intel.com>
- 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 <mbuf_pool_socket_0>: n=3D171456, size=3D217=
6, socket=3D0
USER1: create a new mbuf pool <mbuf_pool_socket_1>: 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 <yuan.peng@intel.com>; Ananyev, Konstantin <konstantin.anany=
ev@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>; Xing, Beilei <beilei.xin=
g@intel.com>
Cc: dev@dpdk.org; Dai, Wei <wei.dai@intel.com>; stable@dpdk.org
Subject: [PATCH v5 1/2] app/testpmd: fix invalid rxq number setting
If an invalid number of RX queues is configured from testpmd run-time comma=
nd like "port config all rxq number" or from --rxq in the command to start =
testpmd, the global variable nb_rxq is updated by this invalid value withou=
t this patch. It may cause testpmd crash. This patch refuses invalid rxq 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 <wei.dai@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
app/test-pmd/cmdline.c | 2 ++
app/test-pmd/parameters.c | 7 ++++---
app/test-pmd/testpmd.c | 46 +++++++++++++++++++++++++++++++++++++++++++=
+++
app/test-pmd/testpmd.h | 3 +++
4 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 5b2e2ef.=
.f0623b1 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1518,6 +1518,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_rxq(res->value) !=3D 0)
+ return;
nb_rxq =3D res->value;
}
else if (!strcmp(res->name, "txq")) {
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 30=
4b98d..c46e734 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -536,6 +536,7 @@ launch_args_parse(int argc, char** argv)
int n, opt;
char **argvopt;
int opt_idx;
+ portid_t pid;
enum { TX, RX };
=20
static struct option lgopts[] =3D {
@@ -922,12 +923,12 @@ launch_args_parse(int argc, char** argv)
rss_hf =3D ETH_RSS_UDP;
if (!strcmp(lgopts[opt_idx].name, "rxq")) {
n =3D atoi(optarg);
- if (n >=3D 0 && n <=3D (int) MAX_QUEUE_ID)
+ if (n >=3D 0 && check_nb_rxq((queueid_t)n) =3D=3D 0)
nb_rxq =3D (queueid_t) n;
else
rte_exit(EXIT_FAILURE, "rxq %d invalid - must be"
- " >=3D 0 && <=3D %d\n", n,
- (int) MAX_QUEUE_ID);
+ " >=3D 0 && <=3D %u\n", n,
+ get_allowed_max_nb_rxq(&pid));
}
if (!strcmp(lgopts[opt_idx].name, "txq")) {
n =3D atoi(optarg);
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 9414d0e.=
.4e8667d 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -540,6 +540,52 @@ check_socket_id(const unsigned int socket_id)
return 0;
}
=20
+/*
+ * Get the allowed maximum number of RX queues.
+ * *pid return the port id which has minimal value of
+ * max_rx_queues in all ports.
+ */
+queueid_t
+get_allowed_max_nb_rxq(portid_t *pid)
+{
+ queueid_t allowed_max_rxq =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_rx_queues < allowed_max_rxq) {
+ allowed_max_rxq =3D dev_info.max_rx_queues;
+ *pid =3D pi;
+ }
+ }
+ return allowed_max_rxq;
+}
+
+/*
+ * Check input rxq is valid or not.
+ * If input rxq is not greater than any of maximum number
+ * of RX queues of all ports, it is valid.
+ * if valid, return 0, else return -1
+ */
+int
+check_nb_rxq(queueid_t rxq)
+{
+ queueid_t allowed_max_rxq;
+ portid_t pid =3D 0;
+
+ allowed_max_rxq =3D get_allowed_max_nb_rxq(&pid);
+ if (rxq > allowed_max_rxq) {
+ printf("Fail: input rxq (%u) can't be greater "
+ "than max_rx_queues (%u) of port %u\n",
+ rxq,
+ allowed_max_rxq,
+ 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 2a266fd.=
.e815509 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -700,6 +700,9 @@ enum print_warning { int port_id_is_invalid(portid_t p=
ort_id, enum print_warning warning); int new_socket_id(unsigned int socket=
_id);
=20
+queueid_t get_allowed_max_nb_rxq(portid_t *pid); int=20
+check_nb_rxq(queueid_t rxq);
+
/*
* Work-around of a compilation error with ICC on invocations of the
* rte_be_to_cpu_16() function.
--
2.7.5