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 6D2A7A0613 for ; Wed, 28 Aug 2019 15:43:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 61F7C1C229; Wed, 28 Aug 2019 15:43:38 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 58D5C1C23B for ; Wed, 28 Aug 2019 15:43:37 +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 C5ACF3082B41; Wed, 28 Aug 2019 13:43:36 +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 828F4194B2; Wed, 28 Aug 2019 13:43:35 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 28 Aug 2019 14:42:14 +0100 Message-Id: <20190828134234.20547-38-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:36 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix adding 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/22db13c0f1e6c1489e4329144ca77c859dd843ba Thanks. Kevin Traynor --- >From 22db13c0f1e6c1489e4329144ca77c859dd843ba Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 18 Jul 2019 09:05:57 +0530 Subject: [PATCH] net/bnxt: fix adding MAC address [ upstream commit d8b3bc78d804467ebf75e04beede0d941af91195 ] HWRM command to add MAC address can fail. Driver should check the return value of HWRM command and do the house keeping properly. Fixes: 778b759ba10e ("net/bnxt: add MAC address") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index e701b7b16..f0b799764 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -782,4 +782,5 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, struct bnxt_vnic_info *vnic = &bp->vnic_info[pool]; struct bnxt_filter_info *filter; + int rc = 0; if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) { @@ -805,8 +806,18 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, return -ENODEV; } - STAILQ_INSERT_TAIL(&vnic->filter, filter, next); + filter->mac_index = index; memcpy(filter->l2_addr, mac_addr, ETHER_ADDR_LEN); - return bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); + + rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); + if (!rc) { + STAILQ_INSERT_TAIL(&vnic->filter, filter, next); + } else { + filter->mac_index = INVALID_MAC_INDEX; + memset(&filter->l2_addr, 0, ETHER_ADDR_LEN); + bnxt_free_filter(bp, filter); + } + + return rc; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:34.083369671 +0100 +++ 0039-net-bnxt-fix-adding-MAC-address.patch 2019-08-28 14:32:31.686956357 +0100 @@ -1 +1 @@ -From d8b3bc78d804467ebf75e04beede0d941af91195 Mon Sep 17 00:00:00 2001 +From 22db13c0f1e6c1489e4329144ca77c859dd843ba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d8b3bc78d804467ebf75e04beede0d941af91195 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 306d62772..15048de3f 100644 +index e701b7b16..f0b799764 100644 @@ -23 +24 @@ -@@ -916,4 +916,5 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, +@@ -782,4 +782,5 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, @@ -29 +30 @@ -@@ -939,8 +940,18 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, +@@ -805,8 +806,18 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, @@ -35 +36 @@ - memcpy(filter->l2_addr, mac_addr, RTE_ETHER_ADDR_LEN); + memcpy(filter->l2_addr, mac_addr, ETHER_ADDR_LEN); @@ -43 +44 @@ -+ memset(&filter->l2_addr, 0, RTE_ETHER_ADDR_LEN); ++ memset(&filter->l2_addr, 0, ETHER_ADDR_LEN);