[dpdk-stable] patch 'net/netvsc: fix memory free on device close' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

Thanks.

Kevin.

---
>From b622d8c04eac87376d0d2b366404517e7cc90f5f Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 31 Mar 2020 10:14:00 -0700
Subject: [PATCH] net/netvsc: fix memory free on device close

[ upstream commit 30408aab2d4e0fd9a5d2b4e2ef2a3a7b9e6c95bf ]

The netvsc PMD was putting the mac address in private data but the
core rte_ethdev doesn't allow that it. It has to be in rte_malloc'd
memory or a message will be printed on shutdown/close.
 EAL: Invalid memory

Fixes: f8279f47dd89 ("net/netvsc: fix crash in secondary process")
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/netvsc/hn_ethdev.c | 16 ++++++++++------
 drivers/net/netvsc/hn_var.h    |  2 --
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index d452bb4f7e..55382907a4 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -119,6 +119,4 @@ static void
 eth_dev_vmbus_release(struct rte_eth_dev *eth_dev)
 {
-	/* mac_addrs must not be freed alone because part of dev_private */
-	eth_dev->data->mac_addrs = NULL;
 	/* free ether device */
 	rte_eth_dev_release_port(eth_dev);
@@ -732,7 +730,4 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->rx_pkt_burst = &hn_recv_pkts;
 
-	/* Since Hyper-V only supports one MAC address, just use local data */
-	eth_dev->data->mac_addrs = &hv->mac_addr;
-
 	/*
 	 * for secondary processes, we don't initialize any further as primary
@@ -742,4 +737,13 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
 		return 0;
 
+	/* Since Hyper-V only supports one MAC address */
+	eth_dev->data->mac_addrs = rte_calloc("hv_mac", HN_MAX_MAC_ADDRS,
+					      sizeof(struct ether_addr), 0);
+	if (eth_dev->data->mac_addrs == NULL) {
+		PMD_INIT_LOG(ERR,
+			     "Failed to allocate memory store MAC addresses");
+		return -ENOMEM;
+	}
+
 	hv->vmbus = vmbus;
 	hv->rxbuf_res = &vmbus->resource[HV_RECV_BUF_MAP];
@@ -784,5 +788,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
 		goto failed;
 
-	err = hn_rndis_get_eaddr(hv, hv->mac_addr.addr_bytes);
+	err = hn_rndis_get_eaddr(hv, eth_dev->data->mac_addrs->addr_bytes);
 	if (err)
 		goto failed;
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index ed0387cd4a..5dcd53638a 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -135,6 +135,4 @@ struct hn_data {
 	uint8_t		rndis_resp[256];
 
-	struct ether_addr mac_addr;
-
 	struct rte_eth_dev_owner owner;
 	struct rte_intr_handle vf_intr;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:02.068553695 +0100
+++ 0057-net-netvsc-fix-memory-free-on-device-close.patch	2020-05-28 17:12:59.131555722 +0100
@@ -1 +1 @@
-From 30408aab2d4e0fd9a5d2b4e2ef2a3a7b9e6c95bf Mon Sep 17 00:00:00 2001
+From b622d8c04eac87376d0d2b366404517e7cc90f5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 30408aab2d4e0fd9a5d2b4e2ef2a3a7b9e6c95bf ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index ac66108380..05f1a25a1a 100644
+index d452bb4f7e..55382907a4 100644
@@ -23 +24 @@
-@@ -135,6 +135,4 @@ static void
+@@ -119,6 +119,4 @@ static void
@@ -30 +31 @@
-@@ -938,7 +936,4 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
+@@ -732,7 +730,4 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
@@ -38 +39 @@
-@@ -948,4 +943,13 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
+@@ -742,4 +737,13 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
@@ -43 +44 @@
-+					      sizeof(struct rte_ether_addr), 0);
++					      sizeof(struct ether_addr), 0);
@@ -52 +53 @@
-@@ -990,5 +994,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
+@@ -784,5 +788,5 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
@@ -60 +61 @@
-index 822d737bd3..b4c6171737 100644
+index ed0387cd4a..5dcd53638a 100644
@@ -63,2 +64,2 @@
-@@ -140,6 +140,4 @@ struct hn_data {
- 	uint16_t	rss_ind[128];
+@@ -135,6 +135,4 @@ struct hn_data {
+ 	uint8_t		rndis_resp[256];
@@ -66 +67 @@
--	struct rte_ether_addr mac_addr;
+-	struct ether_addr mac_addr;