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 BA92FA0518 for ; Fri, 24 Jul 2020 14:08:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B1F8C1C039; Fri, 24 Jul 2020 14:08:30 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id EB7DC1C13B for ; Fri, 24 Jul 2020 14:08:29 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id 88so8096744wrh.3 for ; Fri, 24 Jul 2020 05:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CyKpqkcASJ8lf3FgOkcBRpGSrc3rgOZQnaVlcoKsq7U=; b=efYV/DR9IN6+R6OUjC277lnQvd5PcAiehERnJtSQV+LJ4ZGXsUn1ebgEcivpA4EJ92 ue4sbJEhPoJaMFDJs5OhCQl0x9bIhSCCFtUVJFrQIdsOGzD+ovyLy+Q40uSn8BPVllVO rhCq0VJ75+biK/oNTmi1lI2t96c7/f0Cme+2xyf8r5ZK91hvPg7XrSXmN2/b9NcFemLw uZqVFJY13xznTkkbcCm8DHmJAausjGR++Z3aI6+6m1ct0GlUa2HK3rVeGnlxlZTw879K 8oVoJ0LhFLhVtFz6xVcwVLA/SXmsgGUOSQYGpvMrtbpsgUXcNBSdCyb3RBK6PxEbYd5g PV5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CyKpqkcASJ8lf3FgOkcBRpGSrc3rgOZQnaVlcoKsq7U=; b=hEWPqQ0sodqWQqqi4g/5RZenqz3vgSRx5JtzZCcRAIKe2TSgvZ/Jm+OwNw9Rl8a5Ye 8uX3xOB3iGt82nKMtv3Gh2fzLqh7jSkMgivB/JK1YbCHrg5sURV5c6QhgJrteko+TK7j z9o3GkhNoxemS6TUHYW/QNgYiZ6O2WNVj1PtJR50svWTw+NKT0uw92l2v5+b7MDVb0GU CESWaw2EqsMA1rpJU5HrK8fz8VRIh/7/TegTFxddQjj2iWbzOGdc5anib4dfTV4LjIAR x8oyupIT89fNO9YqHOnJlv8VLNBzit+BrqcTnaJi+K71e3FWl5VC8JdpbGjEnHEHmFm8 GUMA== X-Gm-Message-State: AOAM532vvqQAgxZUk33fGmyxs4mQghKRM0aXqX2suipiyGyYdr6ya/w8 kIltcW4Dpw0L7arRD0LIunI= X-Google-Smtp-Source: ABdhPJwF2/c6m6eYVB4AzOpqMpjYME7iJ7U3KgGSgyMiXDpWegpRdD+qTAxjjYI7qWSimu7tmNSx8w== X-Received: by 2002:adf:fd82:: with SMTP id d2mr8213602wrr.72.1595592509700; Fri, 24 Jul 2020 05:08:29 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f16sm531752wro.34.2020.07.24.05.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:08:28 -0700 (PDT) From: luca.boccassi@gmail.com To: Shy Shyman Cc: Matan Azrad , dpdk stable Date: Fri, 24 Jul 2020 12:59:15 +0100 Message-Id: <20200724120030.1863487-117-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix flow META item validation' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Luca Boccassi --- >From 77e0f36bfed0efeec0bfcfc997b82af973d4ea8e Mon Sep 17 00:00:00 2001 From: Shy Shyman Date: Sun, 28 Jun 2020 12:36:31 +0300 Subject: [PATCH] net/mlx5: fix flow META item validation [ upstream commit 5f3541724e0812e23532fa7e9e89254b3e0c87c6 ] When flow is inserted with meta match item it requires a certain register support. As part of the flow validation of such flows, the validation function is missing a check that the mlx5 driver is not in legacy mode in terms of extended meta data support (MLX5_XMETA_MODE_LEGACY flag). If the driver is in legacy mode it will cause downstream function that allocates needed register for meta data. The fix checks explicitly the conditions for support of meta data in FDB mode. If the conditions are not met an error message will be issued. Fixes: 9bf26e1318e3 ("ethdev: move egress metadata to dynamic field") Signed-off-by: Shy Shyman Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index d83e49f95..930e16026 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1395,6 +1395,13 @@ 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, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "extended metadata feature " + "should be enabled when " + "meta item is requested " + "with e-switch mode "); } if (!mask) mask = &rte_flow_item_meta_mask; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.046477102 +0100 +++ 0117-net-mlx5-fix-flow-META-item-validation.patch 2020-07-24 12:53:48.391008397 +0100 @@ -1,8 +1,10 @@ -From 5f3541724e0812e23532fa7e9e89254b3e0c87c6 Mon Sep 17 00:00:00 2001 +From 77e0f36bfed0efeec0bfcfc997b82af973d4ea8e Mon Sep 17 00:00:00 2001 From: Shy Shyman Date: Sun, 28 Jun 2020 12:36:31 +0300 Subject: [PATCH] net/mlx5: fix flow META item validation +[ upstream commit 5f3541724e0812e23532fa7e9e89254b3e0c87c6 ] + When flow is inserted with meta match item it requires a certain register support. As part of the flow validation of such flows, the validation @@ -17,7 +19,6 @@ an error message will be issued. Fixes: 9bf26e1318e3 ("ethdev: move egress metadata to dynamic field") -Cc: stable@dpdk.org Signed-off-by: Shy Shyman Acked-by: Matan Azrad @@ -26,10 +27,10 @@ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 0bd1c99e6..8b5b6838f 100644 +index d83e49f95..930e16026 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1483,6 +1483,13 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -1395,6 +1395,13 @@ 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;