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 DB271A055A for ; Thu, 27 Feb 2020 10:34:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D349A1BFE6; Thu, 27 Feb 2020 10:34:43 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by dpdk.org (Postfix) with ESMTP id 649111F1C for ; Thu, 27 Feb 2020 10:34:42 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id r17so2408386wrj.7 for ; Thu, 27 Feb 2020 01:34:42 -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=4ZY3mLC5CDfqYKvb0W32AXZ0FFx4KXZLNNSBXOXaxNc=; b=afuBN7meI9gqfqEgpkUI+jo0/vLQVYD8Cd7uH6aZqUk2NRWtpria9jg5JXndTcDoXz MVrWgz+uPfmgs7utV8rsv96Zc5cmklaJCuc2axeYaOgQm7xWoX70tzaXGWiDaOAdv1Vn jW6Zuxx6sDH9Pia1Gw3NEPJxnMAhGOysSPj45KbaNm/KqLP5dn74x9/5EA1Vi/pC2b+1 ZmKdW9m9jUcZPouV/poxQCfPXyP3HBYOFRFW+ovRFMyNvFGPabGI/PvgFdywm2xqbUkA MHzzzJy1QQlVaQNnSekReZ5A2Rn1+8tYlhpHvGglO/NQxbhlGxaqQWiPuZi3ITfABlxz ZpKg== 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=4ZY3mLC5CDfqYKvb0W32AXZ0FFx4KXZLNNSBXOXaxNc=; b=dFw9qlODFXsuXKiGjYJYmMOOt0PiFl1H++rY/ofQjGHWU5wkiqxZG0TUioQjLgAdDN oqmUIC67R1Gm2KkrZ3y1DwhOBgT58SEqjD5XqcPWTl1VaYUFz9Hi417LIf4XjKssHDjl fhvo8vZphTMK9tf4UT5gFb5jvv7MdPbUANB8HRl4grEdgLr1cs7MGYm3exnb+Wpf9unX XodLjkFBjrBfCUvhxd79VkV65vU7dOetOoSCiWkDTW5ySB0d9K8I07jrNgSNB7k8FK8O WvY9fZXcUBBSUJi6tksY7qpAi1Ql+HKL+Bg+MEgCmLGZ/VgvxycIrRB6sg7LUzxFJoxp fX6A== X-Gm-Message-State: APjAAAULA2o/H0huM3D1PwGSspuHhCYAQt6LainIbFqQcb1FSG8hMrQJ pBgjk8zOhO7Wp5mcZhTw2as= X-Google-Smtp-Source: APXvYqxVHcEyyf4gBOZwW/pRJmW1or9h7jtgDGmm+dM7HUHICCPfvqaIfrdaIcupkvMaeRsCzhgZbA== X-Received: by 2002:a5d:6b03:: with SMTP id v3mr3601551wrw.289.1582796082119; Thu, 27 Feb 2020 01:34:42 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r3sm7216213wrn.34.2020.02.27.01.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:34:41 -0800 (PST) From: luca.boccassi@gmail.com To: Matan Azrad Cc: Ori Kam , dpdk stable Date: Thu, 27 Feb 2020 09:33:36 +0000 Message-Id: <20200227093402.17690-16-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 flow match on GRE key' 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 d8858ade2807f6a34397c4ec211a1a78053d0035 Mon Sep 17 00:00:00 2001 From: Matan Azrad Date: Tue, 18 Feb 2020 14:45:20 +0000 Subject: [PATCH] net/mlx5: fix flow match on GRE key [ upstream commit 38ad946892830c9fb5f8fe221bf677ee8e9bc819 ] The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should be present on the flow and in addition can explicitly match on the GRE key field itself. When no value is set in this item any GRE key should match the flow. The match on GRE key wrongly was not added if the item fields are NULL while at least the GRE key should be present in the flow. Add the GRE key present match when RTE_FLOW_ITEM_TYPE_GRE_KEY is in the flow item list. Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") Signed-off-by: Matan Azrad Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7b5471b54a..f3d9ae5bc4 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -5372,13 +5372,13 @@ flow_dv_translate_item_gre_key(void *matcher, void *key, void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters); rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX); - if (!key_v) - return; - if (!key_m) - key_m = &gre_key_default_mask; /* GRE K bit must be on and should already be validated */ MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1); MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1); + if (!key_v) + return; + if (!key_m) + key_m = &gre_key_default_mask; MLX5_SET(fte_match_set_misc, misc_m, gre_key_h, rte_be_to_cpu_32(*key_m) >> 8); MLX5_SET(fte_match_set_misc, misc_v, gre_key_h, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.359803386 +0000 +++ 0016-net-mlx5-fix-flow-match-on-GRE-key.patch 2020-02-27 09:31:55.719945756 +0000 @@ -1,8 +1,10 @@ -From 38ad946892830c9fb5f8fe221bf677ee8e9bc819 Mon Sep 17 00:00:00 2001 +From d8858ade2807f6a34397c4ec211a1a78053d0035 Mon Sep 17 00:00:00 2001 From: Matan Azrad Date: Tue, 18 Feb 2020 14:45:20 +0000 Subject: [PATCH] net/mlx5: fix flow match on GRE key +[ upstream commit 38ad946892830c9fb5f8fe221bf677ee8e9bc819 ] + The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should be present on the flow and in addition can explicitly match on the GRE key field itself. @@ -16,7 +18,6 @@ the flow item list. Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") -Cc: stable@dpdk.org Signed-off-by: Matan Azrad Acked-by: Ori Kam @@ -25,10 +26,10 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 1c01269117..467d1ce6b1 100644 +index 7b5471b54a..f3d9ae5bc4 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -5594,13 +5594,13 @@ flow_dv_translate_item_gre_key(void *matcher, void *key, +@@ -5372,13 +5372,13 @@ flow_dv_translate_item_gre_key(void *matcher, void *key, void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters); rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);