From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dharmik.thakkar@arm.com>
Received: from foss.arm.com (foss.arm.com [217.140.101.70])
by dpdk.org (Postfix) with ESMTP id BE0A14C6C
for <dev@dpdk.org>; Thu, 9 May 2019 19:19:57 +0200 (CEST)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])
by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0809C169E;
Thu, 9 May 2019 10:19:57 -0700 (PDT)
Received: from dp6132.austin.arm.com (dp6132.austin.arm.com [10.118.12.38])
by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 962093F6C4;
Thu, 9 May 2019 10:19:56 -0700 (PDT)
From: Dharmik Thakkar <dharmik.thakkar@arm.com>
To: Yipeng Wang <yipeng1.wang@intel.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Pablo de Lara <pablo.de.lara.guarch@intel.com>
Cc: dev@dpdk.org, honnappa.nagarahalli@arm.com, zhongdahulinfan@163.com,
Dharmik Thakkar <dharmik.thakkar@arm.com>
Date: Thu, 9 May 2019 17:19:07 +0000
Message-Id: <20190509171907.14693-4-dharmik.thakkar@arm.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20190509171907.14693-1-dharmik.thakkar@arm.com>
References: <20190509133924.7153-1-dharmik.thakkar@arm.com>
<20190509171907.14693-1-dharmik.thakkar@arm.com>
Subject: [dpdk-dev] [PATCH v4 3/3] test/hash: add test for 'free key with
position'
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 09 May 2019 17:19:58 -0000
This patch adds a unit test for rte_hash_free_key_with_position().
Suggested-by: Linfan <zhongdahulinfan@163.com>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
---
app/test/test_hash.c | 94 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 390fbef87f42..e162592965ce 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -481,6 +481,98 @@ static int test_add_update_delete_free(void)
return 0;
}
+/*
+ * Sequence of operations for a single key with 'rw concurrency lock free' set:
+ * - add
+ * - delete: hit
+ * - free: hit
+ * Repeat the test case when 'multi writer add' is enabled.
+ * - add
+ * - delete: hit
+ * - free: hit
+ */
+static int test_add_delete_free_lf(void)
+{
+/* Should match the #define LCORE_CACHE_SIZE value in rte_cuckoo_hash.h */
+#define LCORE_CACHE_SIZE 64
+ struct rte_hash *handle;
+ hash_sig_t hash_value;
+ int pos, expectedPos, delPos;
+ uint8_t extra_flag;
+ uint32_t i, ip_src;
+
+ extra_flag = ut_params.extra_flag;
+ ut_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF;
+ handle = rte_hash_create(&ut_params);
+ RETURN_IF_ERROR(handle == NULL, "hash creation failed");
+ ut_params.extra_flag = extra_flag;
+
+ /*
+ * The number of iterations is at least the same as the number of slots
+ * rte_hash allocates internally. This is to reveal potential issues of
+ * not freeing keys successfully.
+ */
+ for (i = 0; i < ut_params.entries + 1; i++) {
+ hash_value = rte_hash_hash(handle, &keys[0]);
+ pos = rte_hash_add_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Add", &keys[0], pos);
+ RETURN_IF_ERROR(pos < 0, "failed to add key (pos=%d)", pos);
+ expectedPos = pos;
+
+ pos = rte_hash_del_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Del", &keys[0], pos);
+ RETURN_IF_ERROR(pos != expectedPos,
+ "failed to delete key (pos=%d)", pos);
+ delPos = pos;
+
+ pos = rte_hash_free_key_with_position(handle, delPos);
+ print_key_info("Free", &keys[0], delPos);
+ RETURN_IF_ERROR(pos != 0,
+ "failed to free key (pos=%d)", delPos);
+ }
+
+ rte_hash_free(handle);
+
+ extra_flag = ut_params.extra_flag;
+ ut_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF |
+ RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD;
+ handle = rte_hash_create(&ut_params);
+ RETURN_IF_ERROR(handle == NULL, "hash creation failed");
+ ut_params.extra_flag = extra_flag;
+
+ ip_src = keys[0].ip_src;
+ /*
+ * The number of iterations is at least the same as the number of slots
+ * rte_hash allocates internally. This is to reveal potential issues of
+ * not freeing keys successfully.
+ */
+ for (i = 0; i < ut_params.entries + (RTE_MAX_LCORE - 1) *
+ (LCORE_CACHE_SIZE - 1) + 1; i++) {
+ keys[0].ip_src++;
+ hash_value = rte_hash_hash(handle, &keys[0]);
+ pos = rte_hash_add_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Add", &keys[0], pos);
+ RETURN_IF_ERROR(pos < 0, "failed to add key (pos=%d)", pos);
+ expectedPos = pos;
+
+ pos = rte_hash_del_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Del", &keys[0], pos);
+ RETURN_IF_ERROR(pos != expectedPos,
+ "failed to delete key (pos=%d)", pos);
+ delPos = pos;
+
+ pos = rte_hash_free_key_with_position(handle, delPos);
+ print_key_info("Free", &keys[0], delPos);
+ RETURN_IF_ERROR(pos != 0,
+ "failed to free key (pos=%d)", delPos);
+ }
+ keys[0].ip_src = ip_src;
+
+ rte_hash_free(handle);
+
+ return 0;
+}
+
/*
* Sequence of operations for retrieving a key with its position
*
@@ -1743,6 +1835,8 @@ test_hash(void)
return -1;
if (test_add_update_delete_free() < 0)
return -1;
+ if (test_add_delete_free_lf() < 0)
+ return -1;
if (test_five_keys() < 0)
return -1;
if (test_full_bucket() < 0)
--
2.17.1
From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 15CBFA0096
for <public@inbox.dpdk.org>; Thu, 9 May 2019 19:20:23 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D74CB5681;
Thu, 9 May 2019 19:20:03 +0200 (CEST)
Received: from foss.arm.com (foss.arm.com [217.140.101.70])
by dpdk.org (Postfix) with ESMTP id BE0A14C6C
for <dev@dpdk.org>; Thu, 9 May 2019 19:19:57 +0200 (CEST)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])
by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0809C169E;
Thu, 9 May 2019 10:19:57 -0700 (PDT)
Received: from dp6132.austin.arm.com (dp6132.austin.arm.com [10.118.12.38])
by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 962093F6C4;
Thu, 9 May 2019 10:19:56 -0700 (PDT)
From: Dharmik Thakkar <dharmik.thakkar@arm.com>
To: Yipeng Wang <yipeng1.wang@intel.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Pablo de Lara <pablo.de.lara.guarch@intel.com>
Cc: dev@dpdk.org, honnappa.nagarahalli@arm.com, zhongdahulinfan@163.com,
Dharmik Thakkar <dharmik.thakkar@arm.com>
Date: Thu, 9 May 2019 17:19:07 +0000
Message-Id: <20190509171907.14693-4-dharmik.thakkar@arm.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20190509171907.14693-1-dharmik.thakkar@arm.com>
References: <20190509133924.7153-1-dharmik.thakkar@arm.com>
<20190509171907.14693-1-dharmik.thakkar@arm.com>
Subject: [dpdk-dev] [PATCH v4 3/3] test/hash: add test for 'free key with
position'
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Content-Type: text/plain; charset="UTF-8"
Message-ID: <20190509171907.yQ_8f-fNLwqsjPvm7H21KqzcTMXzMqOo_ZhE6s9Ct5c@z>
This patch adds a unit test for rte_hash_free_key_with_position().
Suggested-by: Linfan <zhongdahulinfan@163.com>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
---
app/test/test_hash.c | 94 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 390fbef87f42..e162592965ce 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -481,6 +481,98 @@ static int test_add_update_delete_free(void)
return 0;
}
+/*
+ * Sequence of operations for a single key with 'rw concurrency lock free' set:
+ * - add
+ * - delete: hit
+ * - free: hit
+ * Repeat the test case when 'multi writer add' is enabled.
+ * - add
+ * - delete: hit
+ * - free: hit
+ */
+static int test_add_delete_free_lf(void)
+{
+/* Should match the #define LCORE_CACHE_SIZE value in rte_cuckoo_hash.h */
+#define LCORE_CACHE_SIZE 64
+ struct rte_hash *handle;
+ hash_sig_t hash_value;
+ int pos, expectedPos, delPos;
+ uint8_t extra_flag;
+ uint32_t i, ip_src;
+
+ extra_flag = ut_params.extra_flag;
+ ut_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF;
+ handle = rte_hash_create(&ut_params);
+ RETURN_IF_ERROR(handle == NULL, "hash creation failed");
+ ut_params.extra_flag = extra_flag;
+
+ /*
+ * The number of iterations is at least the same as the number of slots
+ * rte_hash allocates internally. This is to reveal potential issues of
+ * not freeing keys successfully.
+ */
+ for (i = 0; i < ut_params.entries + 1; i++) {
+ hash_value = rte_hash_hash(handle, &keys[0]);
+ pos = rte_hash_add_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Add", &keys[0], pos);
+ RETURN_IF_ERROR(pos < 0, "failed to add key (pos=%d)", pos);
+ expectedPos = pos;
+
+ pos = rte_hash_del_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Del", &keys[0], pos);
+ RETURN_IF_ERROR(pos != expectedPos,
+ "failed to delete key (pos=%d)", pos);
+ delPos = pos;
+
+ pos = rte_hash_free_key_with_position(handle, delPos);
+ print_key_info("Free", &keys[0], delPos);
+ RETURN_IF_ERROR(pos != 0,
+ "failed to free key (pos=%d)", delPos);
+ }
+
+ rte_hash_free(handle);
+
+ extra_flag = ut_params.extra_flag;
+ ut_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF |
+ RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD;
+ handle = rte_hash_create(&ut_params);
+ RETURN_IF_ERROR(handle == NULL, "hash creation failed");
+ ut_params.extra_flag = extra_flag;
+
+ ip_src = keys[0].ip_src;
+ /*
+ * The number of iterations is at least the same as the number of slots
+ * rte_hash allocates internally. This is to reveal potential issues of
+ * not freeing keys successfully.
+ */
+ for (i = 0; i < ut_params.entries + (RTE_MAX_LCORE - 1) *
+ (LCORE_CACHE_SIZE - 1) + 1; i++) {
+ keys[0].ip_src++;
+ hash_value = rte_hash_hash(handle, &keys[0]);
+ pos = rte_hash_add_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Add", &keys[0], pos);
+ RETURN_IF_ERROR(pos < 0, "failed to add key (pos=%d)", pos);
+ expectedPos = pos;
+
+ pos = rte_hash_del_key_with_hash(handle, &keys[0], hash_value);
+ print_key_info("Del", &keys[0], pos);
+ RETURN_IF_ERROR(pos != expectedPos,
+ "failed to delete key (pos=%d)", pos);
+ delPos = pos;
+
+ pos = rte_hash_free_key_with_position(handle, delPos);
+ print_key_info("Free", &keys[0], delPos);
+ RETURN_IF_ERROR(pos != 0,
+ "failed to free key (pos=%d)", delPos);
+ }
+ keys[0].ip_src = ip_src;
+
+ rte_hash_free(handle);
+
+ return 0;
+}
+
/*
* Sequence of operations for retrieving a key with its position
*
@@ -1743,6 +1835,8 @@ test_hash(void)
return -1;
if (test_add_update_delete_free() < 0)
return -1;
+ if (test_add_delete_free_lf() < 0)
+ return -1;
if (test_five_keys() < 0)
return -1;
if (test_full_bucket() < 0)
--
2.17.1