From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id B5B491B01E; Wed, 10 Jan 2018 02:33:38 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2018 17:33:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,337,1511856000"; d="scan'208";a="22778072" Received: from kmsmsx153.gar.corp.intel.com ([172.21.73.88]) by orsmga001.jf.intel.com with ESMTP; 09 Jan 2018 17:33:35 -0800 Received: from pgsmsx112.gar.corp.intel.com ([169.254.3.86]) by KMSMSX153.gar.corp.intel.com ([169.254.5.41]) with mapi id 14.03.0319.002; Wed, 10 Jan 2018 09:33:34 +0800 From: "Dai, Wei" To: "Ananyev, Konstantin" , "Lu, Wenzhuo" , "Wu, Jingjing" , "Peng, Yuan" CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH 1/2] app/testpmd: fix invalid rxq number setting Thread-Index: AQHTiIM9Y3QrygViCE+hsEyWiv8HFKNp4P4AgAJw5qA= Date: Wed, 10 Jan 2018 01:33:33 +0000 Message-ID: <49759EB36A64CF4892C1AFEC9231E8D66CF20832@PGSMSX112.gar.corp.intel.com> References: <1515416551-28636-1-git-send-email-wei.dai@intel.com> <1515416551-28636-2-git-send-email-wei.dai@intel.com> <2601191342CEEE43887BDE71AB97725880E39CC9@irsmsx105.ger.corp.intel.com> In-Reply-To: <2601191342CEEE43887BDE71AB97725880E39CC9@irsmsx105.ger.corp.intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZjU0M2NkZjgtNGUzNy00N2U0LTg0NTktMGNiNDc3OTk5NTY2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6ImFCSE54eXp4anZ2VmxvMk82b3RGdFZ0RjhCUWVKYkljdkordmVreUcwcDA9In0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [172.30.20.206] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 1/2] app/testpmd: fix invalid rxq 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: Wed, 10 Jan 2018 01:33:39 -0000 > -----Original Message----- > From: Ananyev, Konstantin > Sent: Tuesday, January 9, 2018 4:06 AM > To: Dai, Wei ; Lu, Wenzhuo ; > Wu, Jingjing ; Peng, Yuan > Cc: dev@dpdk.org; stable@dpdk.org; Dai, Wei > Subject: RE: [dpdk-dev] [PATCH 1/2] app/testpmd: fix invalid rxq number > setting >=20 >=20 >=20 > > -----Original Message----- > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wei Dai > > Sent: Monday, January 8, 2018 1:03 PM > > To: Lu, Wenzhuo ; Wu, Jingjing > > ; Peng, Yuan > > Cc: dev@dpdk.org; stable@dpdk.org; Dai, Wei > > Subject: [dpdk-dev] [PATCH 1/2] app/testpmd: fix invalid rxq number > > setting > > > > If an invalid RX queue is configured from testpmd command like "port > > config all rxq number", the global variable rxq is updated by this > > invalid value. It may cause testpmd crash. > > This patch restores its last correct value when an invalid rxq number > > configured is detected. > > > > Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") > > Cc: stable@dpdk.org > > > > Signed-off-by: Wei Dai > > --- > > app/test-pmd/cmdline.c | 1 + > > app/test-pmd/testpmd.c | 10 ++++++++-- app/test-pmd/testpmd.h | > 2 > > ++ > > 3 files changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index > > f71d963..3f3986c 100644 > > --- a/app/test-pmd/cmdline.c > > +++ b/app/test-pmd/cmdline.c > > @@ -1501,6 +1501,7 @@ cmd_config_rx_tx_parsed(void *parsed_result, > > printf("Warning: Either rx or tx queues should be non zero\n"); > > return; > > } > > + nb_rxq_bak =3D nb_rxq; > > nb_rxq =3D res->value; > > } > > else if (!strcmp(res->name, "txq")) { diff --git > > a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index > > 47e145c..5939c88 100644 > > --- a/app/test-pmd/testpmd.c > > +++ b/app/test-pmd/testpmd.c > > @@ -188,6 +188,8 @@ uint8_t dcb_test =3D 0; queueid_t nb_rxq =3D 1; /*= *< > > Number of RX queues per port. */ queueid_t nb_txq =3D 1; /**< Number o= f > > TX queues per port. */ > > > > +queueid_t nb_rxq_bak =3D 1; /**< Backup of last correct number of RX > > +queues */ > > + > > /* > > * Configurable number of RX/TX ring descriptors. > > */ > > @@ -708,10 +710,14 @@ init_fwd_streams(void) > > port =3D &ports[pid]; > > if (nb_rxq > port->dev_info.max_rx_queues) { >=20 > Why not to add that check in the function handler for " port config ... r= xq ..." > command itself? > In that case you wouldn't need nb_rxq_bak at all. > Konstantin Thanks for your feedback, Konstantin. I see your point. If that check is added in the function handler of command= line, same loop code will be repeated. There are 2 ways to change nb_rxq: 1. with --rxq in the command line to start testpmd app to overwrite the def= ault value 1 2. with "port config all rxq number" in the testpmd run time command line How can your method correct an invalid input with --rxq in the command to s= tart testpm app ? By the way, my v1 patch has a bug in case of more than 1 port with differe= nt maximum number of Rx queues. For example, the max_rx_queues of port 0 is 8 and that of port 1 is 4. The previous valid rxq=3D4, if "port config all rxq 5" is run, The nb_rxq_bak is updated to 5, nb_rxq can't be restored to last correct v= alue 4 for port 1. I will fix bug in my v2 patch. =20 >=20 > > printf("Fail: nb_rxq(%d) is greater than " > > - "max_rx_queues(%d)\n", nb_rxq, > > - port->dev_info.max_rx_queues); > > + "max_rx_queues(%d), restore to backup " > > + "rxq number(%d)\n", nb_rxq, > > + port->dev_info.max_rx_queues, > > + nb_rxq_bak); > > + nb_rxq =3D nb_rxq_bak; > > return -1; > > } > > + nb_rxq_bak =3D nb_rxq; > > if (nb_txq > port->dev_info.max_tx_queues) { > > printf("Fail: nb_txq(%d) is greater than " > > "max_tx_queues(%d)\n", nb_txq, > > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index > > 4d7f27c..84246f7 100644 > > --- a/app/test-pmd/testpmd.h > > +++ b/app/test-pmd/testpmd.h > > @@ -391,6 +391,8 @@ extern uint64_t rss_hf; extern queueid_t nb_rxq; > > extern queueid_t nb_txq; > > > > +extern queueid_t nb_rxq_bak; > > + > > extern uint16_t nb_rxd; > > extern uint16_t nb_txd; > > > > -- > > 2.7.5