[dpdk-dev,v4] app/testpmd: fix log of start command

Message ID 1527001838-1605-1-git-send-email-bernard.iremonger@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Iremonger, Bernard May 22, 2018, 3:10 p.m. UTC
  Call the rte_eth_rxq_info_get() and rte_eth_txq_info_get() functions
to update the number of rx and tx descriptors.

Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/config.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
  

Comments

Ferruh Yigit May 22, 2018, 4:31 p.m. UTC | #1
On 5/22/2018 4:10 PM, Bernard Iremonger wrote:
> Call the rte_eth_rxq_info_get() and rte_eth_txq_info_get() functions
> to update the number of rx and tx descriptors.
> 
> Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
  
Ferruh Yigit May 22, 2018, 4:42 p.m. UTC | #2
On 5/22/2018 5:31 PM, Ferruh Yigit wrote:
> On 5/22/2018 4:10 PM, Bernard Iremonger wrote:
>> Call the rte_eth_rxq_info_get() and rte_eth_txq_info_get() functions
>> to update the number of rx and tx descriptors.
>>
>> Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
>> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> 
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied to dpdk-next-net/master, thanks.
  

Patch

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 4520084..97020fb 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1839,6 +1839,11 @@  struct igb_ring_desc_16_bytes {
 		struct rte_eth_txconf *tx_conf = &ports[pid].tx_conf[0];
 		uint16_t *nb_rx_desc = &ports[pid].nb_rx_desc[0];
 		uint16_t *nb_tx_desc = &ports[pid].nb_tx_desc[0];
+		uint16_t nb_rx_desc_tmp;
+		uint16_t nb_tx_desc_tmp;
+		struct rte_eth_rxq_info rx_qinfo;
+		struct rte_eth_txq_info tx_qinfo;
+		int32_t rc;
 
 		/* per port config */
 		printf("  port %d: RX queue number: %d Tx queue number: %d\n",
@@ -1850,9 +1855,15 @@  struct igb_ring_desc_16_bytes {
 
 		/* per rx queue config only for first queue to be less verbose */
 		for (qid = 0; qid < 1; qid++) {
+			rc = rte_eth_rx_queue_info_get(pid, qid, &rx_qinfo);
+			if (rc)
+				nb_rx_desc_tmp = nb_rx_desc[qid];
+			else
+				nb_rx_desc_tmp = rx_qinfo.nb_desc;
+
 			printf("    RX queue: %d\n", qid);
 			printf("      RX desc=%d - RX free threshold=%d\n",
-				nb_rx_desc[qid], rx_conf[qid].rx_free_thresh);
+				nb_rx_desc_tmp, rx_conf[qid].rx_free_thresh);
 			printf("      RX threshold registers: pthresh=%d hthresh=%d "
 				" wthresh=%d\n",
 				rx_conf[qid].rx_thresh.pthresh,
@@ -1864,9 +1875,15 @@  struct igb_ring_desc_16_bytes {
 
 		/* per tx queue config only for first queue to be less verbose */
 		for (qid = 0; qid < 1; qid++) {
+			rc = rte_eth_tx_queue_info_get(pid, qid, &tx_qinfo);
+			if (rc)
+				nb_tx_desc_tmp = nb_tx_desc[qid];
+			else
+				nb_tx_desc_tmp = tx_qinfo.nb_desc;
+
 			printf("    TX queue: %d\n", qid);
 			printf("      TX desc=%d - TX free threshold=%d\n",
-				nb_tx_desc[qid], tx_conf[qid].tx_free_thresh);
+				nb_tx_desc_tmp, tx_conf[qid].tx_free_thresh);
 			printf("      TX threshold registers: pthresh=%d hthresh=%d "
 				" wthresh=%d\n",
 				tx_conf[qid].tx_thresh.pthresh,