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 53FFEA0524 for ; Fri, 5 Feb 2021 12:37:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DDC54067B; Fri, 5 Feb 2021 12:37:56 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id F0EED188A45 for ; Fri, 5 Feb 2021 12:37:54 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id d16so7271921wro.11 for ; Fri, 05 Feb 2021 03:37:54 -0800 (PST) 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=B/pk4Hrl+zx3f9DIYOj4ueD5qhDXB4yMLEbvMkKfs9c=; b=jtDMkg6dMEiDP9sVk8z4OZTNkWUsDtgPyt6RBl5e9E2+V8gINQl5sBNUOnbeMC+FeH +yc8Zbb1pTHVPbrz1LFgL9Sl/2fIWzC4Uw9iQoMupR5rD+2ny9QGQwok7t4kUpRbLZj+ 4L1Hx6q6W49hA2dd6jYL6+CLy2bwq9QVistJ7vEMIPCOrnVFA48FhyoOX5bptgEvRG6t 8eDzdPxd07IpQzOfAwuetni0gm/6RRZQXltIoeBMbzGVUG5SW6G934Fp+LOw1bqOYa19 IpBg/ror8xPiPV/TetxPrl6y63E8p1IaW6tSaYL8qFRkAX4jz/cJo8Q+sZ7kDFtXQ7FC qrIw== 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=B/pk4Hrl+zx3f9DIYOj4ueD5qhDXB4yMLEbvMkKfs9c=; b=QW6nw0oU5JoIuAeUk7ZsVss+6SbHil8xKHanZmLgECjCPa6DgEs59L5lmzY8F7vVY1 pzrMINv1z6TGk4POiHMxXGc0HnecDbsWGhNA7Ge01/jjK0POsc4RlPgmifwuvJQv9aD7 a6AS9qI6ow1EkHd/6BPy1yui9Wkk4o88CWN66MmOmxqcULWvHzJrvOhASpHbfZAhfX0r RCtuSaUdWaiokS7chSBrl0J1QvdbRWdU2RZZ+E5zlub+6qujI539lUsSE6yanmVY9Bd/ clkRHK7nSkAtOIgO1Nf2VgjplHOCJsKeq65a2ModeM+0TSHRKoxDNE8M+7fBr1XpaiTY RMOw== X-Gm-Message-State: AOAM533hvQhgmAazXeImgRVEAl05Jm9MkokU1rcU1EQUmspEY8S1mJOx wtRB5Roy9Mi3PN7X6M3ka6isA0xRW8N4v+xQ X-Google-Smtp-Source: ABdhPJxkijm0iotCXisaoiuZSTqEZSA/vyWzbg4BBXdXCZhYz0RHAyFNf+h7YImF5RoN+xTq6BKefg== X-Received: by 2002:a5d:6944:: with SMTP id r4mr4513778wrw.399.1612525074792; Fri, 05 Feb 2021 03:37:54 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q7sm11727632wrx.18.2021.02.05.03.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:37:54 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 5 Feb 2021 11:18:43 +0000 Message-Id: <20210205111920.1272063-237-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix drop action in tunnel offload mode' has been queued to stable release 20.11.1 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 20.11.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 02/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/86c8dc0a650e7b155eaa4c7835c5e701c0c0c57c Thanks. Luca Boccassi --- >From 86c8dc0a650e7b155eaa4c7835c5e701c0c0c57c Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Wed, 20 Jan 2021 21:17:10 +0200 Subject: [PATCH] net/mlx5: fix drop action in tunnel offload mode [ upstream commit 49be011d3c87fd1b5d5d791744e9d969dff26bc1 ] Tunnel offload mode allows application to restore partially offloaded tunneled packets to its original state. The mode was designed to optimize packet recovery. It must not block flow actions that are allowed by MLX5 PMD. The patch allows tunnel offload match rules to use drop flow action. Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index afd80afa38..0841279f14 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6110,8 +6110,11 @@ 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. + * Drop action compatibility with tunnel offload was already validated. */ - if ((action_flags & MLX5_FLOW_ACTION_DROP) && + if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_MATCH | + MLX5_FLOW_ACTION_TUNNEL_MATCH)); + else if ((action_flags & MLX5_FLOW_ACTION_DROP) && (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_COUNT))) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:39.623323295 +0000 +++ 0237-net-mlx5-fix-drop-action-in-tunnel-offload-mode.patch 2021-02-05 11:18:29.238699337 +0000 @@ -1 +1 @@ -From 49be011d3c87fd1b5d5d791744e9d969dff26bc1 Mon Sep 17 00:00:00 2001 +From 86c8dc0a650e7b155eaa4c7835c5e701c0c0c57c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 49be011d3c87fd1b5d5d791744e9d969dff26bc1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index faafc92bc8..9ffd6ec1a8 100644 +index afd80afa38..0841279f14 100644 @@ -26 +27 @@ -@@ -6228,8 +6228,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -6110,8 +6110,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,