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

Kevin Traynor ktraynor at redhat.com
Thu Nov 5 13:39:20 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ece6f09636f267b257613c19a3c5b96575f92b65

Thanks.

Kevin.

---
>From ece6f09636f267b257613c19a3c5b96575f92b65 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 71c8070b3e..6e739445f4 100644
--- a/drivers/net/cxgbe/mps_tcam.c
+++ b/drivers/net/cxgbe/mps_tcam.c
@@ -141,4 +141,5 @@ int cxgbe_mpstcam_modify(struct port_info *pi, int idx, const u8 *addr)
 	entry = &mpstcam->entry[idx];
 	memcpy(entry->eth_addr, addr, ETHER_ADDR_LEN);
+	memset(entry->mask, ~0, 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
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.512353461 +0000
+++ 0013-net-cxgbe-fix-duplicate-MAC-addresses-in-MPS-TCAM.patch	2020-11-05 12:38:54.172895967 +0000
@@ -1 +1 @@
-From 0dd95bc917e9a29065a8f73e13807492dca1e509 Mon Sep 17 00:00:00 2001
+From ece6f09636f267b257613c19a3c5b96575f92b65 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0dd95bc917e9a29065a8f73e13807492dca1e509 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5302d1343d..6e5fae9928 100644
+index 71c8070b3e..6e739445f4 100644
@@ -26,2 +27,2 @@
- 	memcpy(entry->eth_addr, addr, RTE_ETHER_ADDR_LEN);
-+	memset(entry->mask, ~0, RTE_ETHER_ADDR_LEN);
+ 	memcpy(entry->eth_addr, addr, ETHER_ADDR_LEN);
++	memset(entry->mask, ~0, ETHER_ADDR_LEN);



More information about the stable mailing list