From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 316F0A0A02 for ; Mon, 17 May 2021 18:13:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2AEEE40041; Mon, 17 May 2021 18:13:22 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 81D9D410F7 for ; Mon, 17 May 2021 18:13:20 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifrp-0007vM-F7; Mon, 17 May 2021 16:13:17 +0000 From: Christian Ehrhardt To: Hongbo Zheng Cc: Min Hu , Xiaoyun Li , dpdk stable Date: Mon, 17 May 2021 18:08:15 +0200 Message-Id: <20210517161039.3132619-66-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix Tx/Rx descriptor query error log' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/826f3237cc76e9ba385c0f1a26508a2e47de247e Thanks. Christian Ehrhardt --- >From 826f3237cc76e9ba385c0f1a26508a2e47de247e Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Mon, 29 Mar 2021 14:46:43 +0800 Subject: [PATCH] app/testpmd: fix Tx/Rx descriptor query error log [ upstream commit 0e8f3489940aae7a29112b0de745bb5205239c83 ] This patch adds more err info for Tx/Rx descriptor query command. Fixes: fae9aa717d6c ("app/testpmd: support checking descriptor status") Signed-off-by: Hongbo Zheng Signed-off-by: Min Hu (Connor) Acked-by: Xiaoyun Li --- app/test-pmd/cmdline.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index cba219625f..ecf36a7c67 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -19036,7 +19036,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, rc = rte_eth_rx_descriptor_status(res->cmd_pid, res->cmd_qid, res->cmd_did); if (rc < 0) { - printf("Invalid queueid = %d\n", res->cmd_qid); + printf("Invalid input: queue id = %d, desc id = %d\n", + res->cmd_qid, res->cmd_did); return; } if (rc == RTE_ETH_RX_DESC_AVAIL) @@ -19049,7 +19050,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, rc = rte_eth_tx_descriptor_status(res->cmd_pid, res->cmd_qid, res->cmd_did); if (rc < 0) { - printf("Invalid queueid = %d\n", res->cmd_qid); + printf("Invalid input: queue id = %d, desc id = %d\n", + res->cmd_qid, res->cmd_did); return; } if (rc == RTE_ETH_TX_DESC_FULL) -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.120479372 +0200 +++ 0066-app-testpmd-fix-Tx-Rx-descriptor-query-error-log.patch 2021-05-17 17:40:29.231809948 +0200 @@ -1 +1 @@ -From 0e8f3489940aae7a29112b0de745bb5205239c83 Mon Sep 17 00:00:00 2001 +From 826f3237cc76e9ba385c0f1a26508a2e47de247e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0e8f3489940aae7a29112b0de745bb5205239c83 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 14110eb2e4..f44116b087 100644 +index cba219625f..ecf36a7c67 100644 @@ -22 +23 @@ -@@ -16629,7 +16629,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, +@@ -19036,7 +19036,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, @@ -32 +33 @@ -@@ -16642,7 +16643,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result, +@@ -19049,7 +19050,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,