From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 47D33A2E1B for ; Thu, 5 Sep 2019 12:19:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E0BF1EF83; Thu, 5 Sep 2019 12:19:36 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8E5A51EFAB for ; Thu, 5 Sep 2019 12:19:34 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08452308FC20; Thu, 5 Sep 2019 10:19:34 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2C2419C77; Thu, 5 Sep 2019 10:19:32 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 5 Sep 2019 11:17:48 +0100 Message-Id: <20190905101754.21933-48-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 05 Sep 2019 10:19:34 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix validation of VLAN PCP item' has been queued to LTS release 18.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7f25ef5baa0ba097473891fd4b4f35ab0813bf8f Thanks. Kevin Traynor --- >From 7f25ef5baa0ba097473891fd4b4f35ab0813bf8f Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Mon, 29 Jul 2019 18:14:45 +0300 Subject: [PATCH] net/mlx5: fix validation of VLAN PCP item [ upstream commit a3970d31e6fb0673611a4a0a4891b7109ae419cc ] Function mlx5_flow_validate_item_vlan() validates the user setting is supported by NIC, using a mask with TCI mask 0x0fff. This check will reject a flow rule specifying a vlan pcp item. This patch updates mlx5_flow_validate_item_vlan() to use mask 0xffff, so flow rules with vlan pcp item are accepted. Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function") Signed-off-by: Dekel Peled Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 8e6585d18..f19b27ede 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1099,6 +1099,6 @@ mlx5_flow_validate_item_vlan(const struct rte_flow_item *item, const struct rte_flow_item_vlan *mask = item->mask; const struct rte_flow_item_vlan nic_mask = { - .tci = RTE_BE16(0x0fff), - .inner_type = RTE_BE16(0xffff), + .tci = RTE_BE16(UINT16_MAX), + .inner_type = RTE_BE16(UINT16_MAX), }; uint16_t vlan_tag = 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:50.405125318 +0100 +++ 0048-net-mlx5-fix-validation-of-VLAN-PCP-item.patch 2019-09-05 10:36:47.557699397 +0100 @@ -1 +1 @@ -From a3970d31e6fb0673611a4a0a4891b7109ae419cc Mon Sep 17 00:00:00 2001 +From 7f25ef5baa0ba097473891fd4b4f35ab0813bf8f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a3970d31e6fb0673611a4a0a4891b7109ae419cc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f40fee528..6ae98e197 100644 +index 8e6585d18..f19b27ede 100644 @@ -26 +27 @@ -@@ -1222,6 +1222,6 @@ mlx5_flow_validate_item_vlan(const struct rte_flow_item *item, +@@ -1099,6 +1099,6 @@ mlx5_flow_validate_item_vlan(const struct rte_flow_item *item,