From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 983261B1BE; Mon, 8 Jan 2018 21:05:48 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2018 12:05:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,332,1511856000"; d="scan'208";a="17655778" Received: from irsmsx101.ger.corp.intel.com ([163.33.3.153]) by FMSMGA003.fm.intel.com with ESMTP; 08 Jan 2018 12:05:45 -0800 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.67]) by IRSMSX101.ger.corp.intel.com ([169.254.1.46]) with mapi id 14.03.0319.002; Mon, 8 Jan 2018 20:05:44 +0000 From: "Ananyev, Konstantin" To: "Dai, Wei" , "Lu, Wenzhuo" , "Wu, Jingjing" , "Peng, Yuan" CC: "dev@dpdk.org" , "stable@dpdk.org" , "Dai, Wei" Thread-Topic: [dpdk-dev] [PATCH 1/2] app/testpmd: fix invalid rxq number setting Thread-Index: AQHTiINHzCKWJtI+NkauA68zxXOKXKNqZkgw Date: Mon, 8 Jan 2018 20:05:44 +0000 Message-ID: <2601191342CEEE43887BDE71AB97725880E39CC9@irsmsx105.ger.corp.intel.com> References: <1515416551-28636-1-git-send-email-wei.dai@intel.com> <1515416551-28636-2-git-send-email-wei.dai@intel.com> In-Reply-To: <1515416551-28636-2-git-send-email-wei.dai@intel.com> Accept-Language: en-IE, 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: [163.33.239.181] 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: Mon, 08 Jan 2018 20:05:49 -0000 > -----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 setti= ng >=20 > 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. >=20 > Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") > Cc: stable@dpdk.org >=20 > 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(-) >=20 > 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 of TX queues per port. */ >=20 > +queueid_t nb_rxq_bak =3D 1; /**< Backup of last correct number of RX que= ues */ > + > /* > * 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) { Why not to add that check in the function handler for " port config ... rxq= ..." command itself? In that case you wouldn't need nb_rxq_bak at all. Konstantin > 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; >=20 > +extern queueid_t nb_rxq_bak; > + > extern uint16_t nb_rxd; > extern uint16_t nb_txd; >=20 > -- > 2.7.5