From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 0B9821B1BC for ; Wed, 24 Jan 2018 16:41:11 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B27D5226CA; Wed, 24 Jan 2018 10:41:10 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 24 Jan 2018 10:41:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=28zHze+K/V33qa5pN USPM51Knn4pgzIqcZRLM3CL1Is=; b=mfU8lFAMD7EQfacr0ByfVDosBuBT1JMje qF0S/f3fhlaySj2dxGQpLTk5HACFle5tJMI79qvqWKCKwgWZardDpqtJCIIlpWXR cxS8vosVanYi2fgQaEZ6PmMpT+5vBxjDA9csulkyzg8zJdzqviIv9v5t/pFRmeaL 36fHY1r7BEryyEar5n7cd/FcRw8Mbf+3lHbqizQM8DcJt5BTAr02L7wWU0I0bT4S 60TudKJHn66FLG6tnQSaPR3OX0qaX5sVegf147pqplyWuQ9UDHDyweIbwBDV/7FW s8Nsa6o+jyJQN9AkAin09ieoqm/usW+Y+x6WeMR2SIrYfylMTjaFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=28zHze+K/V33qa5pNUSPM51Knn4pgzIqcZRLM3CL1Is=; b=YY3XtPUP ArxpZRJaxjtX/qJydSMVU9z8Qbk+2LG9oWE5geVcho5MZRU+q8F2Q0VeG9N2VxJO D+jkPVAhZma7gNzK6BdA95m1e7S2KKsVd5m9SFN6gFURf5ykXSBkUbGhz3fvwi2B dt85wQr3GfL3/7R6zYt1DhSKwPtQdPF172hVTg+6qB7pu9SkwBDaooyhCeTolDyP xjsTHfub//hXwolLb1etQ/vHblFMHF7hN4KEzR9/7PX4JXRR2BCYxRFXw8m9On6m xbS7KkeMR8KoeCR0PL2ZYm2rlaMYd8rMvzconWsjmJtqgLdH/SrtLRA6lc6WjCi7 Lk91ZpLI3WSOIQ== X-ME-Sender: Received: from localhost.localdomain (unknown [115.150.27.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 35A587E1A2; Wed, 24 Jan 2018 10:41:07 -0500 (EST) From: Yuanhan Liu To: Wei Dai Cc: Konstantin Ananyev , Yuan Peng , dpdk stable Date: Wed, 24 Jan 2018 23:33:06 +0800 Message-Id: <1516808026-25523-118-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> References: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'app/testpmd: fix invalid Rx queue number setting' has been queued to LTS release 17.11.1 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, 24 Jan 2018 15:41:11 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/26/18. So please shout if anyone has objections. Thanks. --yliu --- >>From e082ddac1a03cbd326987863f0497f230d5f254c Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Fri, 12 Jan 2018 19:31:21 +0800 Subject: [PATCH] app/testpmd: fix invalid Rx queue number setting [ upstream commit 3f7311ba0beee75068c52fe521fff021ff506a14 ] If an invalid number of RX queues is configured from testpmd run-time command 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 without this patch. It may cause testpmd crash. This patch refuses invalid rxq setting and keeps its last correct value. Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") Signed-off-by: Wei Dai Acked-by: Konstantin Ananyev Tested-by: Yuan Peng --- 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 8990ebf..6296a30 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1501,6 +1501,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 84e7a63..26f61b9 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -565,6 +565,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[] = { @@ -951,12 +952,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_max_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 c3ab448..7b2d2c8 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -568,6 +568,52 @@ 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 minimal value of + * max_rx_queues in all ports. + */ +queueid_t +get_allowed_max_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 = 0; + + allowed_max_rxq = 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 1639d27..825ebb9 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -728,6 +728,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_max_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.4