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 7779F1B3B5 for ; Thu, 7 Feb 2019 14:28:28 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5C5189AED; Thu, 7 Feb 2019 13:28:27 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C475600D7; Thu, 7 Feb 2019 13:28:26 +0000 (UTC) From: Kevin Traynor To: Wei Zhao Cc: Yuan Peng , Qi Zhang , dpdk stable Date: Thu, 7 Feb 2019 13:25:58 +0000 Message-Id: <20190207132614.20538-52-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Feb 2019 13:28:27 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix queue region DCB configure' 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: Thu, 07 Feb 2019 13:28:28 -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 02/14/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 bff4efdafb86e4e54a08cb806ba72d5dd78f6fa3 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Tue, 22 Jan 2019 16:11:03 +0800 Subject: [PATCH] net/i40e: fix queue region DCB configure [ upstream commit 991a2e812fcfdba6d47b77462e06859262def583 ] DCB is not necessary to be configured if no user priority of queue region is requested. Unexpected configuration of DCB will cause unexpected behavior, like FDIR does not work on those queues, but could cause more issues. Fixes: 7cbecc2f7424 ("net/i40e: support queue region set and flush") Signed-off-by: Wei Zhao Tested-by: Yuan Peng Acked-by: Qi Zhang --- drivers/net/i40e/rte_pmd_i40e.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c index 7ce5d02fa..c49c872b6 100644 --- a/drivers/net/i40e/rte_pmd_i40e.c +++ b/drivers/net/i40e/rte_pmd_i40e.c @@ -2819,5 +2819,5 @@ i40e_queue_region_dcb_configure(struct i40e_hw *hw, int32_t ret = -EINVAL; uint16_t i, j, prio_index, region_index; - uint8_t tc_map, tc_bw, bw_lf; + uint8_t tc_map, tc_bw, bw_lf, dcb_flag = 0; if (!info->queue_region_number) { @@ -2826,4 +2826,14 @@ i40e_queue_region_dcb_configure(struct i40e_hw *hw, } + for (i = 0; i < info->queue_region_number; i++) { + if (info->region[i].user_priority_num) { + dcb_flag = 1; + break; + } + } + + if (dcb_flag == 0) + return 0; + dcb_cfg = &dcb_cfg_local; memset(dcb_cfg, 0, sizeof(struct i40e_dcbx_config)); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-02-07 13:19:56.782142122 +0000 +++ 0052-net-i40e-fix-queue-region-DCB-configure.patch 2019-02-07 13:19:55.000000000 +0000 @@ -1,8 +1,10 @@ -From 991a2e812fcfdba6d47b77462e06859262def583 Mon Sep 17 00:00:00 2001 +From bff4efdafb86e4e54a08cb806ba72d5dd78f6fa3 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Tue, 22 Jan 2019 16:11:03 +0800 Subject: [PATCH] net/i40e: fix queue region DCB configure +[ upstream commit 991a2e812fcfdba6d47b77462e06859262def583 ] + DCB is not necessary to be configured if no user priority of queue region is requested. @@ -10,7 +12,6 @@ FDIR does not work on those queues, but could cause more issues. Fixes: 7cbecc2f7424 ("net/i40e: support queue region set and flush") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Tested-by: Yuan Peng