[dpdk-stable] patch 'net/bnxt: fix crash in secondary process' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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

Thanks.

Luca Boccassi

---
>From 6b7c2b045a9553727ee0a0066d72592500591311 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Wed, 2 Oct 2019 10:17:43 -0700
Subject: [PATCH] net/bnxt: fix crash in secondary process

[ upstream commit f35eaaca5f5f09b48f5d96adbaccc4484aa6e058 ]

The secondary process should not modify device state when
init is called. The pci device information pointed to by
dev_private pointer is not correct in secondary process.

Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index c699d29b8d..ef49f98833 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -433,6 +433,7 @@ static int bnxt_init_nic(struct bnxt *bp)
 static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 				  struct rte_eth_dev_info *dev_info)
 {
+	struct rte_pci_device *pdev = RTE_DEV_TO_PCI(eth_dev->device);
 	struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
 	uint16_t max_vnics, i, j, vpool, vrxq;
 	unsigned int max_rx_rings;
@@ -445,7 +446,7 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 
 	/* PF/VF specifics */
 	if (BNXT_PF(bp))
-		dev_info->max_vfs = bp->pdev->max_vfs;
+		dev_info->max_vfs = pdev->max_vfs;
 	max_rx_rings = RTE_MIN(bp->max_vnics, RTE_MIN(bp->max_l2_ctx,
 						RTE_MIN(bp->max_rsscos_ctx,
 						bp->max_stat_ctx)));
@@ -2845,6 +2846,13 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
 	if (version_printed++ == 0)
 		RTE_LOG(INFO, PMD, "%s\n", bnxt_version);
 
+	eth_dev->dev_ops = &bnxt_dev_ops;
+	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
+	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
+
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
 	rte_eth_copy_pci_info(eth_dev, pci_dev);
 
 	bp = eth_dev->data->dev_private;
@@ -2852,9 +2860,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
 	rte_atomic64_init(&bp->rx_mbuf_alloc_fail);
 	bp->dev_stopped = 1;
 
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		goto skip_init;
-
 	if (bnxt_vf_pciid(pci_dev->id.device_id))
 		bp->flags |= BNXT_FLAG_VF;
 
@@ -2864,12 +2869,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
 			"Board initialization failed rc: %x\n", rc);
 		goto error;
 	}
-skip_init:
-	eth_dev->dev_ops = &bnxt_dev_ops;
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
-	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
 
 	if (BNXT_PF(bp) && pci_dev->id.device_id != BROADCOM_DEV_ID_NS2) {
 		snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:28.093639795 +0000
+++ 0044-net-bnxt-fix-crash-in-secondary-process.patch	2019-12-19 14:32:25.949294732 +0000
@@ -1,69 +1,80 @@
-From f35eaaca5f5f09b48f5d96adbaccc4484aa6e058 Mon Sep 17 00:00:00 2001
+From 6b7c2b045a9553727ee0a0066d72592500591311 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Wed, 2 Oct 2019 10:17:43 -0700
 Subject: [PATCH] net/bnxt: fix crash in secondary process
 
+[ upstream commit f35eaaca5f5f09b48f5d96adbaccc4484aa6e058 ]
+
 The secondary process should not modify device state when
 init is called. The pci device information pointed to by
 dev_private pointer is not correct in secondary process.
 
 Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Acked-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
- drivers/net/bnxt/bnxt_ethdev.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
+ drivers/net/bnxt/bnxt_ethdev.c | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 0159be3462..5985963bf7 100644
+index c699d29b8d..ef49f98833 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -521,6 +521,7 @@ static int bnxt_init_nic(struct bnxt *bp)
- static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
- 				struct rte_eth_dev_info *dev_info)
+@@ -433,6 +433,7 @@ static int bnxt_init_nic(struct bnxt *bp)
+ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
+ 				  struct rte_eth_dev_info *dev_info)
  {
 +	struct rte_pci_device *pdev = RTE_DEV_TO_PCI(eth_dev->device);
- 	struct bnxt *bp = eth_dev->data->dev_private;
+ 	struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
  	uint16_t max_vnics, i, j, vpool, vrxq;
  	unsigned int max_rx_rings;
-@@ -536,7 +537,8 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
+@@ -445,7 +446,7 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
  
  	/* PF/VF specifics */
  	if (BNXT_PF(bp))
 -		dev_info->max_vfs = bp->pdev->max_vfs;
 +		dev_info->max_vfs = pdev->max_vfs;
-+
- 	max_rx_rings = RTE_MIN(bp->max_rx_rings, bp->max_stat_ctx);
- 	/* For the sake of symmetry, max_rx_queues = max_tx_queues */
- 	dev_info->max_rx_queues = max_rx_rings;
-@@ -4488,12 +4490,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
+ 	max_rx_rings = RTE_MIN(bp->max_vnics, RTE_MIN(bp->max_l2_ctx,
+ 						RTE_MIN(bp->max_rsscos_ctx,
+ 						bp->max_stat_ctx)));
+@@ -2845,6 +2846,13 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
  	if (version_printed++ == 0)
- 		PMD_DRV_LOG(INFO, "%s\n", bnxt_version);
- 
--	rte_eth_copy_pci_info(eth_dev, pci_dev);
--
--	bp = eth_dev->data->dev_private;
--
--	bp->dev_stopped = 1;
--
- 	eth_dev->dev_ops = &bnxt_dev_ops;
- 	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
- 	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
-@@ -4505,6 +4501,12 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
- 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
- 		return 0;
+ 		RTE_LOG(INFO, PMD, "%s\n", bnxt_version);
  
-+	rte_eth_copy_pci_info(eth_dev, pci_dev);
++	eth_dev->dev_ops = &bnxt_dev_ops;
++	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
++	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
 +
-+	bp = eth_dev->data->dev_private;
-+
-+	bp->dev_stopped = 1;
++	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
++		return 0;
 +
+ 	rte_eth_copy_pci_info(eth_dev, pci_dev);
+ 
+ 	bp = eth_dev->data->dev_private;
+@@ -2852,9 +2860,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
+ 	rte_atomic64_init(&bp->rx_mbuf_alloc_fail);
+ 	bp->dev_stopped = 1;
+ 
+-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+-		goto skip_init;
+-
  	if (bnxt_vf_pciid(pci_dev->id.device_id))
  		bp->flags |= BNXT_FLAG_VF;
  
+@@ -2864,12 +2869,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
+ 			"Board initialization failed rc: %x\n", rc);
+ 		goto error;
+ 	}
+-skip_init:
+-	eth_dev->dev_ops = &bnxt_dev_ops;
+-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+-		return 0;
+-	eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
+-	eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;
+ 
+ 	if (BNXT_PF(bp) && pci_dev->id.device_id != BROADCOM_DEV_ID_NS2) {
+ 		snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
 -- 
 2.20.1