patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Long Li <longli@microsoft.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/netvsc: fix multiple channel Rx' has been queued to LTS release 18.11.11
Date: Thu,  5 Nov 2020 12:39:10 +0000	[thread overview]
Message-ID: <20201105124015.306404-3-ktraynor@redhat.com> (raw)
In-Reply-To: <20201105124015.306404-1-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/10/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/5c72d08cb81031f228851f5cf2e72d93022ed5de

Thanks.

Kevin.

---
From 5c72d08cb81031f228851f5cf2e72d93022ed5de Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Mon, 10 Aug 2020 19:33:11 -0700
Subject: [PATCH] net/netvsc: fix multiple channel Rx

[ upstream commit ac837bdd22400b220d60336f22c18091a92a40c9 ]

netvsc uses rxbuf_info buffer to track received packets attached via
rte_pktmbuf_attach_extbuf() and ack the host based on usage count. It
uses the transaction_id in the VMBus packet to locate where to use
memory in the rxbuf_info.

This is not correct in multiple channel setup, as different channels may
return identical transaction_ids at a time, and may corrupt the
rxbuf_info buffer.

Fix this by defining rxbuf_info for each queue.

Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_nvs.c  | 13 +++++++++----
 drivers/net/netvsc/hn_rxtx.c | 33 ++++++++++++++++++++++++++-------
 drivers/net/netvsc/hn_var.h  |  6 +++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c
index f97bb10846..78ebb954f4 100644
--- a/drivers/net/netvsc/hn_nvs.c
+++ b/drivers/net/netvsc/hn_nvs.c
@@ -224,7 +224,13 @@ hn_nvs_conn_rxbuf(struct hn_data *hv)
 	hv->rxbuf_section_cnt = resp.nvs_sect[0].slotcnt;
 
-	hv->rxbuf_info = rte_calloc("HN_RXBUF_INFO", hv->rxbuf_section_cnt,
-				    sizeof(*hv->rxbuf_info), RTE_CACHE_LINE_SIZE);
-	if (!hv->rxbuf_info) {
+	/*
+	 * Pimary queue's rxbuf_info is not allocated at creation time.
+	 * Now we can allocate it after we figure out the slotcnt.
+	 */
+	hv->primary->rxbuf_info = rte_calloc("HN_RXBUF_INFO",
+			hv->rxbuf_section_cnt,
+			sizeof(*hv->primary->rxbuf_info),
+			RTE_CACHE_LINE_SIZE);
+	if (!hv->primary->rxbuf_info) {
 		PMD_DRV_LOG(ERR,
 			    "could not allocate rxbuf info");
@@ -256,5 +262,4 @@ hn_nvs_disconn_rxbuf(struct hn_data *hv)
 	}
 
-	rte_free(hv->rxbuf_info);
 	/*
 	 * Linger long enough for NVS to disconnect RXBUF.
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index c6506e442d..5d580f6f7f 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -494,19 +494,19 @@ static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
 {
 	struct hn_rx_bufinfo *rxb = opaque;
-	struct hn_data *hv = rxb->hv;
+	struct hn_rx_queue *rxq = rxb->rxq;
 
-	rte_atomic32_dec(&hv->rxbuf_outstanding);
+	rte_atomic32_dec(&rxq->rxbuf_outstanding);
 	hn_nvs_ack_rxbuf(rxb->chan, rxb->xactid);
 }
 
-static struct hn_rx_bufinfo *hn_rx_buf_init(const struct hn_rx_queue *rxq,
+static struct hn_rx_bufinfo *hn_rx_buf_init(struct hn_rx_queue *rxq,
 					    const struct vmbus_chanpkt_rxbuf *pkt)
 {
 	struct hn_rx_bufinfo *rxb;
 
-	rxb = rxq->hv->rxbuf_info + pkt->hdr.xactid;
+	rxb = rxq->rxbuf_info + pkt->hdr.xactid;
 	rxb->chan = rxq->chan;
 	rxb->xactid = pkt->hdr.xactid;
-	rxb->hv = rxq->hv;
+	rxb->rxq = rxq;
 
 	rxb->shinfo.free_cb = hn_rx_buf_free_cb;
@@ -537,5 +537,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
 	 */
 	if (dlen >= HN_RXCOPY_THRESHOLD &&
-	    (uint32_t)rte_atomic32_read(&hv->rxbuf_outstanding) <
+	    (uint32_t)rte_atomic32_read(&rxq->rxbuf_outstanding) <
 			hv->rxbuf_section_cnt / 2) {
 		struct rte_mbuf_ext_shared_info *shinfo;
@@ -554,5 +554,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
 		/* shinfo is already set to 1 by the caller */
 		if (rte_mbuf_ext_refcnt_update(shinfo, 1) == 2)
-			rte_atomic32_inc(&hv->rxbuf_outstanding);
+			rte_atomic32_inc(&rxq->rxbuf_outstanding);
 
 		rte_pktmbuf_attach_extbuf(m, data, iova,
@@ -843,4 +843,21 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
 	}
 
+	/* setup rxbuf_info for non-primary queue */
+	if (queue_id) {
+		rxq->rxbuf_info = rte_calloc("HN_RXBUF_INFO",
+					hv->rxbuf_section_cnt,
+					sizeof(*rxq->rxbuf_info),
+					RTE_CACHE_LINE_SIZE);
+
+		if (!rxq->rxbuf_info) {
+			PMD_DRV_LOG(ERR,
+				"Could not allocate rxbuf info for queue %d\n",
+				queue_id);
+			rte_free(rxq->event_buf);
+			rte_free(rxq);
+			return NULL;
+		}
+	}
+
 	return rxq;
 }
@@ -897,4 +914,5 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
 fail:
 	rte_ring_free(rxq->rx_ring);
+	rte_free(rxq->rxbuf_info);
 	rte_free(rxq->event_buf);
 	rte_free(rxq);
@@ -920,4 +938,5 @@ hn_dev_rx_queue_release(void *arg)
 	/* Keep primary queue to allow for control operations */
 	if (rxq != rxq->hv->primary) {
+		rte_free(rxq->rxbuf_info);
 		rte_free(rxq->event_buf);
 		rte_free(rxq);
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index 34cd11d641..fceb345099 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -83,4 +83,6 @@ struct hn_rx_queue {
 
 	void *event_buf;
+	struct hn_rx_bufinfo *rxbuf_info;
+	rte_atomic32_t  rxbuf_outstanding;
 };
 
@@ -89,5 +91,5 @@ struct hn_rx_queue {
 struct hn_rx_bufinfo {
 	struct vmbus_channel *chan;
-	struct hn_data *hv;
+	struct hn_rx_queue *rxq;
 	uint64_t	xactid;
 	struct rte_mbuf_ext_shared_info shinfo;
@@ -110,7 +112,5 @@ struct hn_data {
 
 	struct rte_mem_resource *rxbuf_res;	/* UIO resource for Rx */
-	struct hn_rx_bufinfo *rxbuf_info;
 	uint32_t	rxbuf_section_cnt;	/* # of Rx sections */
-	rte_atomic32_t	rxbuf_outstanding;
 	uint16_t	max_queues;		/* Max available queues */
 	uint16_t	num_queues;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.331318590 +0000
+++ 0003-net-netvsc-fix-multiple-channel-Rx.patch	2020-11-05 12:38:54.143895944 +0000
@@ -1 +1 @@
-From ac837bdd22400b220d60336f22c18091a92a40c9 Mon Sep 17 00:00:00 2001
+From 5c72d08cb81031f228851f5cf2e72d93022ed5de Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac837bdd22400b220d60336f22c18091a92a40c9 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index f88854dafc..eeb82ab9ee 100644
+index f97bb10846..78ebb954f4 100644
@@ -56 +57 @@
-index 87b1184bc1..c8c4ee10c8 100644
+index c6506e442d..5d580f6f7f 100644
@@ -59 +60 @@
-@@ -525,19 +525,19 @@ static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
+@@ -494,19 +494,19 @@ static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
@@ -84 +85 @@
-@@ -569,5 +569,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -537,5 +537,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -91 +92 @@
-@@ -586,5 +586,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -554,5 +554,5 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -98 +99 @@
-@@ -889,4 +889,21 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
+@@ -843,4 +843,21 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv,
@@ -120 +121 @@
-@@ -954,4 +971,5 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -897,4 +914,5 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,
@@ -126,6 +127,6 @@
-@@ -976,4 +994,5 @@ hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary)
- 		return;
- 
-+	rte_free(rxq->rxbuf_info);
- 	rte_free(rxq->event_buf);
- 	rte_free(rxq);
+@@ -920,4 +938,5 @@ hn_dev_rx_queue_release(void *arg)
+ 	/* Keep primary queue to allow for control operations */
+ 	if (rxq != rxq->hv->primary) {
++		rte_free(rxq->rxbuf_info);
+ 		rte_free(rxq->event_buf);
+ 		rte_free(rxq);
@@ -133 +134 @@
-index 7cb7713e93..4b63f87607 100644
+index 34cd11d641..fceb345099 100644
@@ -136 +137 @@
-@@ -84,4 +84,6 @@ struct hn_rx_queue {
+@@ -83,4 +83,6 @@ struct hn_rx_queue {
@@ -143 +144 @@
-@@ -90,5 +92,5 @@ struct hn_rx_queue {
+@@ -89,5 +91,5 @@ struct hn_rx_queue {
@@ -150 +151 @@
-@@ -112,7 +114,5 @@ struct hn_data {
+@@ -110,7 +112,5 @@ struct hn_data {


  parent reply	other threads:[~2020-11-05 12:40 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/failsafe: fix double space in warning log' " Kevin Traynor
2020-11-05 12:39 ` Kevin Traynor [this message]
2020-11-05 12:39 ` [dpdk-stable] patch 'net/netvsc: fix stale value after free' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: remove unused log macros' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix endianness while setting L4 destination port' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/iavf: downgrade error log' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'ethdev: remove redundant license text' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix function header arguments' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e/base: fix Rx only for unicast promisc on VLAN' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/tap: free mempool when closing' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/dpaa2: fix misuse of interface index' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/cxgbe: fix duplicate MAC addresses in MPS TCAM' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/nfp: expand device info get' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' " Kevin Traynor
2020-11-05 13:22   ` David Marchand
2020-11-11 10:44     ` Kevin Traynor
2020-11-11 10:50       ` Kevin Traynor
2020-11-11 11:51         ` Luca Boccassi
2020-11-05 12:39 ` [dpdk-stable] patch 'gso: fix payload unit size for UDP' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: improve multiport PF in nfp guide' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/sfc/base: fix tunnel configuration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: specify delay operations' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ena/base: fix release of wait event' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/i40e: fix byte counters' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/ixgbe: fix VF reset HW error handling' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix shift operation' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/bnxt: fix queue get info' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix port id check in Tx VLAN command' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: remove restriction on Tx segments set' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix descriptor id check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix displaying Rx/Tx queues information' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix dereference before null check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app: fix ethdev port id size' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'vfio: fix group descriptor check' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix memory leak when unmapping VFIO resource' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/pci: fix leak on VFIO mapping error' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'mem: fix allocation in container with SELinux' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'bus/fslmc: fix dpio close' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: reset test statistics' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'port: remove useless assignment' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'timer: add limitation note for sync stop and reset' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'app/testpmd: fix build with gcc 11' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'pmdinfogen: " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/qede: fix getting link details' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'raw/dpaa2_qdma: fix reset' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'eal: fix doxygen for EAL cleanup' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net: check segment pointer in raw checksum processing' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/virtio: check raw checksum failure' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'mem: fix allocation failure on non-NUMA kernel' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'doc: fix missing classify methods in ACL guide' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'table: fix hash for 32-bit' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix device number' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'test/crypto: fix stats test' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'cryptodev: fix parameter parsing' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' " Kevin Traynor
2020-11-05 12:40 ` [dpdk-stable] patch 'net/avf: fix iterator for RSS LUT' " 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=20201105124015.306404-3-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=longli@microsoft.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).