Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/46536/?format=api
{ "id": 46536, "url": "http://patchwork.dpdk.org/api/patches/46536/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1539233972-49860-2-git-send-email-honnappa.nagarahalli@arm.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1539233972-49860-2-git-send-email-honnappa.nagarahalli@arm.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1539233972-49860-2-git-send-email-honnappa.nagarahalli@arm.com", "date": "2018-10-11T04:59:26", "name": "[v2,1/7] hash: separate multi-writer from rw-concurrency", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b68d9cbc1edb81a9f2e817153051780fafdde17c", "submitter": { "id": 1045, "url": "http://patchwork.dpdk.org/api/people/1045/?format=api", "name": "Honnappa Nagarahalli", "email": "honnappa.nagarahalli@arm.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1539233972-49860-2-git-send-email-honnappa.nagarahalli@arm.com/mbox/", "series": [ { "id": 1824, "url": "http://patchwork.dpdk.org/api/series/1824/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=1824", "date": "2018-10-11T04:59:25", "name": "Address reader-writer concurrency in rte_hash", "version": 2, "mbox": "http://patchwork.dpdk.org/series/1824/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/46536/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/46536/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 18A121B3A5;\n\tThu, 11 Oct 2018 06:59:46 +0200 (CEST)", "from foss.arm.com (foss.arm.com [217.140.101.70])\n\tby dpdk.org (Postfix) with ESMTP id E18161B2B3\n\tfor <dev@dpdk.org>; Thu, 11 Oct 2018 06:59:43 +0200 (CEST)", "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])\n\tby usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3ACD27A9;\n\tWed, 10 Oct 2018 21:59:43 -0700 (PDT)", "from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com\n\t[10.118.12.190])\n\tby usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id\n\tD35C63F5B3; Wed, 10 Oct 2018 21:59:42 -0700 (PDT)" ], "From": "Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>", "To": "bruce.richardson@intel.com,\n\tpablo.de.lara.guarch@intel.com", "Cc": "dev@dpdk.org, yipeng1.wang@intel.com, honnappa.nagarahalli@arm.com,\n\tDharmik.Thakkar@arm.com, nd@arm.com", "Date": "Wed, 10 Oct 2018 23:59:26 -0500", "Message-Id": "<1539233972-49860-2-git-send-email-honnappa.nagarahalli@arm.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1539233972-49860-1-git-send-email-honnappa.nagarahalli@arm.com>", "References": "<1539233972-49860-1-git-send-email-honnappa.nagarahalli@arm.com>", "Subject": "[dpdk-dev] [PATCH v2 1/7] hash: separate multi-writer from\n\trw-concurrency", "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>,\n\t<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>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "RW concurrency is required with single writer and multiple reader\nusecase as well. Hence, multi-writer should not be enabled by default when\nRW concurrency is enabled.\n\nFixes: f2e3001b53ec (\"hash: support read/write concurrency\")\nCc: yipeng1.wang@intel.com\n\nSigned-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\nReviewed-by: Gavin Hu <gavin.hu@arm.com>\n---\n lib/librte_hash/rte_cuckoo_hash.c | 27 ++++++++++++++++-----------\n lib/librte_hash/rte_cuckoo_hash.h | 2 ++\n test/test/test_hash_readwrite.c | 6 ++++--\n 3 files changed, 22 insertions(+), 13 deletions(-)", "diff": "diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c\nindex f7b86c8..e32b746 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.c\n+++ b/lib/librte_hash/rte_cuckoo_hash.c\n@@ -93,6 +93,7 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \tunsigned i;\n \tunsigned int hw_trans_mem_support = 0, multi_writer_support = 0;\n \tunsigned int readwrite_concur_support = 0;\n+\tunsigned int writer_takes_lock = 0;\n \n \trte_hash_function default_hash_func = (rte_hash_function)rte_jhash;\n \n@@ -116,12 +117,14 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \tif (params->extra_flag & RTE_HASH_EXTRA_FLAGS_TRANS_MEM_SUPPORT)\n \t\thw_trans_mem_support = 1;\n \n-\tif (params->extra_flag & RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD)\n+\tif (params->extra_flag & RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD) {\n \t\tmulti_writer_support = 1;\n+\t\twriter_takes_lock = 1;\n+\t}\n \n \tif (params->extra_flag & RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY) {\n \t\treadwrite_concur_support = 1;\n-\t\tmulti_writer_support = 1;\n+\t\twriter_takes_lock = 1;\n \t}\n \n \t/* Store all keys and leave the first entry as a dummy entry for lookup_bulk */\n@@ -269,6 +272,7 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \th->hw_trans_mem_support = hw_trans_mem_support;\n \th->multi_writer_support = multi_writer_support;\n \th->readwrite_concur_support = readwrite_concur_support;\n+\th->writer_takes_lock = writer_takes_lock;\n \n #if defined(RTE_ARCH_X86)\n \tif (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2))\n@@ -279,10 +283,11 @@ rte_hash_create(const struct rte_hash_parameters *params)\n #endif\n \t\th->sig_cmp_fn = RTE_HASH_COMPARE_SCALAR;\n \n-\t/* Turn on multi-writer only with explicit flag from user and TM\n-\t * support.\n+\t/* Writer threads need to take the lock when:\n+\t * 1) RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY is enabled OR\n+\t * 2) RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD is enabled\n \t */\n-\tif (h->multi_writer_support) {\n+\tif (h->writer_takes_lock) {\n \t\th->readwrite_lock = rte_malloc(NULL, sizeof(rte_rwlock_t),\n \t\t\t\t\t\tRTE_CACHE_LINE_SIZE);\n \t\tif (h->readwrite_lock == NULL)\n@@ -339,10 +344,10 @@ rte_hash_free(struct rte_hash *h)\n \n \trte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);\n \n-\tif (h->multi_writer_support) {\n+\tif (h->multi_writer_support)\n \t\trte_free(h->local_free_slots);\n+\tif (h->writer_takes_lock)\n \t\trte_free(h->readwrite_lock);\n-\t}\n \trte_ring_free(h->free_slots);\n \trte_free(h->key_store);\n \trte_free(h->buckets);\n@@ -397,9 +402,9 @@ rte_hash_count(const struct rte_hash *h)\n static inline void\n __hash_rw_writer_lock(const struct rte_hash *h)\n {\n-\tif (h->multi_writer_support && h->hw_trans_mem_support)\n+\tif (h->writer_takes_lock && h->hw_trans_mem_support)\n \t\trte_rwlock_write_lock_tm(h->readwrite_lock);\n-\telse if (h->multi_writer_support)\n+\telse if (h->writer_takes_lock)\n \t\trte_rwlock_write_lock(h->readwrite_lock);\n }\n \n@@ -416,9 +421,9 @@ __hash_rw_reader_lock(const struct rte_hash *h)\n static inline void\n __hash_rw_writer_unlock(const struct rte_hash *h)\n {\n-\tif (h->multi_writer_support && h->hw_trans_mem_support)\n+\tif (h->writer_takes_lock && h->hw_trans_mem_support)\n \t\trte_rwlock_write_unlock_tm(h->readwrite_lock);\n-\telse if (h->multi_writer_support)\n+\telse if (h->writer_takes_lock)\n \t\trte_rwlock_write_unlock(h->readwrite_lock);\n }\n \ndiff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/librte_hash/rte_cuckoo_hash.h\nindex b43f467..6fa429e 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.h\n+++ b/lib/librte_hash/rte_cuckoo_hash.h\n@@ -168,6 +168,8 @@ struct rte_hash {\n \t/**< If multi-writer support is enabled. */\n \tuint8_t readwrite_concur_support;\n \t/**< If read-write concurrency support is enabled */\n+\tuint8_t writer_takes_lock;\n+\t/**< Indicates if the writer threads need to take lock */\n \trte_hash_function hash_func; /**< Function used to calculate hash. */\n \tuint32_t hash_func_init_val; /**< Init value used by hash_func. */\n \trte_hash_cmp_eq_t rte_hash_custom_cmp_eq;\ndiff --git a/test/test/test_hash_readwrite.c b/test/test/test_hash_readwrite.c\nindex 55ae33d..af57708 100644\n--- a/test/test/test_hash_readwrite.c\n+++ b/test/test/test_hash_readwrite.c\n@@ -118,10 +118,12 @@ init_params(int use_htm, int use_jhash)\n \tif (use_htm)\n \t\thash_params.extra_flag =\n \t\t\tRTE_HASH_EXTRA_FLAGS_TRANS_MEM_SUPPORT |\n-\t\t\tRTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY;\n+\t\t\tRTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY |\n+\t\t\tRTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD;\n \telse\n \t\thash_params.extra_flag =\n-\t\t\tRTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY;\n+\t\t\tRTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY |\n+\t\t\tRTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD;\n \n \thash_params.name = \"tests\";\n \n", "prefixes": [ "v2", "1/7" ] }