[dpdk-stable] patch 'net/netvsc: allocate contiguous physical memory for RNDIS' has been queued to LTS release 18.11.11

[Kevin Traynor <ktraynor@redhat.com>]

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/24/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/dad2bfdf57b6d2dd3d9d7bb787f75de6fef6cf59

Thanks.

Kevin.

---
From dad2bfdf57b6d2dd3d9d7bb787f75de6fef6cf59 Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Wed, 21 Oct 2020 17:26:07 -0700
Subject: [PATCH] net/netvsc: allocate contiguous physical memory for RNDIS

[ upstream commit b8c3c628aff6defbabf677b4eea14c0529486357 ]

When sending data, netvsc assumes the tx_rndis buffer is contiguous and
calculates physical addresses based on this assumption.

Use memzone to allocate tx_rndis so it's guaranteed that this buffer is
physically contiguous.

Signed-off-by: Long Li <longli@microsoft.com>
---
 drivers/net/netvsc/hn_rxtx.c | 23 ++++++++++++-----------
 drivers/net/netvsc/hn_var.h  |  2 ++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 63b0f83f3a..38df13ce75 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -284,8 +284,13 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,
 		     name, nb_desc, sizeof(struct hn_txdesc));
 
-	txq->tx_rndis = rte_calloc("hn_txq_rndis", nb_desc,
-				   HN_RNDIS_PKT_ALIGNED, RTE_CACHE_LINE_SIZE);
-	if (txq->tx_rndis == NULL)
+	txq->tx_rndis_mz = rte_memzone_reserve_aligned(name,
+			nb_desc * HN_RNDIS_PKT_ALIGNED, rte_socket_id(),
+			RTE_MEMZONE_IOVA_CONTIG, HN_RNDIS_PKT_ALIGNED);
+	if (!txq->tx_rndis_mz) {
+		err = -rte_errno;
 		goto error;
+	}
+	txq->tx_rndis = txq->tx_rndis_mz->addr;
+	txq->tx_rndis_iova = txq->tx_rndis_mz->iova;
 
 	txq->txdesc_pool = rte_mempool_create(name, nb_desc,
@@ -316,5 +321,5 @@ error:
 	if (txq->txdesc_pool)
 		rte_mempool_free(txq->txdesc_pool);
-	rte_free(txq->tx_rndis);
+	rte_memzone_free(txq->tx_rndis_mz);
 	rte_free(txq);
 	return err;
@@ -358,5 +363,5 @@ hn_dev_tx_queue_release(void *arg)
 		rte_mempool_free(txq->txdesc_pool);
 
-	rte_free(txq->tx_rndis);
+	rte_memzone_free(txq->tx_rndis_mz);
 	rte_free(txq);
 }
@@ -1341,10 +1346,6 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
 
 	/* pass IOVA of rndis header in first segment */
-	addr = rte_malloc_virt2iova(txq->tx_rndis);
-	if (unlikely(addr == RTE_BAD_IOVA)) {
-		PMD_DRV_LOG(ERR, "RNDIS transmit can not get iova");
-		return -EINVAL;
-	}
-	addr = addr + ((char *)txd->rndis_pkt - (char *)txq->tx_rndis);
+	addr = txq->tx_rndis_iova +
+		((char *)txd->rndis_pkt - (char *)txq->tx_rndis);
 
 	sg[0].page = addr / PAGE_SIZE;
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index fceb345099..a7e70aaa51 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -54,5 +54,7 @@ struct hn_tx_queue {
 	uint32_t	free_thresh;
 	struct rte_mempool *txdesc_pool;
+	const struct rte_memzone *tx_rndis_mz;
 	void		*tx_rndis;
+	rte_iova_t	tx_rndis_iova;
 
 	/* Applied packet transmission aggregation limits. */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:39.097309833 +0000
+++ 0062-net-netvsc-allocate-contiguous-physical-memory-for-R.patch	2020-11-18 16:33:37.985215098 +0000
@@ -1 +1 @@
-From b8c3c628aff6defbabf677b4eea14c0529486357 Mon Sep 17 00:00:00 2001
+From dad2bfdf57b6d2dd3d9d7bb787f75de6fef6cf59 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b8c3c628aff6defbabf677b4eea14c0529486357 ]
+
@@ -12,2 +13,0 @@
-Cc: stable@dpdk.org
-
@@ -21 +21 @@
-index 5d59db513c..d8aa0996e7 100644
+index 63b0f83f3a..38df13ce75 100644
@@ -48 +48 @@
-@@ -367,5 +372,5 @@ hn_dev_tx_queue_release(void *arg)
+@@ -358,5 +363,5 @@ hn_dev_tx_queue_release(void *arg)
@@ -55 +55 @@
-@@ -1446,10 +1451,6 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
+@@ -1341,10 +1346,6 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
@@ -69 +69 @@
-index 56bfa972d1..20bb3c38dc 100644
+index fceb345099..a7e70aaa51 100644
@@ -72 +72 @@
-@@ -55,5 +55,7 @@ struct hn_tx_queue {
+@@ -54,5 +54,7 @@ struct hn_tx_queue {