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 88B51A0351 for ; Thu, 6 Aug 2020 11:58:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 79ED11C0D7; Thu, 6 Aug 2020 11:58:20 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 7FE4E1C0DB for ; Thu, 6 Aug 2020 11:58:18 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f12so7548962wru.13 for ; Thu, 06 Aug 2020 02:58:18 -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=lpAnUlSbZtj+h6NN0mxQ8IPDkuqFNiPEzmQBLCFjLZk=; b=qm4uUWu160fIjVY6e5hNjVNdbbk9jgkpUuQgjQFtwVSlV5biU9COD4yR/n9nG4MZCx clIv/0qpBD0BQCLlhQwbmJzlYT09vAD2umosl+9+ei4lyKaiBV6EafXLm24k1Q60uMbh M9U1ilHJ4fY4cGWH7EexjBLV5RMHeVGW3u2hmRm+b0XKJCVHYY5rXjJqKlQgUeL8mrHM /CCzvPVszOpSQjLvemgp2Z8NjYAqt972/qx6KD2b07axfuyfFoMTRGT26dZQQAkMe8IC CoMcy63Q9E92vxZ9IGtmz+thLnYYnAaNay2O4m9GoKJ5Q7AtsLJ7uXV7geuufkOaoyLN 0aGw== 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=lpAnUlSbZtj+h6NN0mxQ8IPDkuqFNiPEzmQBLCFjLZk=; b=D4GmAvhpzoNYpqMzhn9JTNpurNKbCMc5xtJMkyIpkhclhIB+hwRX10I8jblbk3zIZA nRlH+j2oR+xHDernr26666vRdnvAlJ3lPEfbzhai1MfqYoOEOticTKG75MZbO6X1sWUo YFuDpBSkVrUumNJaRLm37hFmyVRAuBASBpeVpsV3uxq1IbYizjvhqv6ro9h+IHpcfkb4 ZuJKErEJreSgTn3t+X5B0TKvotHwkHIMhDDArhs6Iw4Lv9OR47QlsuQO5A0+yLJ1iYE5 H7IL9rtDY+tzxV3Q1VCez7VW30KOyr26w0hr+V2VXEA5IGP+mQRANHEdiuygObznNF3k KgMA== X-Gm-Message-State: AOAM5323KVnzMaZlDaDVOVkuezHtnC27PvaRS/jcNoq7WHOZxEOQJ55o wk+mftGSvju2i1BiuGUtySs= X-Google-Smtp-Source: ABdhPJyE9K43ZiXiLu0LOoRSQDeqVu1yqCS1bymQD7hnssN7pfyA9R38cFeURn+lWTKXjma14nikWg== X-Received: by 2002:adf:e382:: with SMTP id e2mr6816661wrm.306.1596707898241; Thu, 06 Aug 2020 02:58:18 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g3sm6623205wrb.59.2020.08.06.02.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Thu, 6 Aug 2020 10:53:43 +0100 Message-Id: <20200806095411.774624-15-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: remove ineffective increment in hairpin split' 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 6c277381a5949461ec7a426c0d816b091d0fad47 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 21 Jul 2020 12:00:04 +0000 Subject: [PATCH] net/mlx5: remove ineffective increment in hairpin split [ upstream commit 8da2a608d0d727d224ff5c8eb7747083907b0beb ] The flow_hairpin_split function defines a pointer called addr that points to the list of items. When the function wants to progress in the list, it adds the size of an item to the pointer. At the end of the function, it precedes the pointer one more time even though it is not used afterwards. In fact, this line is unaffected and the operation of the function would have been no different without it. Remove the line where the pointer is preceded unnecessarily. Fixes: d85c7b5ea59f ("net/mlx5: split hairpin flows") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index d2e4e9aa4..a4bbb74fc 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3406,7 +3406,6 @@ flow_hairpin_split(struct rte_eth_dev *dev, tag_item->data = UINT32_MAX; tag_item->id = UINT16_MAX; item->mask = tag_item; - addr += sizeof(struct mlx5_rte_flow_item_tag); item->last = NULL; item++; item->type = RTE_FLOW_ITEM_TYPE_END; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.380459159 +0100 +++ 0015-net-mlx5-remove-ineffective-increment-in-hairpin-spl.patch 2020-08-06 10:53:15.752596451 +0100 @@ -1,8 +1,10 @@ -From 8da2a608d0d727d224ff5c8eb7747083907b0beb Mon Sep 17 00:00:00 2001 +From 6c277381a5949461ec7a426c0d816b091d0fad47 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 21 Jul 2020 12:00:04 +0000 Subject: [PATCH] net/mlx5: remove ineffective increment in hairpin split +[ upstream commit 8da2a608d0d727d224ff5c8eb7747083907b0beb ] + The flow_hairpin_split function defines a pointer called addr that points to the list of items. When the function wants to progress in the list, it adds the size of an @@ -15,7 +17,6 @@ Remove the line where the pointer is preceded unnecessarily. Fixes: d85c7b5ea59f ("net/mlx5: split hairpin flows") -Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad @@ -24,10 +25,10 @@ 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c -index 742f9dd8a..71501730b 100644 +index d2e4e9aa4..a4bbb74fc 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c -@@ -3518,7 +3518,6 @@ flow_hairpin_split(struct rte_eth_dev *dev, +@@ -3406,7 +3406,6 @@ flow_hairpin_split(struct rte_eth_dev *dev, tag_item->data = UINT32_MAX; tag_item->id = UINT16_MAX; item->mask = tag_item;