From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 0C5B01B16A; Mon, 8 Jan 2018 14:18:40 +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 orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2018 05:18:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,330,1511856000"; d="scan'208";a="17565192" Received: from dpdk6.bj.intel.com ([172.16.182.87]) by FMSMGA003.fm.intel.com with ESMTP; 08 Jan 2018 05:18:38 -0800 From: Wei Dai To: wenzhuo.lu@intel.com, jingjing.wu@intel.com, yuan.peng@intel.com Cc: dev@dpdk.org, stable@dpdk.org, Wei Dai Date: Mon, 8 Jan 2018 21:02:30 +0800 Message-Id: <1515416551-28636-2-git-send-email-wei.dai@intel.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1515416551-28636-1-git-send-email-wei.dai@intel.com> References: <1515416551-28636-1-git-send-email-wei.dai@intel.com> Subject: [dpdk-stable] [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 13:18:44 -0000 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 = nb_rxq; nb_rxq = 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 = 0; queueid_t nb_rxq = 1; /**< Number of RX queues per port. */ queueid_t nb_txq = 1; /**< Number of TX queues per port. */ +queueid_t nb_rxq_bak = 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 = &ports[pid]; if (nb_rxq > port->dev_info.max_rx_queues) { 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 = nb_rxq_bak; return -1; } + nb_rxq_bak = 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