From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AAFA9A09E0; Fri, 11 Dec 2020 16:07:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EBE59BC86; Fri, 11 Dec 2020 16:07:50 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 6D53BAC9C for ; Fri, 11 Dec 2020 16:07:49 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from viacheslavo@nvidia.com) with SMTP; 11 Dec 2020 17:07:47 +0200 Received: from nvidia.com (pegasus12.mtr.labs.mlnx [10.210.17.40]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 0BBF7liF000639; Fri, 11 Dec 2020 17:07:47 +0200 From: Viacheslav Ovsiienko To: dev@dpdk.org Cc: thomas@monjalon.net, ferruh.yigit@intel.com, stable@dpdk.org Date: Fri, 11 Dec 2020 15:07:45 +0000 Message-Id: <1607699265-5238-1-git-send-email-viacheslavo@nvidia.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: Subject: [dpdk-dev] [PATCH] app/testpmd: fix segment number check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The --txpkts command line parameter was silently ignored due to application was unable to check the Tx queue ring sizes for non configured ports [1]. The "set txpkts " was also rejected if there was some stopped or /unconfigured port. This provides the following: - number of segment check is performed against configured Tx queues only - the capability to send single packet is supposed to be very basic and always supported, the setting segment number to 1 is always allowed, no check performed - at the moment of Tx queue setup the descriptor number is checked against configured segment number Fixes: 8dae835d88b7 ("app/testpmd: remove restriction on Tx segments set") Cc: stable@dpdk.org Bugzilla ID: 584 Signed-off-by: Viacheslav Ovsiienko --- app/test-pmd/cmdline.c | 5 +++++ app/test-pmd/config.c | 21 ++++++++++++++++----- app/test-pmd/testpmd.c | 7 ++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 0d2d6aa..86388a2 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -2798,6 +2798,11 @@ struct cmd_setup_rxtx_queue { if (!numa_support || socket_id == NUMA_NO_CONFIG) socket_id = port->socket_id; + if (port->nb_tx_desc[res->qid] < tx_pkt_nb_segs) { + printf("Failed to setup TX queue: " + "not enough descriptors\n"); + return; + } ret = rte_eth_tx_queue_setup(res->portid, res->qid, port->nb_tx_desc[res->qid], diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index b51de59..a6fccfa 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3911,12 +3911,18 @@ struct igb_ring_desc_16_bytes { for (queue_id = 0; queue_id < nb_txq; queue_id++) { ret = get_tx_ring_size(port_id, queue_id, &ring_size); - if (ret) + /* Do the check only for the active/configured ports. */ + if (ret == -EINVAL) + continue; + if (ret) { + printf("failed to get ring size for TX " + "queue(%u) Port(%u) - txpkts ignored\n", + port_id, queue_id); return true; - + } if (ring_size < nb_segs) { - printf("nb segments per TX packets=%u >= " - "TX queue(%u) ring_size=%u - ignored\n", + printf("nb segments per TX packets=%u >= TX " + "queue(%u) ring_size=%u - txpkts ignored\n", nb_segs, queue_id, ring_size); return true; } @@ -3932,7 +3938,12 @@ struct igb_ring_desc_16_bytes { uint16_t tx_pkt_len; unsigned int i; - if (nb_segs_is_invalid(nb_segs)) + /* + * For single sengment settings failed check is ignored. + * It is a very basic capability to send the single segment + * packets, suppose it is always supported. + */ + if (nb_segs > 1 && nb_segs_is_invalid(nb_segs)) return; /* diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 33fc0fd..9ea0145 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2575,6 +2575,11 @@ struct extmem_param { port->need_reconfig_queues = 0; /* setup tx queues */ for (qi = 0; qi < nb_txq; qi++) { + if (port->nb_tx_desc[qi] < tx_pkt_nb_segs) { + printf("Failed to setup TX queue: " + "not enough descriptors\n"); + goto fail; + } if ((numa_support) && (txring_numa[pi] != NUMA_NO_CONFIG)) diag = rte_eth_tx_queue_setup(pi, qi, @@ -2589,7 +2594,7 @@ struct extmem_param { if (diag == 0) continue; - +fail: /* Fail to setup tx queue, return */ if (rte_atomic16_cmpset(&(port->port_status), RTE_PORT_HANDLING, -- 1.8.3.1