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 8AE241B16B; Wed, 10 Jan 2018 09:57:07 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jan 2018 00:57:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,339,1511856000"; d="scan'208";a="8652366" Received: from dpdk6.bj.intel.com ([172.16.182.87]) by fmsmga008.fm.intel.com with ESMTP; 10 Jan 2018 00:57:05 -0800 From: Wei Dai To: konstantin.ananyev@intel.com, qiming.yang@intel.com, yuan.peng@intel.com, wenzhuo.lu@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, stable@dpdk.org, Wei Dai Date: Wed, 10 Jan 2018 16:40:55 +0800 Message-Id: <1515573656-41847-2-git-send-email-wei.dai@intel.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1515573656-41847-1-git-send-email-wei.dai@intel.com> References: <1515557660-36763-1-git-send-email-wei.dai@intel.com> <1515573656-41847-1-git-send-email-wei.dai@intel.com> Subject: [dpdk-stable] [PATCH v3 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 08:57:08 -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 | 2 ++ app/test-pmd/parameters.c | 7 ++++--- app/test-pmd/testpmd.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 3 +++ 4 files changed, 56 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) != 0) + return; nb_rxq = res->value; } else if (!strcmp(res->name, "txq")) { diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 304b98d..eac1826 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 }; static struct option lgopts[] = { @@ -922,12 +923,12 @@ launch_args_parse(int argc, char** argv) rss_hf = ETH_RSS_UDP; if (!strcmp(lgopts[opt_idx].name, "rxq")) { n = atoi(optarg); - if (n >= 0 && n <= (int) MAX_QUEUE_ID) + if (n >= 0 && check_nb_rxq((queueid_t)n) == 0) nb_rxq = (queueid_t) n; else rte_exit(EXIT_FAILURE, "rxq %d invalid - must be" - " >= 0 && <= %d\n", n, - (int) MAX_QUEUE_ID); + " >= 0 && <= %u\n", n, + get_allowed_nb_rxq(&pid)); } if (!strcmp(lgopts[opt_idx].name, "txq")) { n = atoi(optarg); diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 9414d0e..1203b17 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -540,6 +540,53 @@ check_socket_id(const unsigned int socket_id) return 0; } +/* + * Get the allowed maximum number of RX queues. + * *pid return the port id which has mimumal value of + * max_rx_queues in all ports. + */ + +queueid_t +get_allowed_nb_rxq(portid_t *pid) +{ + queueid_t allowed_max_rxq = 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 = dev_info.max_rx_queues; + *pid = 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; + + allowed_max_rxq = get_allowed_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..1e38f43 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 port_id, enum print_warning warning); int new_socket_id(unsigned int socket_id); +queueid_t get_allowed_nb_rxq(portid_t *pid); +int 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