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 7433CA051C for ; Tue, 11 Feb 2020 12:40:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6928D1DB9; Tue, 11 Feb 2020 12:40:56 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id B51C11BFA7 for ; Tue, 11 Feb 2020 12:40:54 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id g3so10863213wrs.12 for ; Tue, 11 Feb 2020 03:40: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=MiXLuO+AIH3B2pwLa7Vo5n7jt6aIc17NEkPu+BmDD+M=; b=W4aB9BsB1EmbicGVtKN/1UzsUMVt87MsroYCNmsVNUeXrZjKI9PAZNulF9N9sTcVWr NyY7NbhWuTHKunyg76uB3+NKH7m6/v5hU9FRqW9zIp/0pR2VN/3IXkP9VJPDK+WfMlZF N59DfvgvDZ2MNyI1w7gnwnUR9lkuM4E9T/il+z5PZgaCx+dhbSpB4J5egql33s7ixpHs Yt78ftMzvspVtqj7e66Jrv3xHPfzD2V372jcjwWg/05kLqH0mNZUVqE5SYIe6DmSrzFC DamNdnGkvQE7n5i80hELXPRHv1MYTR5DQWAg0x6DoRX2RsG9sYz7c4QIunZtN/4doK/0 kYhg== 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=MiXLuO+AIH3B2pwLa7Vo5n7jt6aIc17NEkPu+BmDD+M=; b=kt4yXcnd8TG47O69HHEnlAeQcXp5WwsWLMt8YHXV4wwspvOlXLufq/GAO0BZVxmHnX YX6ItpLE7uHkdFA39uwkNAawrmXJlNaFeD+3rSN0PGXcXQjD78hUb+iLQynYpiFRNjpo k0PjJ0QXNGAJ9zUfkrpA+zWjgFDYn1nviYARsN7XfMPla0sG6Wd+3r/35qUp/C8kls3g MAY0EFg9uJXgqjdBkiryv3F+c9RaY1GkZx+/9fQJdQUJSzN9PyCBaazqvVldleYvDbWh S8CFlo8ccD0RqlZDz34zG8r0h/o0FohEl8cOt7NwM9PFroVd6aC8izt/2y18hw5ToO4J gyzg== X-Gm-Message-State: APjAAAULUqeIqSVJtxUWODNlWvilY2aiRSon6Rl5I7wMLhwtXvsSUE8o Z2Krdg+GQ1cluiSGC5RSoAVjJsRY0Ps= X-Google-Smtp-Source: APXvYqyDQlkq8mt3BDErKdacanYeEOpJu3ItSon3Xy6CRnr2dHig9n0WzpzhCPo4b7GDIoNHFV/7VA== X-Received: by 2002:a5d:4e91:: with SMTP id e17mr7744562wru.233.1581421253027; Tue, 11 Feb 2020 03:40:53 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w19sm3270059wmc.22.2020.02.11.03.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:52 -0800 (PST) From: luca.boccassi@gmail.com To: Eli Britstein Cc: Matan Azrad , dpdk stable Date: Tue, 11 Feb 2020 11:21:39 +0000 Message-Id: <20200211112216.3929-153-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix zero out UDP checksum in encap data' has been queued to stable release 19.11.1 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.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/13/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 bca9bb5550c52b1e3f69c92bd2561b44e0225d49 Mon Sep 17 00:00:00 2001 From: Eli Britstein Date: Wed, 22 Jan 2020 15:03:58 +0000 Subject: [PATCH] net/mlx5: fix zero out UDP checksum in encap data [ upstream commit 27767e217f8a7a9333967ddf5f98abe7943393aa ] The cited commit zeroed the UDP checksum for raw-encap case. Add the same handling for vxlan-encap case. Fixes: bf1d7d9a033a ("net/mlx5: zero out UDP checksum in encapsulation") Signed-off-by: Eli Britstein Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 3fa34f5e8c..0079d4a8c7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -2782,8 +2782,6 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev, (const struct rte_flow_action_raw_encap *)action->conf; res.size = raw_encap_data->size; memcpy(res.buf, raw_encap_data->data, res.size); - if (flow_dv_zero_encap_udp_csum(res.buf, error)) - return -rte_errno; } else { if (action->type == RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP) encap_data = @@ -2797,6 +2795,8 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev, &res.size, error)) return -rte_errno; } + if (flow_dv_zero_encap_udp_csum(res.buf, error)) + return -rte_errno; if (flow_dv_encap_decap_resource_register(dev, &res, dev_flow, error)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.957294736 +0000 +++ 0153-net-mlx5-fix-zero-out-UDP-checksum-in-encap-data.patch 2020-02-11 11:17:38.728007480 +0000 @@ -1,13 +1,14 @@ -From 27767e217f8a7a9333967ddf5f98abe7943393aa Mon Sep 17 00:00:00 2001 +From bca9bb5550c52b1e3f69c92bd2561b44e0225d49 Mon Sep 17 00:00:00 2001 From: Eli Britstein Date: Wed, 22 Jan 2020 15:03:58 +0000 Subject: [PATCH] net/mlx5: fix zero out UDP checksum in encap data +[ upstream commit 27767e217f8a7a9333967ddf5f98abe7943393aa ] + The cited commit zeroed the UDP checksum for raw-encap case. Add the same handling for vxlan-encap case. Fixes: bf1d7d9a033a ("net/mlx5: zero out UDP checksum in encapsulation") -Cc: stable@dpdk.org Signed-off-by: Eli Britstein Acked-by: Matan Azrad @@ -16,10 +17,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index fc156a348f..a32f0be803 100644 +index 3fa34f5e8c..0079d4a8c7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -2883,8 +2883,6 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev, +@@ -2782,8 +2782,6 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev, (const struct rte_flow_action_raw_encap *)action->conf; res.size = raw_encap_data->size; memcpy(res.buf, raw_encap_data->data, res.size); @@ -28,7 +29,7 @@ } else { if (action->type == RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP) encap_data = -@@ -2898,6 +2896,8 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev, +@@ -2797,6 +2795,8 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev, &res.size, error)) return -rte_errno; }