Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/47976/?format=api
http://patches.dpdk.org/api/patches/47976/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20181109163917.16845-5-honnappa.nagarahalli@arm.com/", "project": { "id": 1, "url": "http://patches.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": "<20181109163917.16845-5-honnappa.nagarahalli@arm.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181109163917.16845-5-honnappa.nagarahalli@arm.com", "date": "2018-11-09T16:39:17", "name": "[4/4] hash: separate lf and rw lock lookup code paths", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "584a141f94042017dbe59fb684251ea31b86fdcc", "submitter": { "id": 1045, "url": "http://patches.dpdk.org/api/people/1045/?format=api", "name": "Honnappa Nagarahalli", "email": "honnappa.nagarahalli@arm.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20181109163917.16845-5-honnappa.nagarahalli@arm.com/mbox/", "series": [ { "id": 2343, "url": "http://patches.dpdk.org/api/series/2343/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=2343", "date": "2018-11-09T16:39:13", "name": "hash: separate lf and rw lock lookup code paths", "version": 1, "mbox": "http://patches.dpdk.org/series/2343/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/47976/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/47976/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 67D915424;\n\tFri, 9 Nov 2018 17:39:52 +0100 (CET)", "from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70])\n\tby dpdk.org (Postfix) with ESMTP id 860F94C94\n\tfor <dev@dpdk.org>; Fri, 9 Nov 2018 17:39:45 +0100 (CET)", "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 D4C381682;\n\tFri, 9 Nov 2018 08:39:44 -0800 (PST)", "from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com\n\t[10.118.12.122])\n\tby usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id\n\t535733F5BD; Fri, 9 Nov 2018 08:39:44 -0800 (PST)" ], "From": "Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>", "To": "bruce.richardson@intel.com,\n\tpablo.de.lara.guarch@intel.com", "Cc": "dev@dpdk.org, jerin.jacob@caviumnetworks.com, hemant.agrawal@nxp.com,\n\tchaozhu@linux.vnet.ibm.com, yipeng1.wang@intel.com,\n\tdharmik.thakkar@arm.com, gavin.hu@arm.com, honnappa.nagarahalli@arm.com, \n\tnd@arm.com", "Date": "Fri, 9 Nov 2018 10:39:17 -0600", "Message-Id": "<20181109163917.16845-5-honnappa.nagarahalli@arm.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20181109163917.16845-1-honnappa.nagarahalli@arm.com>", "References": "<20181109163917.16845-1-honnappa.nagarahalli@arm.com>", "Subject": "[dpdk-dev] [PATCH 4/4] hash: separate lf and rw lock lookup code\n\tpaths", "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": "The lock-free algorithm has caused significant lookup\nperformance regression for certain use cases. The\nregression is attributed to the use of non-relaxed\nmemory orderings. 2 versions of the lookup functions\nare created. One that uses the RW lock and the one that\nis lock-free. This restores the performance regression\ncaused for use cases that used RW lock version of the\nlookup function.\n\nFixes: e605a1d36 (\"hash: add lock-free r/w concurrency\")\nCc: honnappa.nagarahalli@arm.com\n\nSuggested-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>\nSigned-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\nReviewed-by: Ola Liljedahl <ola.liljedahl@arm.com>\nReviewed-by: Gavin Hu <gavin.hu@arm.com>\n---\n lib/librte_hash/rte_cuckoo_hash.c | 44 ++++++++++++++++++++++++-------\n 1 file changed, 34 insertions(+), 10 deletions(-)", "diff": "diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c\nindex 9390dc5e4..7e1a9ac96 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.c\n+++ b/lib/librte_hash/rte_cuckoo_hash.c\n@@ -1129,10 +1129,11 @@ rte_hash_add_key_data(const struct rte_hash *h, const void *key, void *data)\n \t\treturn ret;\n }\n \n-/* Search one bucket to find the match key */\n+/* Search one bucket to find the match key - uses rw lock */\n static inline int32_t\n-search_one_bucket(const struct rte_hash *h, const void *key, uint16_t sig,\n-\t\t\tvoid **data, const struct rte_hash_bucket *bkt)\n+search_one_bucket_l(const struct rte_hash *h, const void *key,\n+\t\tuint16_t sig, void **data,\n+\t\tconst struct rte_hash_bucket *bkt)\n {\n \tint i;\n \tstruct rte_hash_key *k, *keys = h->key_store;\n@@ -1191,8 +1192,8 @@ search_one_bucket_lf(const struct rte_hash *h, const void *key, uint16_t sig,\n }\n \n static inline int32_t\n-__rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n-\t\t\t\t\thash_sig_t sig, void **data)\n+__rte_hash_lookup_with_hash_l(const struct rte_hash *h, const void *key,\n+\t\t\t\thash_sig_t sig, void **data)\n {\n \tuint32_t prim_bucket_idx, sec_bucket_idx;\n \tstruct rte_hash_bucket *bkt, *cur_bkt;\n@@ -1207,7 +1208,7 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n \n \t/* Check if key is in primary location */\n \tbkt = &h->buckets[prim_bucket_idx];\n-\tret = search_one_bucket(h, key, short_sig, data, bkt);\n+\tret = search_one_bucket_l(h, key, short_sig, data, bkt);\n \tif (ret != -1) {\n \t\t__hash_rw_reader_unlock(h);\n \t\treturn ret;\n@@ -1217,7 +1218,7 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n \n \t/* Check if key is in secondary location */\n \tFOR_EACH_BUCKET(cur_bkt, bkt) {\n-\t\tret = search_one_bucket(h, key, short_sig,\n+\t\tret = search_one_bucket_l(h, key, short_sig,\n \t\t\t\t\tdata, cur_bkt);\n \t\tif (ret != -1) {\n \t\t\t__hash_rw_reader_unlock(h);\n@@ -1291,6 +1292,16 @@ __rte_hash_lookup_with_hash_lf(const struct rte_hash *h, const void *key,\n \treturn -ENOENT;\n }\n \n+static inline int32_t\n+__rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n+\t\t\t\t\thash_sig_t sig, void **data)\n+{\n+\tif (h->readwrite_concur_lf_support)\n+\t\treturn __rte_hash_lookup_with_hash_lf(h, key, sig, data);\n+\telse\n+\t\treturn __rte_hash_lookup_with_hash_l(h, key, sig, data);\n+}\n+\n int32_t\n rte_hash_lookup_with_hash(const struct rte_hash *h,\n \t\t\tconst void *key, hash_sig_t sig)\n@@ -1592,7 +1603,7 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,\n \n #define PREFETCH_OFFSET 4\n static inline void\n-__rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys,\n+__rte_hash_lookup_bulk_l(const struct rte_hash *h, const void **keys,\n \t\t\tint32_t num_keys, int32_t *positions,\n \t\t\tuint64_t *hit_mask, void *data[])\n {\n@@ -1762,10 +1773,10 @@ __rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys,\n \t\tnext_bkt = secondary_bkt[i]->next;\n \t\tFOR_EACH_BUCKET(cur_bkt, next_bkt) {\n \t\t\tif (data != NULL)\n-\t\t\t\tret = search_one_bucket(h, keys[i],\n+\t\t\t\tret = search_one_bucket_l(h, keys[i],\n \t\t\t\t\t\tsig[i], &data[i], cur_bkt);\n \t\t\telse\n-\t\t\t\tret = search_one_bucket(h, keys[i],\n+\t\t\t\tret = search_one_bucket_l(h, keys[i],\n \t\t\t\t\t\tsig[i], NULL, cur_bkt);\n \t\t\tif (ret != -1) {\n \t\t\t\tpositions[i] = ret;\n@@ -2005,6 +2016,19 @@ __rte_hash_lookup_bulk_lf(const struct rte_hash *h, const void **keys,\n \t\t*hit_mask = hits;\n }\n \n+static inline void\n+__rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys,\n+\t\t\tint32_t num_keys, int32_t *positions,\n+\t\t\tuint64_t *hit_mask, void *data[])\n+{\n+\tif (h->readwrite_concur_lf_support)\n+\t\treturn __rte_hash_lookup_bulk_lf(h, keys, num_keys,\n+\t\t\t\t\t\tpositions, hit_mask, data);\n+\telse\n+\t\treturn __rte_hash_lookup_bulk_l(h, keys, num_keys,\n+\t\t\t\t\t\tpositions, hit_mask, data);\n+}\n+\n int\n rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys,\n \t\t uint32_t num_keys, int32_t *positions)\n", "prefixes": [ "4/4" ] }{ "id": 47976, "url": "