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 62F48A04B1 for ; Thu, 5 Nov 2020 13:41:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1C89BC7EE; Thu, 5 Nov 2020 13:41:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id C4E02C31B for ; Thu, 5 Nov 2020 13:40:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PKXtHjP7Ok7Ka35TXdORYw1dPNjfu/T+dZoH5xKFQpk=; b=gyoM9ivFt1W2i7WD8wcrQDIcqK2oz6F0vIYNcID6wqe8qJGvj3Bdud7nrGK8lup4VpbgwP jOXMJf1jJSnMerF+nCXiU5FpOzqwRlXULQCFIFRw7YNUUIPZ6ANCOyDPSUP6GKzWkxPsCZ 5b9qH+/r5KYpPLG3FOG+q84W0AejevU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-1-O2HN3GNkMJugAnopvzoxtQ-1; Thu, 05 Nov 2020 07:40:53 -0500 X-MC-Unique: O2HN3GNkMJugAnopvzoxtQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B97D805EF7; Thu, 5 Nov 2020 12:40:52 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 505145C3E1; Thu, 5 Nov 2020 12:40:51 +0000 (UTC) From: Kevin Traynor To: Karra Satwik Cc: Rahul Lakkireddy , dpdk stable Date: Thu, 5 Nov 2020 12:39:20 +0000 Message-Id: <20201105124015.306404-13-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' has been queued to LTS release 18.11.11 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 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 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 Signed-off-by: Rahul Lakkireddy --- 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@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);