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 A5C99A0613 for ; Wed, 28 Aug 2019 15:43:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BE6D1C21E; Wed, 28 Aug 2019 15:43:41 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 95FB41C206 for ; Wed, 28 Aug 2019 15:43:40 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1085E3001FEB; Wed, 28 Aug 2019 13:43:40 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5806194B2; Wed, 28 Aug 2019 13:43:38 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 28 Aug 2019 14:42:16 +0100 Message-Id: <20190828134234.20547-40-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 28 Aug 2019 13:43:40 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix setting primary MAC address' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/04/19. 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/e8ab24b4e0a8c137a5376bb75ca823fdcce92ab5 Thanks. Kevin Traynor --- >From e8ab24b4e0a8c137a5376bb75ca823fdcce92ab5 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 18 Jul 2019 09:05:59 +0530 Subject: [PATCH] net/bnxt: fix setting primary MAC address [ upstream commit 68f589f2c728e7d893b2eacd86aca09b5546d690 ] 1. Default filter is tied to VNIC 0 at index 0. After finding the filter with mac_index 0 and set the new MAC address, looping through remaining filters is unnecessary. 2. Added a check for NULL MAC address. 3. bnxt_hwrm_set_l2_filter() clears the existing filter configuration first before applying new filter settings. Hence there is no need to invoke bnxt_hwrm_clear_l2_filter() explicitly in bnxt_set_default_mac_addr_op(). Fixes: d69851df12b2 ("net/bnxt: support multicast filter and set MAC addr") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 20bca23c7..286f7cb8b 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1542,5 +1542,6 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) return -EPERM; - memcpy(bp->mac_addr, addr, sizeof(bp->mac_addr)); + if (is_zero_ether_addr(addr)) + return -EINVAL; STAILQ_FOREACH(filter, &vnic->filter, next) { @@ -1548,7 +1549,5 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) if (filter->mac_index != 0) continue; - rc = bnxt_hwrm_clear_l2_filter(bp, filter); - if (rc) - return rc; + memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN); memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN); @@ -1557,9 +1556,12 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR | HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK; + rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); if (rc) return rc; - filter->mac_index = 0; + + memcpy(bp->mac_addr, addr, ETHER_ADDR_LEN); PMD_DRV_LOG(DEBUG, "Set MAC addr\n"); + return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:34.206735148 +0100 +++ 0041-net-bnxt-fix-setting-primary-MAC-address.patch 2019-08-28 14:32:31.692956223 +0100 @@ -1 +1 @@ -From 68f589f2c728e7d893b2eacd86aca09b5546d690 Mon Sep 17 00:00:00 2001 +From e8ab24b4e0a8c137a5376bb75ca823fdcce92ab5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 68f589f2c728e7d893b2eacd86aca09b5546d690 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 55b030a2b..70d24494a 100644 +index 20bca23c7..286f7cb8b 100644 @@ -29 +30 @@ -@@ -1700,5 +1700,6 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, +@@ -1542,5 +1542,6 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) @@ -33 +34 @@ -+ if (rte_is_zero_ether_addr(addr)) ++ if (is_zero_ether_addr(addr)) @@ -37 +38 @@ -@@ -1706,7 +1707,5 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, +@@ -1548,7 +1549,5 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) @@ -44,3 +45,3 @@ - memcpy(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN); - memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN); -@@ -1715,9 +1714,12 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, + memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN); + memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN); +@@ -1557,9 +1556,12 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) @@ -55 +56 @@ -+ memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN); ++ memcpy(bp->mac_addr, addr, ETHER_ADDR_LEN);