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 3C8F3326C for ; Tue, 20 Nov 2018 20:14:37 +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 A71E4C04959F; Tue, 20 Nov 2018 19:14:36 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9431601A7; Tue, 20 Nov 2018 19:14:35 +0000 (UTC) From: Kevin Traynor To: Adrien Mazarguil Cc: dpdk stable Date: Tue, 20 Nov 2018 19:12:02 +0000 Message-Id: <20181120191252.30277-12-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-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.31]); Tue, 20 Nov 2018 19:14:36 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix artificial L4 limitation on switch flow rules' has been queued to stable release 18.08.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: Tue, 20 Nov 2018 19:14:37 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/23/18. 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. 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. Kevin Traynor --- >>From 472fb2561be430b32da30a5c29d37a65afd697e9 Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Mon, 6 Aug 2018 16:25:42 +0200 Subject: [PATCH] net/mlx5: fix artificial L4 limitation on switch flow rules [ upstream commit dce1e4c2044d0e197eee29182cdb93454a0dc3d5 ] Partial bit-masks are in fact supported on TCP/UDP source/destination ports. Remove unnecessary check. Fixes: 2bfc777e07 ("net/mlx5: add L2-L4 pattern items to switch flow rules") Signed-off-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_nl_flow.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/net/mlx5/mlx5_nl_flow.c b/drivers/net/mlx5/mlx5_nl_flow.c index a1c8c340b..beb03c911 100644 --- a/drivers/net/mlx5/mlx5_nl_flow.c +++ b/drivers/net/mlx5/mlx5_nl_flow.c @@ -800,14 +800,4 @@ trans: } spec.tcp = item->spec; - if ((mask.tcp->hdr.src_port && - mask.tcp->hdr.src_port != RTE_BE16(0xffff)) || - (mask.tcp->hdr.dst_port && - mask.tcp->hdr.dst_port != RTE_BE16(0xffff))) - return rte_flow_error_set - (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM_MASK, - mask.tcp, - "no support for partial masks on" - " \"hdr.src_port\" and \"hdr.dst_port\"" - " fields"); if ((mask.tcp->hdr.src_port && (!mnl_attr_put_u16_check(buf, size, @@ -847,14 +837,4 @@ trans: } spec.udp = item->spec; - if ((mask.udp->hdr.src_port && - mask.udp->hdr.src_port != RTE_BE16(0xffff)) || - (mask.udp->hdr.dst_port && - mask.udp->hdr.dst_port != RTE_BE16(0xffff))) - return rte_flow_error_set - (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM_MASK, - mask.udp, - "no support for partial masks on" - " \"hdr.src_port\" and \"hdr.dst_port\"" - " fields"); if ((mask.udp->hdr.src_port && (!mnl_attr_put_u16_check(buf, size, -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:07.753183034 +0000 +++ 0012-net-mlx5-fix-artificial-L4-limitation-on-switch-flow.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,13 +1,14 @@ -From dce1e4c2044d0e197eee29182cdb93454a0dc3d5 Mon Sep 17 00:00:00 2001 +From 472fb2561be430b32da30a5c29d37a65afd697e9 Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Mon, 6 Aug 2018 16:25:42 +0200 Subject: [PATCH] net/mlx5: fix artificial L4 limitation on switch flow rules +[ upstream commit dce1e4c2044d0e197eee29182cdb93454a0dc3d5 ] + Partial bit-masks are in fact supported on TCP/UDP source/destination ports. Remove unnecessary check. Fixes: 2bfc777e07 ("net/mlx5: add L2-L4 pattern items to switch flow rules") -Cc: stable@dpdk.org Signed-off-by: Adrien Mazarguil ---