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 32306A0351 for ; Thu, 6 Aug 2020 11:58:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2A9D71C0D7; Thu, 6 Aug 2020 11:58:18 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 402771C0D0 for ; Thu, 6 Aug 2020 11:58:16 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id r2so38301439wrs.8 for ; Thu, 06 Aug 2020 02:58:16 -0700 (PDT) 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=9svwQRoYzafLy4BkxWfvWFrNiBucVnWbgclCixA6HVc=; b=MEy30UA7zAtuUC8iYOJvcMKFS9zSQNiAId2Y0hIGu2BFCeI1XwuWAr2zyJQq9P5M+w bVNIf7eCNTzui876TdIPQutqW8C7X67UGxMnlTq8ahs2dOI1ZZOOflUrwIk0yUQCTD2W uzvQnAGycAFQJBfs/txZyI1H/rOQQEf79lFQf0ggleoOyyNqKeGGR6x3YsG0wAvkiq7x SEwyucA2qWEuXBagbpU23Sm/PVTooB/3cp9H0b+ck6sQgoz1v6u91N8l64+6nQoDcLfq 9UujsNbpe3Uglti/0jzM7vKRdrQkzk1S4PPcQp9mskwMQ2sEzTepsS2x//DTrIG7jhVn 7/TQ== 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=9svwQRoYzafLy4BkxWfvWFrNiBucVnWbgclCixA6HVc=; b=YDmxBiPr6OSJBm4X8cLJSIbKvoZ34mshg8itCw0ecYVZHfHtXdJHX7hbY9vB2jC8X/ GuPcE3ciPmo/tqpsa4qoK+A4HLNj8UKxAGEaYXZxgmSZ03L7bGbmSCmPyWXeG+5kOMDP lFdmHagSSzsVKD0SSvxrEGczLPvjiZY4qYsjhelVxp/gXq1WNIVrcLGm0boYJ00YQyVw +h5OCCB3740L8uzBBEDgO5XDYaz8hoRX41qGzGB+rva0i0pgbv7C7NX+avfftlA6cXam cVy3aJsqYnEDmxL5Wj8r8kl0jrmXlrqX9zV8ZYIhGAGJdsqLwcvEc+D1xsB5EC21aY1Z n3zQ== X-Gm-Message-State: AOAM531OSUToppsrnrzJavw1rmBPGZglKL1B1yJxBqF7cpC9dzM+ebhs QAEiNHRjqCJchpgydI3qJL0= X-Google-Smtp-Source: ABdhPJwmqunCnFZiQ9BC82Rh2bup+vAbdZdhaBiXsqr/LJPSeSdN5cTBH0khpHr+9LAz4fMTbSovJQ== X-Received: by 2002:adf:9e90:: with SMTP id a16mr7072122wrf.40.1596707895970; Thu, 06 Aug 2020 02:58:15 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v67sm6111816wma.46.2020.08.06.02.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Thu, 6 Aug 2020 10:53:41 +0100 Message-Id: <20200806095411.774624-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix initialization of steering registers' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/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 ed3c247e81869b88ce068b4551bfe0b3d7dba538 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 21 Jul 2020 11:57:21 +0000 Subject: [PATCH] net/mlx5: fix initialization of steering registers [ upstream commit 4868ae8322892ca916d71d5f8cf74cb2e5e0b5c4 ] The mlx5_flow_action_copy_mreg structure contains a field called src type enum modify_reg, similarly the mlx5_rte_flow_item_tag field contains a field called id type enum modify_reg. The enum modify_reg variable represents different registers in the system and it also has a field called REG_NONE whose value is 0 which means that the register does not exist. The flow_mreg_add_copy_action function sets a variable of struct mlx5_flow_action_copy_mreg type, and initializes the src field to be 0. Similarly the flow_create_split_metadata function sets a variable of struct mlx5_rte_flow_item_tag type and initializes the id field to be 0. In both functions, they initialize a enum modify_reg type variable with an int type value while modify_reg has an appropriate field for that value (REG_NONE). Replace assigning 0 with REG_NONE in both functions. Fixes: dd3c774f6ffb ("net/mlx5: add metadata register copy table") Fixes: 71e254bc0294 ("net/mlx5: split Rx flows to provide metadata copy") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index be45091f4..d2e4e9aa4 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2934,7 +2934,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id, }; struct mlx5_flow_action_copy_mreg cp_mreg = { .dst = REG_B, - .src = 0, + .src = REG_NONE, }; struct rte_flow_action_jump jump = { .group = MLX5_FLOW_MREG_ACT_TABLE_GROUP, @@ -3945,7 +3945,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev, /* Internal PMD action to set register. */ struct mlx5_rte_flow_item_tag q_tag_spec = { .data = qrss_id, - .id = 0, + .id = REG_NONE, }; struct rte_flow_item q_items[] = { { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.293523751 +0100 +++ 0013-net-mlx5-fix-initialization-of-steering-registers.patch 2020-08-06 10:53:15.740596213 +0100 @@ -1,8 +1,10 @@ -From 4868ae8322892ca916d71d5f8cf74cb2e5e0b5c4 Mon Sep 17 00:00:00 2001 +From ed3c247e81869b88ce068b4551bfe0b3d7dba538 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 21 Jul 2020 11:57:21 +0000 Subject: [PATCH] net/mlx5: fix initialization of steering registers +[ upstream commit 4868ae8322892ca916d71d5f8cf74cb2e5e0b5c4 ] + The mlx5_flow_action_copy_mreg structure contains a field called src type enum modify_reg, similarly the mlx5_rte_flow_item_tag field contains a field called id type enum modify_reg. @@ -22,7 +24,6 @@ Fixes: dd3c774f6ffb ("net/mlx5: add metadata register copy table") Fixes: 71e254bc0294 ("net/mlx5: split Rx flows to provide metadata copy") -Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad @@ -31,10 +32,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c -index 40a8575b8..742f9dd8a 100644 +index be45091f4..d2e4e9aa4 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c -@@ -3011,7 +3011,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id, +@@ -2934,7 +2934,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id, }; struct mlx5_flow_action_copy_mreg cp_mreg = { .dst = REG_B, @@ -43,7 +44,7 @@ }; struct rte_flow_action_jump jump = { .group = MLX5_FLOW_MREG_ACT_TABLE_GROUP, -@@ -4067,7 +4067,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev, +@@ -3945,7 +3945,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev, /* Internal PMD action to set register. */ struct mlx5_rte_flow_item_tag q_tag_spec = { .data = qrss_id,