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 D079FA055A for ; Thu, 27 Feb 2020 10:35:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C24DD1C01; Thu, 27 Feb 2020 10:35:23 +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 817681BFF6 for ; Thu, 27 Feb 2020 10:35:22 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id f15so2668531wml.3 for ; Thu, 27 Feb 2020 01:35:22 -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=gc3+f2QJshxx2Z30kIE9iFX3Unv+6X5Y2HM/6XnQr84=; b=lRr6B1fHAsQoaddGV0qFkAf6mbOE3jyofSpKIwiQv6QnDa2O++hXwQufQto86S0oz6 A6jUCODBRsCEMxbPGXzuJBI5tPCUXYciuwB8bAaymeSduGIMyxJeNWCU9q/+fzsAgD6c 2BXnLABdMVd63aV+WPuohSRvhTUx6mq7RuYyhDF7HsrU2tXJHvgqLPRaPtHFIqk7LLbG DZ7oFSC8MM+Yf/FsUIQsohAnfiCYGiyJKI1Guo+DEL/2NOuZHacxCN/ZGIgH0HcjxROo XKUNrbNlNgAxmXNuiYCrugfiPJnps9164Bxt2XygXfShftc5+e8FId2AwnjoegLMhdBK AjHw== 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=gc3+f2QJshxx2Z30kIE9iFX3Unv+6X5Y2HM/6XnQr84=; b=HiEUUUL9D9GNJlfG4nsoz6pbE/Ok7Ay5wmcMAyS+G9qrhHvoeQH5Iofu8Jixda2mZp F2Abuj3cmdeHTB3OIlSAyxj/aJKiJNYKMELwdVYDhOAXPj4hdsn8RPlG1RQLTG7gYogW LeZuT6zBJF/9i24E3OKpIW44eL7+jFgyvMtiINApqATCXVDnVGMrLRgftDxIjAD/CbYw P/MTP4IrLW/SM/EUpk8gAZMi4jzMn3Un9ZQ3UApqRckf3yth5T6uCd2kh6lWz2zjm+Ly T3VFaSOc+H14eK3/lVHnoSFc3qu1qfDQO5MnEYe5xs7o/5Wzr2CNMWmp30LMUaz6QWro KeZQ== X-Gm-Message-State: APjAAAXMP+fdd7A6Gj9IkfsVvqenRKe6Y8rY659vDwzZ4pAWUPCMpU75 V67CWr5Aa+0sRkXCKCY6oLVhMPMEbNc= X-Google-Smtp-Source: APXvYqynTvtvjiy9JepT82N7v2SHdd+AUmcRxf9j/nE/CHtpg1cfFSe6t63uWCjqMGpMJrl4I/3Tug== X-Received: by 2002:a05:600c:290e:: with SMTP id i14mr4052401wmd.24.1582796122216; Thu, 27 Feb 2020 01:35:22 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r1sm6816362wrx.11.2020.02.27.01.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:21 -0800 (PST) From: luca.boccassi@gmail.com To: Suanming Mou Cc: Dekel Peled , Matan Azrad , dpdk stable Date: Thu, 27 Feb 2020 09:33:48 +0000 Message-Id: <20200227093402.17690-28-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 VLAN ID action offset' 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 b79bdedd756d22a51d8eab75462b954b9c731971 Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 19 Feb 2020 16:15:17 +0200 Subject: [PATCH] net/mlx5: fix VLAN ID action offset [ upstream commit bdcfb8a10bea8f56f5d89394ed1364735f1e3408 ] Currently, the set VLAN ID header modify action has already got the action pointer with offset from the header modify action array, but the configuration saves the detail to the memory of action with the offset again. It causes double offset to set the VLAN ID action to the wrong place in the header modify array. Remove the offset when get the action pointer to fix that issue. Fixes: 5f163d520cff ("net/mlx5: support modify VLAN ID on existing VLAN header") Signed-off-by: Suanming Mou Acked-by: Dekel Peled Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f3d9ae5bc4..2b37c1c353 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -568,7 +568,7 @@ flow_dv_convert_action_modify_vlan_vid const struct rte_flow_action_of_set_vlan_vid *conf = (const struct rte_flow_action_of_set_vlan_vid *)(action->conf); int i = resource->actions_num; - struct mlx5_modification_cmd *actions = &resource->actions[i]; + struct mlx5_modification_cmd *actions = resource->actions; struct field_modify_info *field = modify_vlan_out_first_vid; if (i >= MLX5_MAX_MODIFY_NUM) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.730966370 +0000 +++ 0028-net-mlx5-fix-VLAN-ID-action-offset.patch 2020-02-27 09:31:55.783946225 +0000 @@ -1,8 +1,10 @@ -From bdcfb8a10bea8f56f5d89394ed1364735f1e3408 Mon Sep 17 00:00:00 2001 +From b79bdedd756d22a51d8eab75462b954b9c731971 Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 19 Feb 2020 16:15:17 +0200 Subject: [PATCH] net/mlx5: fix VLAN ID action offset +[ upstream commit bdcfb8a10bea8f56f5d89394ed1364735f1e3408 ] + Currently, the set VLAN ID header modify action has already got the action pointer with offset from the header modify action array, but the configuration saves the detail to the memory of action with the @@ -12,7 +14,6 @@ Remove the offset when get the action pointer to fix that issue. Fixes: 5f163d520cff ("net/mlx5: support modify VLAN ID on existing VLAN header") -Cc: stable@dpdk.org Signed-off-by: Suanming Mou Acked-by: Dekel Peled @@ -22,10 +23,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 467d1ce6b1..99d668f5d3 100644 +index f3d9ae5bc4..2b37c1c353 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -573,7 +573,7 @@ flow_dv_convert_action_modify_vlan_vid +@@ -568,7 +568,7 @@ flow_dv_convert_action_modify_vlan_vid const struct rte_flow_action_of_set_vlan_vid *conf = (const struct rte_flow_action_of_set_vlan_vid *)(action->conf); int i = resource->actions_num;