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 2009D1B1B9 for ; Wed, 24 Jan 2018 16:41:14 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id CB9E822707; Wed, 24 Jan 2018 10:41:13 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 24 Jan 2018 10:41:13 -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=L4+YLAZjDuV/g1Ahe w3RX2vSy4HbJiB1GqNHLqUigLs=; b=smkipZU844lU8JcxaZWV8p16JspBbDphf L7dX+do9dgoRY262Ki5ydXBe0jS0Svjie4KwGLjnRKgu6xysfYa21DAsSyJICdr+ ahR8u5DGF54gnho0doE66kmSsAExPLqze4GzKy1IgozHAyThEwPAVzpRm+6BFqEG PIewfPiziGJJ/LoIuicas7mInVN6z2kvTYR2GJprSwrcdl9fpOcgEsyCQRaO1fI5 n8+xjK5eKJzG6XR4GcLADsDF+76UXzOQo65NMj4CQiVCZYfirCse66GIy7j48Xe+ i52427ZmT5Z+kS005dOYgHqlLIwBv4CNxfDkdIBrhfZQ42FEJEgWw== 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=L4+YLAZjDuV/g1Ahew3RX2vSy4HbJiB1GqNHLqUigLs=; b=UlcX1Q5d AZvyfaW+6QgSHkS6qKc5gOYQdaogTGn9mqrQarqcYENt5KmaP+gxR3Z/QG6bW4vE JZaggrM3rqr2Yr+Gi8atxDMcQRiD2g9TfHTJNEJN1ptVVkEj4bDX8dNuVgUS/Png gvS2OpXCkQmmB8Hx4nMV+bq9LpO7RVU8HRZ9Ikd3kcI82Aalz1IG2miRqinzfNYp dvpkjGJ79z9sAieZZRplVGsSesJJ2elmDZMuCmjDtDebbtKmhcQvq7vtK1bliqnz 411tevj0wktxEpDgXhqwek54xRp5yub4qYyGRGzwlQ7NcEaEXVbhlPH1y+fm0Q09 XDvDwnSJM534mQ== X-ME-Sender: Received: from localhost.localdomain (unknown [115.150.27.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 467937E1A2; Wed, 24 Jan 2018 10:41:10 -0500 (EST) From: Yuanhan Liu To: Wei Dai Cc: Konstantin Ananyev , Yuan Peng , dpdk stable Date: Wed, 24 Jan 2018 23:33:07 +0800 Message-Id: <1516808026-25523-119-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 Tx 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:14 -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 b4dfd3a71eeac116ee839421ee7846d117affae9 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Fri, 12 Jan 2018 19:31:22 +0800 Subject: [PATCH] app/testpmd: fix invalid Tx queue number setting [ upstream commit 36db4f6c70b43f307dd2a1ece19d910a3548349d ] If an invalid number of TX queues is configured from testpmd run-time command like "port config all txq number" or from --txq in the command to start testpmd, the global variable nb_txq is updated by this invalid value without this patch. It may cause testpmd crash. This patch refuses invalid txq 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 | 6 +++--- app/test-pmd/testpmd.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 2 ++ 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 6296a30..8979627 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1510,6 +1510,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_txq(res->value) != 0) + return; nb_txq = res->value; } else if (!strcmp(res->name, "rxd")) { diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 26f61b9..8fbb515 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -961,12 +961,12 @@ launch_args_parse(int argc, char** argv) } if (!strcmp(lgopts[opt_idx].name, "txq")) { n = atoi(optarg); - if (n >= 0 && n <= (int) MAX_QUEUE_ID) + if (n >= 0 && check_nb_txq((queueid_t)n) == 0) nb_txq = (queueid_t) n; else rte_exit(EXIT_FAILURE, "txq %d invalid - must be" - " >= 0 && <= %d\n", n, - (int) MAX_QUEUE_ID); + " >= 0 && <= %u\n", n, + get_allowed_max_nb_txq(&pid)); } if (!nb_rxq && !nb_txq) { rte_exit(EXIT_FAILURE, "Either rx or tx queues should " diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 7b2d2c8..f66f4c6 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -614,6 +614,52 @@ check_nb_rxq(queueid_t rxq) return 0; } +/* + * Get the allowed maximum number of TX queues. + * *pid return the port id which has minimal value of + * max_tx_queues in all ports. + */ +queueid_t +get_allowed_max_nb_txq(portid_t *pid) +{ + queueid_t allowed_max_txq = 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_tx_queues < allowed_max_txq) { + allowed_max_txq = dev_info.max_tx_queues; + *pid = pi; + } + } + return allowed_max_txq; +} + +/* + * Check input txq is valid or not. + * If input txq is not greater than any of maximum number + * of TX queues of all ports, it is valid. + * if valid, return 0, else return -1 + */ +int +check_nb_txq(queueid_t txq) +{ + queueid_t allowed_max_txq; + portid_t pid = 0; + + allowed_max_txq = get_allowed_max_nb_txq(&pid); + if (txq > allowed_max_txq) { + printf("Fail: input txq (%u) can't be greater " + "than max_tx_queues (%u) of port %u\n", + txq, + allowed_max_txq, + 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 825ebb9..92e1607 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -730,6 +730,8 @@ 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); +queueid_t get_allowed_max_nb_txq(portid_t *pid); +int check_nb_txq(queueid_t txq); /* * Work-around of a compilation error with ICC on invocations of the -- 2.7.4