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 16B1AA0527 for ; Wed, 25 Nov 2020 10:03:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0CEFEC952; Wed, 25 Nov 2020 10:03:22 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 4E0BFC952 for ; Wed, 25 Nov 2020 10:03:20 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id x13so1061487wmj.1 for ; Wed, 25 Nov 2020 01:03:20 -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=W9iFITu/+T2EC9TwDTEkriFYrKnqPVYyguP0CDOsGfg=; b=AAwWK3oZ/2G4h3O4R/4CsD5WSphvcw5uvxBtzX8Otzeze8ljgiSomd3Z7M2Q6bVlK7 jfujTUzIDOXDy2JFgLHQ6ZpyGwbux7bhV7ddiuMNWwPP7uoqOptLHBf03k+kD1za7EuB WpjoBgIQp9AUYvi23+1NNvnULLfhmVODiyN5YImBHeyb2b/mojLoTpBWekkQmaq1wNF1 8+F+FaFBZFrjaR9HwQnztV3yDuLg7pzwTQE13QBwK8AR+j95U0yT/hwnB0YlhEUfaVkD OavYj2PLw5YhaNTZg8J6RdnUYqO/BZnBB8sk40BmFUkLL3lESfDUnzq1Lu/rDekeJBoE 8n6Q== 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=W9iFITu/+T2EC9TwDTEkriFYrKnqPVYyguP0CDOsGfg=; b=P8wgFNbUHjkaAR9tdBrF3jMEeS5TOnmgRieGl+4ezfPPbIt2QlupauNk2yqbkafRRP VrFNxWNvkNZCDR2OG7FgORzlTcZX7NNuefWbQlIe24hEm9rvPX0MFuFQfkD4ccH5LSJZ 8QIwrYPad4RzZ1R9xHAQOgJ6rsiZEWWdK2578TkKk0jQ2vC0tOEBKnFAGLtjpcySitjn BVsDtsDQoDpnpp3FaxiKT38W4rr9dZAlKztCJSWK/TgRMd75me9pPMSyBwQSqbzEQquM yxzSvCxy4pWLkLjbcylYLFo0+4fYietZqWiKagJBcEKa5R4lh1ZRu13xl3v10ohF6Ouf ekFg== X-Gm-Message-State: AOAM533XDnHDsH7V1A7tnQmYzGiUlvg6FqFr/vUUmiC0lu+r/DSTp096 d5uh43qOZLmWDiQcHUb8eN4KnF7wmPdBvg== X-Google-Smtp-Source: ABdhPJyhWCS2zD2+l5P1Mk3rUzmnbfLygosN110bB4qp1uS3iG+cGinB3iLjCPeIYYfsln3GkmPlUg== X-Received: by 2002:a1c:2d5:: with SMTP id 204mr2708061wmc.181.1606294999083; Wed, 25 Nov 2020 01:03:19 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 90sm3725626wra.95.2020.11.25.01.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:18 -0800 (PST) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Ori Kam , Suanming Mou , dpdk stable Date: Wed, 25 Nov 2020 09:02:48 +0000 Message-Id: <20201125090258.21457-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125090258.21457-1-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> <20201125090258.21457-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix raw encap/decap limit' has been queued to stable release 19.11.6 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.6 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/26/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. 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/14364aebfadbb5783acb1479214ce0d3a26d3fc1 Thanks. Luca Boccassi --- >From 14364aebfadbb5783acb1479214ce0d3a26d3fc1 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 18 Nov 2020 07:37:30 +0000 Subject: [PATCH] net/mlx5: fix raw encap/decap limit [ upstream commit f9210259cac7836f78893dc6b0aede8664c1077e ] The MLX5_ENCAPSULATION_DECISION_SIZE constant is used to check the raw encap/decap actions for the raw header size. The header is constructed of the rte_xxx_hdr structures instead of rte items. Hence, constant must be defined with rte_xxx_hdr structure sizes. Fixes: 50f576d657d7 ("net/mlx5: fix VLAN actions in meter") Signed-off-by: Viacheslav Ovsiienko Acked-by: Ori Kam Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index f8046119ec..4300e62fad 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -327,8 +327,8 @@ enum mlx5_feature_name { #define MLX5_GENEVE_OPT_LEN_0 14 #define MLX5_GENEVE_OPT_LEN_1 63 -#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \ - sizeof(struct rte_flow_item_ipv4)) +#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_ether_hdr) + \ + sizeof(struct rte_ipv4_hdr)) /* Software header modify action numbers of a flow. */ #define MLX5_ACT_NUM_MDF_IPV4 1 -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:36.814988409 +0000 +++ 0006-net-mlx5-fix-raw-encap-decap-limit.patch 2020-11-24 16:50:36.557496061 +0000 @@ -1 +1 @@ -From f9210259cac7836f78893dc6b0aede8664c1077e Mon Sep 17 00:00:00 2001 +From 14364aebfadbb5783acb1479214ce0d3a26d3fc1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f9210259cac7836f78893dc6b0aede8664c1077e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index afddcfc12c..1c3c6abea2 100644 +index f8046119ec..4300e62fad 100644 @@ -26 +27 @@ -@@ -345,8 +345,8 @@ enum mlx5_feature_name { +@@ -327,8 +327,8 @@ enum mlx5_feature_name { @@ -35,2 +36,2 @@ - /* IPv4 fragment_offset field contains relevant data in bits 2 to 15. */ - #define MLX5_IPV4_FRAG_OFFSET_MASK \ + /* Software header modify action numbers of a flow. */ + #define MLX5_ACT_NUM_MDF_IPV4 1