From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 35D0D1B489 for ; Fri, 4 Jan 2019 14:28:48 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97C5BC057F33; Fri, 4 Jan 2019 13:28:47 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 193B85C1A1; Fri, 4 Jan 2019 13:28:45 +0000 (UTC) From: Kevin Traynor To: Rosen Xu Cc: Jasvinder Singh , dpdk stable Date: Fri, 4 Jan 2019 13:24:55 +0000 Message-Id: <20190104132455.15170-73-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 04 Jan 2019 13:28:47 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: expand RED queue thresholds to 64 bits' has been queued to LTS release 18.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: Fri, 04 Jan 2019 13:28:48 -0000 Hi, FYI, your patch has been queued to LTS release 18.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/11/19. 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. Thanks. Kevin Traynor --- >>From 14b927e5db321b92b30c5d78bdb8709c0200468f 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 4c763482a..101208474 100644 --- a/app/test-pmd/cmdline_tm.c +++ b/app/test-pmd/cmdline_tm.c @@ -1157,16 +1157,16 @@ struct cmd_add_port_tm_node_wred_profile_result { 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; @@ -1207,9 +1207,9 @@ 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( @@ -1227,9 +1227,9 @@ 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( @@ -1247,9 +1247,9 @@ 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( -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:09.220636129 +0000 +++ 0073-app-testpmd-expand-RED-queue-thresholds-to-64-bits.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,15 +1,16 @@ -From cb43e0b3a94c997a225a4c06f336902922b0cd04 Mon Sep 17 00:00:00 2001 +From 14b927e5db321b92b30c5d78bdb8709c0200468f 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