From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 098BEA0A02 for ; Mon, 17 May 2021 18:11:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 034C340041; Mon, 17 May 2021 18:11:00 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 496BC40041 for ; Mon, 17 May 2021 18:10:59 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifpb-0007X4-2b; Mon, 17 May 2021 16:10:59 +0000 From: Christian Ehrhardt To: Viacheslav Ovsiienko Cc: dpdk stable Date: Mon, 17 May 2021 18:07:18 +0200 Message-Id: <20210517161039.3132619-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix metadata item validation for ingress flows' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/edcfbe02187c0c23f11f554f51530ff4954fd501 Thanks. Christian Ehrhardt --- >From edcfbe02187c0c23f11f554f51530ff4954fd501 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 10 Feb 2021 11:30:51 +0200 Subject: [PATCH] net/mlx5: fix metadata item validation for ingress flows [ upstream commit aa1c17f1d8202a1a6e64e813103cdbe6b357b0ba ] In legacy metadata mode the metadata register B is engaged to handle the metadata item. In the ingress domain the hardware supports the register setting only, the match on register B is not supported. Due to this limitation only the SET_META action can be supported for the ingress flows, the META item should be rejected on flow validation. Fixes: 5f3541724e08 ("net/mlx5: fix flow META item validation") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a1b805c105..6dc4e680ed 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1395,13 +1395,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, "isn't supported"); if (reg != REG_A) nic_mask.data = priv->sh->dv_meta_mask; - } else if (attr->transfer) { - return rte_flow_error_set(error, ENOTSUP, + } else { + if (attr->transfer) + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, "extended metadata feature " "should be enabled when " "meta item is requested " "with e-switch mode "); + if (attr->ingress) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "match on metadata for ingress " + "is not supported in legacy " + "metadata mode"); } if (!mask) mask = &rte_flow_item_meta_mask; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:29.927429877 +0200 +++ 0009-net-mlx5-fix-metadata-item-validation-for-ingress-fl.patch 2021-05-17 17:40:29.099808908 +0200 @@ -1 +1 @@ -From aa1c17f1d8202a1a6e64e813103cdbe6b357b0ba Mon Sep 17 00:00:00 2001 +From edcfbe02187c0c23f11f554f51530ff4954fd501 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aa1c17f1d8202a1a6e64e813103cdbe6b357b0ba ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index a44291a3c9..1a74d5ac2b 100644 +index a1b805c105..6dc4e680ed 100644 @@ -27 +28 @@ -@@ -1960,13 +1960,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -1395,13 +1395,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,