patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Cc: Yongseok Koh <yskoh@mellanox.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/mlx4: fix memory region cleanup' has been queued to LTS release 18.11.2
Date: Wed,  8 May 2019 11:15:05 +0100	[thread overview]
Message-ID: <20190508101534.8984-23-ktraynor@redhat.com> (raw)
In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to LTS release 18.11.2

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

Thanks.

Kevin Traynor

---
From eb4a74ffa52b4b23822abb9bbd6afaba2d424687 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Date: Mon, 15 Apr 2019 08:40:58 +0000
Subject: [PATCH] net/mlx4: fix memory region cleanup

[ upstream commit 897dbd3c861d6c78e751a6bdc6061305f65bab00 ]

mlx4 driver has a global list of Memory Regions created by
device, and there is a ml4_mr_release() routine which makes
a memory cleanup at device closing. The head of device MR list
was fetched outside the rwlock protected section. Also some
noticed typos are fixed.

Fixes: 9797bfcce1c9 ("net/mlx4: add new memory region support")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx4/mlx4_mr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index 0d83d81e6..98c236fb7 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -478,5 +478,5 @@ mr_free(struct mlx4_mr *mr)
 
 /**
- * Releass resources of detached MR having no online entry.
+ * Release resources of detached MR having no online entry.
  *
  * @param dev
@@ -526,5 +526,5 @@ mr_find_contig_memsegs_cb(const struct rte_memseg_list *msl,
 
 /**
- * Create a new global Memroy Region (MR) for a missing virtual address.
+ * Create a new global Memory Region (MR) for a missing virtual address.
  * Register entire virtually contiguous memory chunk around the address.
  *
@@ -624,5 +624,5 @@ alloc_resources:
 	mr->ms_bmp = rte_bitmap_init(ms_n, bmp_mem, bmp_size);
 	if (mr->ms_bmp == NULL) {
-		WARN("port %u unable to initialize bitamp for a new MR of"
+		WARN("port %u unable to initialize bitmap for a new MR of"
 		     " address (%p).",
 		     dev->data->port_id, (void *)addr);
@@ -1330,5 +1330,5 @@ mlx4_mr_release(struct rte_eth_dev *dev)
 {
 	struct mlx4_priv *priv = dev->data->dev_private;
-	struct mlx4_mr *mr_next = LIST_FIRST(&priv->mr.mr_list);
+	struct mlx4_mr *mr_next;
 
 	/* Remove from memory callback device list. */
@@ -1341,4 +1341,5 @@ mlx4_mr_release(struct rte_eth_dev *dev)
 	rte_rwlock_write_lock(&priv->mr.rwlock);
 	/* Detach from MR list and move to free list. */
+	mr_next = LIST_FIRST(&priv->mr.mr_list);
 	while (mr_next != NULL) {
 		struct mlx4_mr *mr = mr_next;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:06.994157111 +0100
+++ 0023-net-mlx4-fix-memory-region-cleanup.patch	2019-05-08 11:05:05.804933284 +0100
@@ -1 +1 @@
-From 897dbd3c861d6c78e751a6bdc6061305f65bab00 Mon Sep 17 00:00:00 2001
+From eb4a74ffa52b4b23822abb9bbd6afaba2d424687 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 897dbd3c861d6c78e751a6bdc6061305f65bab00 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- drivers/net/mlx4/mlx4_mr.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ drivers/net/mlx4/mlx4_mr.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
@@ -22 +23 @@
-index ad7d4832f..48d458ad4 100644
+index 0d83d81e6..98c236fb7 100644
@@ -32,8 +33 @@
-@@ -528,5 +528,5 @@ mr_find_contig_memsegs_cb(const struct rte_memseg_list *msl,
- 
- /**
-- * Create a new global Memroy Region (MR) for a missing virtual address.
-+ * Create a new global Memory Region (MR) for a missing virtual address.
-  * This API should be called on a secondary process, then a request is sent to
-  * the primary process in order to create a MR for the address. As the global MR
-@@ -574,5 +574,5 @@ mlx4_mr_create_secondary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
+@@ -526,5 +526,5 @@ mr_find_contig_memsegs_cb(const struct rte_memseg_list *msl,
@@ -45,2 +39,2 @@
-  * This must be called from the primary process.
-@@ -683,5 +683,5 @@ alloc_resources:
+  *
+@@ -624,5 +624,5 @@ alloc_resources:
@@ -53,8 +47 @@
-@@ -821,5 +821,5 @@ err_nolock:
- 
- /**
-- * Create a new global Memroy Region (MR) for a missing virtual address.
-+ * Create a new global Memory Region (MR) for a missing virtual address.
-  * This can be called from primary and secondary process.
-  *
-@@ -1435,5 +1435,5 @@ mlx4_mr_release(struct rte_eth_dev *dev)
+@@ -1330,5 +1330,5 @@ mlx4_mr_release(struct rte_eth_dev *dev)
@@ -67 +54 @@
-@@ -1446,4 +1446,5 @@ mlx4_mr_release(struct rte_eth_dev *dev)
+@@ -1341,4 +1341,5 @@ mlx4_mr_release(struct rte_eth_dev *dev)

  parent reply	other threads:[~2019-05-08 10:16 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08 10:14 [dpdk-stable] patch 'net/bnx2x: fix MTU for jumbo frame' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/bnx2x: fix memory leak' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/bnx2x: fix ramrod timeout' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/bnx2x: fix DMAE " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/bnx2x: fix race for periodic flags' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/bnx2x: fix optic module verification' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/mlx5: fix RSS validation function' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/enetc: fix SMMU unhandled context fault' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/enetc: fix big endian build and buffer allocation' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/enetc: fix crash at high speed traffic' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'app/testpmd: set fixed flag for exact link speed' " Kevin Traynor
2019-05-08 10:20   ` Andrew Rybchenko
2019-05-08 10:26     ` Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/iavf: fix info get' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'crypto/virtio: fix IV offset' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/virtio: fix buffer leak on VLAN insert' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'net/virtio-user: fix return value check' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'vhost: fix device leak on connection add failure' " Kevin Traynor
2019-05-08 10:14 ` [dpdk-stable] patch 'vhost: fix null pointer checking' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'vhost: fix passing destroyed device to destroy callback' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'vhost: fix silent queue enabling with legacy guests' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/virtio: fix dangling pointer on failure' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/i40e: fix logging on VF close' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/mlx5: fix memory region cleanup' " Kevin Traynor
2019-05-08 10:15 ` Kevin Traynor [this message]
2019-05-08 10:15 ` [dpdk-stable] patch 'net/cxgbe: fix colliding function names' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/tap: fix multi process reply buffer' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'bus/vmbus: fix resource leak on error' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'app/bbdev: replace sprintf with snprintf or strlcpy' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'power: fix thread-safety environment modification' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/power: fix resource leak' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/power: fix unreachable VF MAC init' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/power: fix string null termination' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/power: fix string overflow' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/power: fix overflowed value' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/power: fix build with some disabled PMDs' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'examples/vhost_scsi: fix null-check for parameter' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/i40e: fix dereference before null check in mbuf release' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/i40e: fix dereference before check when getting EEPROM' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'app/testpmd: fix variable use before null check' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'bitrate: fix unchecked return value' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'doc: fix heading levels in bbdev test guide' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'crypto/qat: fix null cipher algo for non 8-byte multiple' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'eventdev: fix crypto adapter' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'crypto/snow3g: add to meson build' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'crypto/kasumi: fix dependency check' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'crypto/zuc: " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'net/ixgbe: fix warning with GCC 9' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'bus/fslmc: " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'raw/skeleton: fix warnings " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'raw/dpaa2_cmdif: " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'build: fix meson binutils workaround' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'build: fix crash by disabling AVX512 with binutils 2.31' " Kevin Traynor
2019-05-08 10:15 ` [dpdk-stable] patch 'build: fix ninja install on FreeBSD' " 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=20190508101534.8984-23-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=stable@dpdk.org \
    --cc=viacheslavo@mellanox.com \
    --cc=yskoh@mellanox.com \
    /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).