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 C219FA055A for ; Thu, 27 Feb 2020 10:34:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9B131F1C; Thu, 27 Feb 2020 10:34:42 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by dpdk.org (Postfix) with ESMTP id 992F41F1C for ; Thu, 27 Feb 2020 10:34:40 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id e8so2413491wrm.5 for ; Thu, 27 Feb 2020 01:34:40 -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=CMs7+9Ws7JHXdYxJehxBhfWmEjZzBXDPcrx0TvZlNz4=; b=rbbRAAeG3dC6NU8eWOqIV+Fwa2OnHqAXmNkESt1TxThv5ppS4BVWlCmuq16eT1FUTP yrCJyM4I402gFksLWc/24CWqPtQHrOfEoQ34kGHcLv18Gckit3XMN4exUkStKghpBNAQ tuTyyrh9nEg58OddUJIyRf9etMr2l5zIsD/rudu2ce13tkr/oVHOrLlSCeWLF7ClseiB qqu3IgWtCSv3Pl6FaqMyYKj22akY9rySY+dt+PLjq4kCHDbQk9ldBaaaA27P6EbPGaeu ys1EPX+odFxghEtc8C6br8p1WvUMBTYCnX9daMqecM8piXQL4kHpC649mBgUnnFcWPDy ZUrw== 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=CMs7+9Ws7JHXdYxJehxBhfWmEjZzBXDPcrx0TvZlNz4=; b=mQqOazJTZAVMYWKHWYmEhBbx8xilXbyr4k0CqOXz6UpIGGh45PIvuZtKrYkQaX2MwU eyx/hgIbQDgzBnb0wNeHpTMrXLBFCdpxs+SJDrsGPmOsg56sAkrlnSjfS9Wnnc7H3HTG uDTD6PzMA4Phqg1TyFk+lSVBCQecutd4D8sPnzGyVj4hpl3vEXj/GBo2hBZiwVqs7xP5 SeGJWTGq/gYH5PIgEE45yUppmyjJYG9u8VrEN9iiLj2lIN+OkNyLJpYPktifJiLV88hm IOGAwj22gvA9V35zF81l7oJwAPnfLaNDenMQiaoKkKGFnTp196mdVYYuIwbLgnQLvuvr KGMQ== X-Gm-Message-State: APjAAAXLXwgCCfnZa8tvJolMf6hF0A0qO10ASN8woGyF7MAZm8MnKKLA 589K5+Metr1AategUHevd3dbeJTDmp8= X-Google-Smtp-Source: APXvYqycvR6uPEh8UV/poSLuWnseVhsza5Y8oTJcdgG0CgoU8Ahz4km3wHOMwUejWOpUVWIleVgLBg== X-Received: by 2002:adf:f607:: with SMTP id t7mr3735050wrp.36.1582796080337; Thu, 27 Feb 2020 01:34:40 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q125sm7129944wme.19.2020.02.27.01.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:34:39 -0800 (PST) From: luca.boccassi@gmail.com To: Shiri Kuzin Cc: Viacheslav Ovsiienko , Matan Azrad , dpdk stable Date: Thu, 27 Feb 2020 09:33:35 +0000 Message-Id: <20200227093402.17690-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix ICMPv6 header rewrite action validation' 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/29/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 6076d4d16c9e7d1168c8be8c4035d6fa076db498 Mon Sep 17 00:00:00 2001 From: Shiri Kuzin Date: Tue, 18 Feb 2020 13:52:54 +0200 Subject: [PATCH] net/mlx5: fix ICMPv6 header rewrite action validation [ upstream commit e649994972cda23fc777f45f7b40c528313543ed ] ICMPv6 header contains the checksum field, that includes the IP addresses from IP header. The ConnectX-5 hardware does not support ICMPv6 checksum calculation and in case of IP header modification the checksum will contain the wrong value. The patch rejects the header modification actions related to IP addresses if ICMPv6 protocol is detected in pattern. This issue was also partly fixed in commit below which rejects flows with the pattern "ipv6 proto is 58". Fixes: 0e2ceb639d8a ("net/mlx5: fix ICMPv6 header rewrite actions") Signed-off-by: Shiri Kuzin Acked-by: Viacheslav Ovsiienko Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index cace0f31b5..7b5471b54a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4464,6 +4464,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, error); if (ret < 0) return ret; + item_ipv6_proto = IPPROTO_ICMPV6; last_item = MLX5_FLOW_LAYER_ICMP6; break; case RTE_FLOW_ITEM_TYPE_TAG: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.326220026 +0000 +++ 0015-net-mlx5-fix-ICMPv6-header-rewrite-action-validation.patch 2020-02-27 09:31:55.711945697 +0000 @@ -1,8 +1,10 @@ -From e649994972cda23fc777f45f7b40c528313543ed Mon Sep 17 00:00:00 2001 +From 6076d4d16c9e7d1168c8be8c4035d6fa076db498 Mon Sep 17 00:00:00 2001 From: Shiri Kuzin Date: Tue, 18 Feb 2020 13:52:54 +0200 Subject: [PATCH] net/mlx5: fix ICMPv6 header rewrite action validation +[ upstream commit e649994972cda23fc777f45f7b40c528313543ed ] + ICMPv6 header contains the checksum field, that includes the IP addresses from IP header. @@ -16,7 +18,6 @@ flows with the pattern "ipv6 proto is 58". Fixes: 0e2ceb639d8a ("net/mlx5: fix ICMPv6 header rewrite actions") -Cc: stable@dpdk.org Signed-off-by: Shiri Kuzin Acked-by: Viacheslav Ovsiienko @@ -26,10 +27,10 @@ 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 341d51152a..1c01269117 100644 +index cace0f31b5..7b5471b54a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -4621,6 +4621,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -4464,6 +4464,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, error); if (ret < 0) return ret;