[dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 2fec236c7793acc04feae98805ca343d0999436e Mon Sep 17 00:00:00 2001
From: Karra Satwik <kaara.satwik at chelsio.com>
Date: Sat, 12 Sep 2020 05:17:51 +0530
Subject: [PATCH] net/cxgbe: fix duplicate MAC addresses in MPS TCAM

[ upstream commit 0dd95bc917e9a29065a8f73e13807492dca1e509 ]

During MAC address insertion to MPS TCAM, add a default mask when
the mask is not explicitly specified. Otherwise, driver misses the
mask comparison and ends up inserting duplicate entries in the
MPS TCAM.

Fixes: 6fda3f0ddda9 ("net/cxgbe: add API to program hardware MPS table")

Signed-off-by: Karra Satwik <kaara.satwik at chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>
---
 drivers/net/cxgbe/mps_tcam.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/cxgbe/mps_tcam.c b/drivers/net/cxgbe/mps_tcam.c
index 5302d1343d..6e5fae9928 100644
--- a/drivers/net/cxgbe/mps_tcam.c
+++ b/drivers/net/cxgbe/mps_tcam.c
@@ -140,6 +140,7 @@ int cxgbe_mpstcam_modify(struct port_info *pi, int idx, const u8 *addr)
 	/* idx can now be different from what user provided */
 	entry = &mpstcam->entry[idx];
 	memcpy(entry->eth_addr, addr, RTE_ETHER_ADDR_LEN);
+	memset(entry->mask, ~0, RTE_ETHER_ADDR_LEN);
 	/* NOTE: we have considered the case that idx returned by t4_change_mac
 	 * will be different from the user provided value only if user
 	 * provided value is -1
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.884283387 +0000
+++ 0035-net-cxgbe-fix-duplicate-MAC-addresses-in-MPS-TCAM.patch	2020-10-28 10:35:11.476829611 +0000
@@ -1,15 +1,16 @@
-From 0dd95bc917e9a29065a8f73e13807492dca1e509 Mon Sep 17 00:00:00 2001
+From 2fec236c7793acc04feae98805ca343d0999436e Mon Sep 17 00:00:00 2001
 From: Karra Satwik <kaara.satwik at chelsio.com>
 Date: Sat, 12 Sep 2020 05:17:51 +0530
 Subject: [PATCH] net/cxgbe: fix duplicate MAC addresses in MPS TCAM
 
+[ upstream commit 0dd95bc917e9a29065a8f73e13807492dca1e509 ]
+
 During MAC address insertion to MPS TCAM, add a default mask when
 the mask is not explicitly specified. Otherwise, driver misses the
 mask comparison and ends up inserting duplicate entries in the
 MPS TCAM.
 
 Fixes: 6fda3f0ddda9 ("net/cxgbe: add API to program hardware MPS table")
-Cc: stable at dpdk.org
 
 Signed-off-by: Karra Satwik <kaara.satwik at chelsio.com>
 Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy at chelsio.com>