[dpdk-stable] patch 'net/netvsc: fix crash during Tx' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From fceb65eb9572514b4734ab079ab488a6e5f82918 Mon Sep 17 00:00:00 2001
From: Chas Williams <3chas3 at gmail.com>
Date: Wed, 29 Jul 2020 09:58:44 -0400
Subject: [PATCH] net/netvsc: fix crash during Tx

[ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ]

Commit cc0251813277 ("net/netvsc: split send buffers from Tx
descriptors") changed the way that transmit descriptors are
allocated. They come from a single pool instead of being
individually attached to each mbuf. To find the IOVA, you need
to calculate the offset from the base of the pool.

Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors")

Signed-off-by: Chas Williams <3chas3 at gmail.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/netvsc/hn_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 53681721d..d1f8dfa50 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1332,11 +1332,12 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
 	hn_rndis_dump(txd->rndis_pkt);
 
 	/* pass IOVA of rndis header in first segment */
-	addr = rte_malloc_virt2iova(txd->rndis_pkt);
+	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);
 
 	sg[0].page = addr / PAGE_SIZE;
 	sg[0].ofs = addr & PAGE_MASK;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.226695750 +0100
+++ 0037-net-netvsc-fix-crash-during-Tx.patch	2020-08-06 10:53:15.832598035 +0100
@@ -1,8 +1,10 @@
-From aee76bb79b91e2f8bce0e9356bee23f6e52d0513 Mon Sep 17 00:00:00 2001
+From fceb65eb9572514b4734ab079ab488a6e5f82918 Mon Sep 17 00:00:00 2001
 From: Chas Williams <3chas3 at gmail.com>
 Date: Wed, 29 Jul 2020 09:58:44 -0400
 Subject: [PATCH] net/netvsc: fix crash during Tx
 
+[ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ]
+
 Commit cc0251813277 ("net/netvsc: split send buffers from Tx
 descriptors") changed the way that transmit descriptors are
 allocated. They come from a single pool instead of being
@@ -10,7 +12,6 @@
 to calculate the offset from the base of the pool.
 
 Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors")
-Cc: stable at dpdk.org
 
 Signed-off-by: Chas Williams <3chas3 at gmail.com>
 Acked-by: Stephen Hemminger <stephen at networkplumber.org>
@@ -19,10 +20,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
-index 86a4c0d74..0428c586a 100644
+index 53681721d..d1f8dfa50 100644
 --- a/drivers/net/netvsc/hn_rxtx.c
 +++ b/drivers/net/netvsc/hn_rxtx.c
-@@ -1421,11 +1421,12 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
+@@ -1332,11 +1332,12 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
  	hn_rndis_dump(txd->rndis_pkt);
  
  	/* pass IOVA of rndis header in first segment */