From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id BE1F1A04DD
for <public@inbox.dpdk.org>; Wed, 28 Oct 2020 11:47:59 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id B809A4C90;
Wed, 28 Oct 2020 11:47:58 +0100 (CET)
Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com
[209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 5FB1DC9CC
for <stable@dpdk.org>; Wed, 28 Oct 2020 11:47:55 +0100 (CET)
Received: by mail-wr1-f67.google.com with SMTP id g12so5116345wrp.10
for <stable@dpdk.org>; Wed, 28 Oct 2020 03:47:55 -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=nbDr4P2B/DOmF4w731ewOyO5Jy5ptwBoXIL/FgpFmuU=;
b=YioZvvL7mFLN9OBtAnL9QnDnq1vGHB5ev6UyAP3RsCzJmHA/JgIQw0OnNP/qIqT+KM
qMZaU+ny456et6srJri5rs1ByxQqqNyjFvD0Y2ouXtfOHDFrM9L4fe4ggM6axp36OeT5
9L5v0bXohntd4An+3t1oYTElurHot1mRL++vv5EACupa2NnFuHdtg9vvVmVKFKAfbXOP
4S87372JCh7sIZwY+cwAOpzJrH7Eup4iOO5UAJCeGPif5FP4my/NVDPbZZ02f5HOqtnX
0KeP9hugPg2rsoxLPZdDhLqfkBMOdz1TTmdypQaS2hb0qdxhTBctvlbsGXfC87DO5Se/
NISQ==
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=nbDr4P2B/DOmF4w731ewOyO5Jy5ptwBoXIL/FgpFmuU=;
b=CY4VDqU3V1exJOvwCua+64bDcasGSXkNJabcXN+spPn45yqwN4/EMAGCZMePgWRy2s
EvKVlyUBqX8mCHI2R2Y8tqTUAq43XdNHPuae0l1RDTzbvwDvbDCbpGcJBIckJxFKUa5u
xWDsyL67pjYh/hTO3ULxXxhERNXnysItOFI7EjchjX8FBuvwGX2y9hPSo2csCZFcZbIe
H/GIxrRZUwTcFg7SmatJMvKRCrymSdq4UH4fchEDfjC3JkIYbcxz7JEHevMQgJ4Tdqnk
u39lkMttK/H52CpJLVfnM4kVKqjwZ7i61nBdMOkmmtHPaoTzWd0IDBWs1JvkcgwVonI1
QFqQ==
X-Gm-Message-State: AOAM530/1IXrVXjJwAWCxiqpFhXfI+TjKeHZPWoZAqL11mRsLUB8Cs28
fxZ0c3xJM9QTlnOD3Qc+3KFV+d8bWBFfaZp0
X-Google-Smtp-Source: ABdhPJy5QYDkPtq3jBwVwrr3PUoIXPfiW6oiZPMKpfB/K1Y5j8lmS1pL36KMOu7V6aMnmNG+c6L6wg==
X-Received: by 2002:adf:fe84:: with SMTP id l4mr8059887wrr.293.1603882074123;
Wed, 28 Oct 2020 03:47:54 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id e25sm4902240wrc.76.2020.10.28.03.47.53
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 28 Oct 2020 03:47:53 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Karra Satwik <kaara.satwik@chelsio.com>
Cc: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,
dpdk stable <stable@dpdk.org>
Date: Wed, 28 Oct 2020 10:43:14 +0000
Message-Id: <20201028104606.3504127-35-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com>
References: <20201028104606.3504127-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS
TCAM' has been queued to stable release 19.11.6
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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@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@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@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@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@dpdk.org
Signed-off-by: Karra Satwik <kaara.satwik@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>