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 DBD3AA00C2 for ; Wed, 23 Nov 2022 19:04:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D793442DA9; Wed, 23 Nov 2022 19:04:54 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3465840E5A for ; Wed, 23 Nov 2022 19:04:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0L8txGFBoj5nNsT4ze5YCwxMuhGegYHETF5+7T5RcSw=; b=aHFVhEV0Jn6f/ySUhXgIN7Egrsg8DKuCExSSHaq7R4ImYp94n9NIG1MsYZYd0hc0CZrjiG kPlapKOzUBT34NCgXwioGTiFEsIJG8kldBmJs3mYN3FxYH8BRJ+4DCkUGD9RHvSZ6AqwH9 4KNs0ffNV3IxrlGVVT+b04yWLLklGVY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-65-OHfmLHj4NkyUESQHRRCkXQ-1; Wed, 23 Nov 2022 13:04:48 -0500 X-MC-Unique: OHfmLHj4NkyUESQHRRCkXQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF3CB29AA3B8; Wed, 23 Nov 2022 18:04:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AC80492B07; Wed, 23 Nov 2022 18:04:47 +0000 (UTC) From: Kevin Traynor To: Shun Hao Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix drop action validation' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:32 +0000 Message-Id: <20221123180413.733554-19-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.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 11/28/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3e76df459a703b7fa745053282ba13117d00ad9f Thanks. Kevin --- >From 3e76df459a703b7fa745053282ba13117d00ad9f Mon Sep 17 00:00:00 2001 From: Shun Hao Date: Thu, 10 Nov 2022 08:59:21 +0200 Subject: [PATCH] net/mlx5: fix drop action validation [ upstream commit e2b05b22ec5c8fbe35abf8a38e02bd2997e052a3 ] Currently there's limitation for Drop action that can only co-exist with Count action. Sample and Age actions are also able to exist with Drop within the same flow, and this patch includes them in the Drop action validation. Fixes: 70faf9ae0a29 ("net/mlx5: unify validation of drop action") Signed-off-by: Shun Hao Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.h | 3 +++ drivers/net/mlx5/mlx5_flow_dv.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 094e483325..7b5fde4823 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -268,4 +268,7 @@ enum mlx5_feature_name { #define MLX5_FLOW_ACTION_CT (1ull << 41) +#define MLX5_FLOW_DROP_INCLUSIVE_ACTIONS \ + (MLX5_FLOW_ACTION_COUNT | MLX5_FLOW_ACTION_SAMPLE | MLX5_FLOW_ACTION_AGE) + #define MLX5_FLOW_FATE_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index c3a2a658e1..4603736c28 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7916,5 +7916,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, * Validate the drop action mutual exclusion with other actions. * Drop action is mutually-exclusive with any other action, except for - * Count action. + * Count/Sample/Age actions. * Drop action compatibility with tunnel offload was already validated. */ @@ -7922,10 +7922,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, MLX5_FLOW_ACTION_TUNNEL_MATCH)); else if ((action_flags & MLX5_FLOW_ACTION_DROP) && - (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_COUNT))) + (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_DROP_INCLUSIVE_ACTIONS))) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "Drop action is mutually-exclusive " "with any other action, except for " - "Count action"); + "Count/Sample/Age action"); /* Eswitch has few restrictions on using items and actions */ if (attr->transfer) { -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.549328687 +0000 +++ 0019-net-mlx5-fix-drop-action-validation.patch 2022-11-23 09:55:57.049149256 +0000 @@ -1 +1 @@ -From e2b05b22ec5c8fbe35abf8a38e02bd2997e052a3 Mon Sep 17 00:00:00 2001 +From 3e76df459a703b7fa745053282ba13117d00ad9f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e2b05b22ec5c8fbe35abf8a38e02bd2997e052a3 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 955383dd07..94e0ac99b9 100644 +index 094e483325..7b5fde4823 100644 @@ -26,2 +27,2 @@ -@@ -305,4 +305,7 @@ enum mlx5_feature_name { - #define MLX5_FLOW_ACTION_INDIRECT_AGE (1ull << 44) +@@ -268,4 +268,7 @@ enum mlx5_feature_name { + #define MLX5_FLOW_ACTION_CT (1ull << 41) @@ -35 +36 @@ -index d79dd8d5f0..bc9a75f225 100644 +index c3a2a658e1..4603736c28 100644 @@ -38 +39 @@ -@@ -8104,5 +8104,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7916,5 +7916,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -45 +46 @@ -@@ -8110,10 +8110,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7922,10 +7922,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,