patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Chas Williams <3chas3@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/netvsc: fix crash during Tx' has been queued to LTS release 18.11.10
Date: Fri, 28 Aug 2020 11:13:03 +0100	[thread overview]
Message-ID: <20200828101308.223767-37-ktraynor@redhat.com> (raw)
In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to LTS release 18.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 09/02/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/5b3a3277091dcf4869111fcc0835d7f553ee28ae

Thanks.

Kevin.

---
From 5b3a3277091dcf4869111fcc0835d7f553ee28ae Mon Sep 17 00:00:00 2001
From: Chas Williams <3chas3@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@gmail.com>
Acked-by: Stephen Hemminger <stephen@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 d7940b8119..cdd44a76c3 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1317,9 +1317,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
 
 	/* 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;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.798811284 +0100
+++ 0037-net-netvsc-fix-crash-during-Tx.patch	2020-08-28 11:03:25.988955951 +0100
@@ -1 +1 @@
-From aee76bb79b91e2f8bce0e9356bee23f6e52d0513 Mon Sep 17 00:00:00 2001
+From 5b3a3277091dcf4869111fcc0835d7f553ee28ae Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 86a4c0d741..0428c586a8 100644
+index d7940b8119..cdd44a76c3 100644
@@ -25 +26 @@
-@@ -1422,9 +1422,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,
+@@ -1317,9 +1317,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,


  parent reply	other threads:[~2020-08-28 10:14 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-28 10:12 [dpdk-stable] patch 'net/bonding: fix error code on device creation' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/af_packet: fix check of file descriptors' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/af_packet: fix memory leak on init failure' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/af_packet: fix munmap " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/bonding: fix MAC address when switching active port' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/bonding: fix MAC address when one port resets' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/i40e: fix flow director Rx writeback packet' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/ixgbe: fix MAC control frame forward' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/ixgbe: fix flow control status' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/bonding: delete redundant code' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/i40e: report VLAN filter capability' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/e1000: report VLAN extend " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/e1000: fix crash on Tx done clean up' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'vhost: fix double-free with zero-copy' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net: fix pedantic build' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'doc: fix some typos in Linux guide' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'doc: fix typo in bbdev test " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'bus/vdev: fix a typo in doxygen comment' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'hash: fix out-of-memory handling in hash creation' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'test/cycles: restore default delay callback' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'event/dpaa: remove dead code' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'app/eventdev: fix capability check in pipeline ATQ test' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'event/dpaa2: add all-types queue capability flag' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'common/qat: fix uninitialized variable' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'crypto/armv8: remove debug option' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'crypto/armv8: use dedicated log type' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/mlx5: fix flow items size calculation' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/mlx5: fix crash in NVGRE item translation' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/mlx4: optimize stack memory size in probe' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/i40e: fix binding interrupt without MSI-X vector' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/i40e: fix flow director MSI-X resource allocation' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/qede: remove dead code' " Kevin Traynor
2020-08-28 10:12 ` [dpdk-stable] patch 'net/virtio-user: fix status management' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'net/virtio-user: check tap system call setting' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'net/kni: set packet input port in Rx' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'examples/packet_ordering: use proper exit method' " Kevin Traynor
2020-08-28 10:13 ` Kevin Traynor [this message]
2020-08-28 10:13 ` [dpdk-stable] patch 'doc: fix ethtool app path' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'net/bonding: fix dead loop on RSS RETA update' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'net/i40e: remove duplicate tunnel type check' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'kni: fix reference to master/slave process' " Kevin Traynor
2020-08-28 10:13 ` [dpdk-stable] patch 'doc: fix reference to master " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200828101308.223767-37-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=3chas3@gmail.com \
    --cc=stable@dpdk.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).