From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id EC9AA27D for ; Fri, 8 Mar 2019 18:48:32 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:48:30 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloAd002625; Fri, 8 Mar 2019 19:48:29 +0200 From: Yongseok Koh To: Rosen Xu Cc: Jasvinder Singh , dpdk stable Date: Fri, 8 Mar 2019 09:47:01 -0800 Message-Id: <20190308174749.30771-23-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'app/testpmd: expand RED queue thresholds to 64 bits' has been queued to LTS release 17.11.6 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: Fri, 08 Mar 2019 17:48:33 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From f3f26d54d7f763419cce3be50198b3c940bf7bbc Mon Sep 17 00:00:00 2001 From: Rosen Xu Date: Mon, 26 Nov 2018 16:35:57 +0800 Subject: [PATCH] app/testpmd: expand RED queue thresholds to 64 bits [ upstream commit cb43e0b3a94c997a225a4c06f336902922b0cd04 ] There's very commonly that more than 4G DDR memory in NIC for HQoS, so right now the queue threshold size of RED needs to expand to uint64_t. For struct rte_tm_red_params, it has been fixed, but for test-pmd TM configuration, it hasn't been fixed. This patch fixes it. Fixes: bddc2f40b594 ("app/testpmd: add commands for shaper and wred profiles") Signed-off-by: Rosen Xu Reviewed-by: Jasvinder Singh --- app/test-pmd/cmdline_tm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c index 4dcddaff3..a022e28eb 100644 --- a/app/test-pmd/cmdline_tm.c +++ b/app/test-pmd/cmdline_tm.c @@ -1176,18 +1176,18 @@ struct cmd_add_port_tm_node_wred_profile_result { uint16_t port_id; uint32_t wred_profile_id; cmdline_fixed_string_t color_g; - uint16_t min_th_g; - uint16_t max_th_g; + uint64_t min_th_g; + uint64_t max_th_g; uint16_t maxp_inv_g; uint16_t wq_log2_g; cmdline_fixed_string_t color_y; - uint16_t min_th_y; - uint16_t max_th_y; + uint64_t min_th_y; + uint64_t max_th_y; uint16_t maxp_inv_y; uint16_t wq_log2_y; cmdline_fixed_string_t color_r; - uint16_t min_th_r; - uint16_t max_th_r; + uint64_t min_th_r; + uint64_t max_th_r; uint16_t maxp_inv_r; uint16_t wq_log2_r; }; @@ -1226,11 +1226,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - min_th_g, UINT16); + min_th_g, UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - max_th_g, UINT16); + max_th_g, UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -1246,11 +1246,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - min_th_y, UINT16); + min_th_y, UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - max_th_y, UINT16); + max_th_y, UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -1266,11 +1266,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - min_th_r, UINT16); + min_th_r, UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - max_th_r, UINT16); + max_th_r, UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:41.478708100 -0800 +++ 0023-app-testpmd-expand-RED-queue-thresholds-to-64-bits.patch 2019-03-08 09:46:40.075398000 -0800 @@ -1,15 +1,16 @@ -From cb43e0b3a94c997a225a4c06f336902922b0cd04 Mon Sep 17 00:00:00 2001 +From f3f26d54d7f763419cce3be50198b3c940bf7bbc Mon Sep 17 00:00:00 2001 From: Rosen Xu Date: Mon, 26 Nov 2018 16:35:57 +0800 Subject: [PATCH] app/testpmd: expand RED queue thresholds to 64 bits +[ upstream commit cb43e0b3a94c997a225a4c06f336902922b0cd04 ] + There's very commonly that more than 4G DDR memory in NIC for HQoS, so right now the queue threshold size of RED needs to expand to uint64_t. For struct rte_tm_red_params, it has been fixed, but for test-pmd TM configuration, it hasn't been fixed. This patch fixes it. Fixes: bddc2f40b594 ("app/testpmd: add commands for shaper and wred profiles") -Cc: stable@dpdk.org Signed-off-by: Rosen Xu Reviewed-by: Jasvinder Singh @@ -18,10 +19,10 @@ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c -index 4c763482a..101208474 100644 +index 4dcddaff3..a022e28eb 100644 --- a/app/test-pmd/cmdline_tm.c +++ b/app/test-pmd/cmdline_tm.c -@@ -1156,18 +1156,18 @@ struct cmd_add_port_tm_node_wred_profile_result { +@@ -1176,18 +1176,18 @@ struct cmd_add_port_tm_node_wred_profile_result { uint16_t port_id; uint32_t wred_profile_id; cmdline_fixed_string_t color_g; @@ -46,7 +47,7 @@ uint16_t maxp_inv_r; uint16_t wq_log2_r; }; -@@ -1206,11 +1206,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g = +@@ -1226,11 +1226,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -60,7 +61,7 @@ cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, -@@ -1226,11 +1226,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y = +@@ -1246,11 +1246,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -74,7 +75,7 @@ cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, -@@ -1246,11 +1246,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r = +@@ -1266,11 +1266,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result,