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 A5A76A051C for ; Tue, 11 Feb 2020 12:40:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9D5501BFA7; Tue, 11 Feb 2020 12:40:38 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 63AAC1BFA7 for ; Tue, 11 Feb 2020 12:40:37 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id s10so3093305wmh.3 for ; Tue, 11 Feb 2020 03:40:37 -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=Oivz1gi0sR8PcHgMHSQJ0a1IiE8ZgtuPimDWhi4hDSo=; b=arUv93u3ZxZMRN0RRQH4KUwyrRh2nrCVuNuJqNHg8goqmABb0/oe+YAmsnsN3vvQb3 pOMrFIGX9ATD6tbl9O3zj/ogo2VEbG+mzQZY/qVfFvG922J5iJ0B2Vx/VSRGfFW71QPz pxGzdEqmV9N8DpcTzYYOLQufSK2srUNDYo9XssRBQGvDG1hNriTNoqMfeTQKiC35quJm K4AKEFPd7TMMFYqT6rtOw1xAxW1M0xiW0hnf0jbMS82s16LC8CYWLGb31QOREvmr3/rb N6JbW4lnhkc5ZRNjn/umr5WQKtBDKj+GmHxosl+Iu3mdeXQN/YszrDG5NAZqxhoIr8bA b7jw== 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=Oivz1gi0sR8PcHgMHSQJ0a1IiE8ZgtuPimDWhi4hDSo=; b=cFXdhmrBWhxxhQf85kZ4RoDXp6POWly+JUIRldLChqlbLEWI8g3ZaCPko+c3HeET0y keolbq1OdfY4ZHx6kByBbd1upVgx3cbtTr30E7bJANxnZKJ8GC700jlapH9CeNyd0Euh WzxNJqbH0F7V0r7jdBy3z2VF20mhmo01sQLp76sat8SAsS3rcsPLoqqR6Wi9KtSzRSO5 z2NQF9TPqCGCRSJwdz7lQ0CeR9MgmqYTslMiHOsiy4LJaW+nftJgCV3jyvM73SMZCoFc SgVCpTfjtR14KgQiC8YeKj9c49w0SC4mlOwJ7kFkSOwuTOowucm27YhcVs5mamTk/U4h iFkg== X-Gm-Message-State: APjAAAUuVmGGYxJmjAnefavevMhfUc1SXbnkOiPnAUfLx9dVJoprLrFH 5bkZy74HRfZwPAN0xXO+MZQ= X-Google-Smtp-Source: APXvYqyezXkntK1OMAD5Az7SVXk2BStkOWt+f27OnXnNhPImOTsHwixJ8e4MNBKe9HQNR4SKxK2hNQ== X-Received: by 2002:a7b:cd8e:: with SMTP id y14mr5261989wmj.150.1581421235633; Tue, 11 Feb 2020 03:40:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p12sm2956196wrx.10.2020.02.11.03.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:35 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:30 +0000 Message-Id: <20200211112216.3929-144-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 masks of encap and decap actions' 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 99840fa1b3e0639a6036cfece0721b8b379c99bc Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:13 +0200 Subject: [PATCH] net/mlx5: fix masks of encap and decap actions [ upstream commit 06742ada54dd961bd2d03f95a18c38d68a231355 ] PUSH_VLAN and POP_VLAN actions flags were added to ENCAP_ACTIONS and DECAP_ACTIONS bit masks, respectively. This is incorrect, because VLAN actions are considered as 'modify header' actions, not as 'packet reformat' actions. This patch removes the PUSH_VLAN and POP_VLAN actions flags from ENCAP_ACTIONS and DECAP_ACTIONS bit masks. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") Signed-off-by: Dekel Peled Acked-by: Ori Kam Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 13bed08d75..1213b21426 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -213,13 +213,11 @@ enum mlx5_feature_name { #define MLX5_FLOW_ENCAP_ACTIONS (MLX5_FLOW_ACTION_VXLAN_ENCAP | \ MLX5_FLOW_ACTION_NVGRE_ENCAP | \ - MLX5_FLOW_ACTION_RAW_ENCAP | \ - MLX5_FLOW_ACTION_OF_PUSH_VLAN) + MLX5_FLOW_ACTION_RAW_ENCAP) #define MLX5_FLOW_DECAP_ACTIONS (MLX5_FLOW_ACTION_VXLAN_DECAP | \ MLX5_FLOW_ACTION_NVGRE_DECAP | \ - MLX5_FLOW_ACTION_RAW_DECAP | \ - MLX5_FLOW_ACTION_OF_POP_VLAN) + MLX5_FLOW_ACTION_RAW_DECAP) #define MLX5_FLOW_MODIFY_HDR_ACTIONS (MLX5_FLOW_ACTION_SET_IPV4_SRC | \ MLX5_FLOW_ACTION_SET_IPV4_DST | \ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.647251202 +0000 +++ 0144-net-mlx5-fix-masks-of-encap-and-decap-actions.patch 2020-02-11 11:17:38.660006209 +0000 @@ -1,8 +1,10 @@ -From 06742ada54dd961bd2d03f95a18c38d68a231355 Mon Sep 17 00:00:00 2001 +From 99840fa1b3e0639a6036cfece0721b8b379c99bc Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:13 +0200 Subject: [PATCH] net/mlx5: fix masks of encap and decap actions +[ upstream commit 06742ada54dd961bd2d03f95a18c38d68a231355 ] + PUSH_VLAN and POP_VLAN actions flags were added to ENCAP_ACTIONS and DECAP_ACTIONS bit masks, respectively. This is incorrect, because VLAN actions are considered as 'modify @@ -13,7 +15,6 @@ Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -23,10 +24,10 @@ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h -index 9832542328..f771cac42e 100644 +index 13bed08d75..1213b21426 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h -@@ -212,13 +212,11 @@ enum mlx5_feature_name { +@@ -213,13 +213,11 @@ enum mlx5_feature_name { #define MLX5_FLOW_ENCAP_ACTIONS (MLX5_FLOW_ACTION_VXLAN_ENCAP | \ MLX5_FLOW_ACTION_NVGRE_ENCAP | \