[dpdk-stable] patch 'hash: fix doc about thread/process safety' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 03:01:11 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Yongseok

---
>From 081d9e4011780594c95e26a366f6e7284a54692d Mon Sep 17 00:00:00 2001
From: Yipeng Wang <yipeng1.wang at intel.com>
Date: Mon, 29 Apr 2019 02:40:16 -0700
Subject: [PATCH] hash: fix doc about thread/process safety

[ upstream commit c96b55df8eea9223ec60f99974a95eb1c305aec5 ]

rte_hash_hash is multi-thread safe but not multi-process safe
because of the use of function pointers. Previous document
and comment says the other way around. This commit fixes
the issue.

Fixes: fc1f2750a3ec ("doc: programmers guide")
Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation")

Reported-by: Andrey Nikolaev <gentoorion at gmail.com>
Suggested-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Signed-off-by: Yipeng Wang <yipeng1.wang at intel.com>
Acked-by: Dharmik Thakkar <dharmik.thakkar at arm.com>
Acked-by: John McNamara <john.mcnamara at intel.com>
---
 doc/guides/prog_guide/multi_proc_support.rst | 2 +-
 lib/librte_hash/rte_hash.h                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 9a9dca7fe4..d3a9dd4c3e 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -185,7 +185,7 @@ Some of these are documented below:
 
 *   The use of function pointers between multiple processes running based of different compiled binaries is not supported,
     since the location of a given function in one process may be different to its location in a second.
-    This prevents the librte_hash library from behaving properly as in a multi-threaded instance,
+    This prevents the librte_hash library from behaving properly as in a multi-process instance,
     since it uses a pointer to the hash function internally.
 
 To work around this issue, it is recommended that multi-process applications perform the hash calculations by directly calling
diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index 5539e33893..a7a96c5b23 100644
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -375,7 +375,7 @@ rte_hash_lookup_with_hash(const struct rte_hash *h,
 
 /**
  * Calc a hash value by key.
- * This operation is not multi-thread safe.
+ * This operation is not multi-process safe.
  *
  * @param h
  *   Hash table to look in.
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:12.085391042 -0700
+++ 0104-hash-fix-doc-about-thread-process-safety.patch	2019-07-22 17:55:06.539478000 -0700
@@ -1,8 +1,10 @@
-From c96b55df8eea9223ec60f99974a95eb1c305aec5 Mon Sep 17 00:00:00 2001
+From 081d9e4011780594c95e26a366f6e7284a54692d Mon Sep 17 00:00:00 2001
 From: Yipeng Wang <yipeng1.wang at intel.com>
 Date: Mon, 29 Apr 2019 02:40:16 -0700
 Subject: [PATCH] hash: fix doc about thread/process safety
 
+[ upstream commit c96b55df8eea9223ec60f99974a95eb1c305aec5 ]
+
 rte_hash_hash is multi-thread safe but not multi-process safe
 because of the use of function pointers. Previous document
 and comment says the other way around. This commit fixes
@@ -10,7 +12,6 @@
 
 Fixes: fc1f2750a3ec ("doc: programmers guide")
 Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation")
-Cc: stable at dpdk.org
 
 Reported-by: Andrey Nikolaev <gentoorion at gmail.com>
 Suggested-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
@@ -23,10 +24,10 @@
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
-index 6196d3f21d..f6f012db18 100644
+index 9a9dca7fe4..d3a9dd4c3e 100644
 --- a/doc/guides/prog_guide/multi_proc_support.rst
 +++ b/doc/guides/prog_guide/multi_proc_support.rst
-@@ -176,7 +176,7 @@ Some of these are documented below:
+@@ -185,7 +185,7 @@ Some of these are documented below:
  
  *   The use of function pointers between multiple processes running based of different compiled binaries is not supported,
      since the location of a given function in one process may be different to its location in a second.
@@ -36,10 +37,10 @@
  
  To work around this issue, it is recommended that multi-process applications perform the hash calculations by directly calling
 diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
-index e5970b4688..4432aef767 100644
+index 5539e33893..a7a96c5b23 100644
 --- a/lib/librte_hash/rte_hash.h
 +++ b/lib/librte_hash/rte_hash.h
-@@ -463,7 +463,7 @@ rte_hash_lookup_with_hash(const struct rte_hash *h,
+@@ -375,7 +375,7 @@ rte_hash_lookup_with_hash(const struct rte_hash *h,
  
  /**
   * Calc a hash value by key.


More information about the stable mailing list