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 3A854A0524 for ; Fri, 5 Feb 2021 12:37:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E3814067B; Fri, 5 Feb 2021 12:37:54 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id C5F274067B for ; Fri, 5 Feb 2021 12:37:53 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id c4so7283311wru.9 for ; Fri, 05 Feb 2021 03:37:53 -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=2Uwo2s5tVxqU9Ji9qSoBMaQn5G/AuKKcgaC77kOMNY8=; b=tQy+9XQUP8rNN7rLG3lr/RbqC0sSWCvZknbsPq31GJKOYXKZL4lBm9pEhLeKLFD6eE XDPulhZHIzt28xtE+pGphfAXZDz7LWzvYOy+QeqKvLyDzIyNHzH7zz1t6DE0WEKts4RT fmVUtM+puPMIzMgt5mFJ3zf9w3wT+LVnnyhVMoxwpVsYPvXcI6+t4+sAsu8A9K2tcZhG QWQu8Y97ViG3FgjIG+zlyhyBZi5UQyXK9moBncasukakPWMDHlXP0clTDI4hpbBRTaWN HVbhHn3yqdUB6AEGsQJfhGhG1ortmG79YmbjAI2eKGya9q6LiTF4aUqPqcFsImOB1TMm LvFQ== 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=2Uwo2s5tVxqU9Ji9qSoBMaQn5G/AuKKcgaC77kOMNY8=; b=hZjTgGTxdvGMwvg1rw5TmYkvjbtjz8rsqLlLmoul2mTgH/6HwOs/Z0NRxkfvEN66B/ FmodQ54uyvlebcpBA55DfwV8PZjj3S2Ig36ohSkqpErGnMnuiD1Y1jFt7D3glAz9FCI8 o7qmyGPxP4UZsk9mEoooINtPg0pX7oAbPloTCExzkMoCqzxW3YLhBAm6jT0e3Kl24YKe jz/oYcalpGjCgSpYdnfwsmkEvRRjxW5XVMwkFRj9Nx8WPH1dmDxLA6Zskq69Bhdx0Hl4 x3OF0oZL4/OllyGYzBencqjPg7GUSh+BNucrEXd+HQvFrL+YIbqAfE654SydtTjvB8r2 5I6Q== X-Gm-Message-State: AOAM532vF8Ev0cQfBLHmKfYkSvtL3ZisWPVe9X4BTXAfktS2hx324htv CLrRi240VkjdR27YVS7tRXI= X-Google-Smtp-Source: ABdhPJxwy0VxKZh9ckN1mIkSL/NxuoVECiWAJFz2qtDuDoBdXQGpnuUbApluuSzJjvMEYzRnUrEwTQ== X-Received: by 2002:a5d:544b:: with SMTP id w11mr4646114wrv.1.1612525073611; Fri, 05 Feb 2021 03:37:53 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q24sm8373364wmq.24.2021.02.05.03.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:37:53 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 5 Feb 2021 11:18:42 +0000 Message-Id: <20210205111920.1272063-236-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 mark action in active tunnel offload' 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/973e9a91283b2b55e2a09d8a585d7d97d275a085 Thanks. Luca Boccassi --- >From 973e9a91283b2b55e2a09d8a585d7d97d275a085 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Wed, 20 Jan 2021 21:17:09 +0200 Subject: [PATCH] net/mlx5: fix mark action in active tunnel offload [ upstream commit 31cb857d092395026ee9274cca47ed3e0eb908fd ] Tunnel offload mode allows application to restore partially offloaded tunneled packets to its original state. MLX5 PMD stores internal data required to restore partially offloaded packet in packet mark section. Therefore MLX5 PMD will not allow applications to use mark action if tunnel offload mode was activated. The restriction is applied both to regular and tunnel offload rules. The patch rejects application rules with mark action while tunnel offload is active. 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, 5 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index ae836c6a52..afd80afa38 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -2375,6 +2375,11 @@ flow_dv_validate_action_mark(struct rte_eth_dev *dev, const struct rte_flow_action_mark *mark = action->conf; int ret; + if (is_tunnel_offload_active(dev)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "no mark action " + "if tunnel offload active"); /* Fall back if no extended metadata register support. */ if (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY) return mlx5_flow_validate_action_mark(action, action_flags, -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:39.575938615 +0000 +++ 0236-net-mlx5-fix-mark-action-in-active-tunnel-offload.patch 2021-02-05 11:18:29.230699185 +0000 @@ -1 +1 @@ -From 31cb857d092395026ee9274cca47ed3e0eb908fd Mon Sep 17 00:00:00 2001 +From 973e9a91283b2b55e2a09d8a585d7d97d275a085 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 31cb857d092395026ee9274cca47ed3e0eb908fd ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index f32d6c12df..faafc92bc8 100644 +index ae836c6a52..afd80afa38 100644 @@ -29 +30 @@ -@@ -2445,6 +2445,11 @@ flow_dv_validate_action_mark(struct rte_eth_dev *dev, +@@ -2375,6 +2375,11 @@ flow_dv_validate_action_mark(struct rte_eth_dev *dev,