Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64570/?format=api
{ "id": 64570, "url": "http://patches.dpdk.org/api/patches/64570/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200113172518.37815-6-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": "<20200113172518.37815-6-honnappa.nagarahalli@arm.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200113172518.37815-6-honnappa.nagarahalli@arm.com", "date": "2020-01-13T17:25:17", "name": "[v8,5/6] lib/hash: use ring with 32b element size to save memory", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0f24a7033aae40addd4caa5e0a144ada5851ee43", "submitter": { "id": 1045, "url": "http://patches.dpdk.org/api/people/1045/?format=api", "name": "Honnappa Nagarahalli", "email": "honnappa.nagarahalli@arm.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200113172518.37815-6-honnappa.nagarahalli@arm.com/mbox/", "series": [ { "id": 8086, "url": "http://patches.dpdk.org/api/series/8086/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8086", "date": "2020-01-13T17:25:12", "name": "lib/ring: APIs to support custom element size", "version": 8, "mbox": "http://patches.dpdk.org/series/8086/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64570/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/64570/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0F913A04F1;\n\tMon, 13 Jan 2020 18:26:14 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5042D1D181;\n\tMon, 13 Jan 2020 18:25:48 +0100 (CET)", "from foss.arm.com (foss.arm.com [217.140.110.172])\n by dpdk.org (Postfix) with ESMTP id 60D161D172\n for <dev@dpdk.org>; Mon, 13 Jan 2020 18:25:40 +0100 (CET)", "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])\n by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DD28F143D;\n Mon, 13 Jan 2020 09:25:39 -0800 (PST)", "from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com\n [10.118.14.48])\n by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C6FCB3F534;\n Mon, 13 Jan 2020 09:25:39 -0800 (PST)" ], "From": "Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>", "To": "olivier.matz@6wind.com, sthemmin@microsoft.com, jerinj@marvell.com,\n bruce.richardson@intel.com, david.marchand@redhat.com,\n pbhagavatula@marvell.com, konstantin.ananyev@intel.com,\n honnappa.nagarahalli@arm.com", "Cc": "dev@dpdk.org, dharmik.thakkar@arm.com, ruifeng.wang@arm.com,\n gavin.hu@arm.com, nd@arm.com", "Date": "Mon, 13 Jan 2020 11:25:17 -0600", "Message-Id": "<20200113172518.37815-6-honnappa.nagarahalli@arm.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200113172518.37815-1-honnappa.nagarahalli@arm.com>", "References": "<20190906190510.11146-1-honnappa.nagarahalli@arm.com>\n <20200113172518.37815-1-honnappa.nagarahalli@arm.com>", "Subject": "[dpdk-dev] [PATCH v8 5/6] lib/hash: use ring with 32b element size\n\tto save memory", "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 <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The freelist and external bucket indices are 32b. Using rings\nthat use 32b element sizes will save memory.\n\nSigned-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\nReviewed-by: Gavin Hu <gavin.hu@arm.com>\nReviewed-by: Ola Liljedahl <ola.liljedahl@arm.com>\n---\n lib/librte_hash/rte_cuckoo_hash.c | 97 ++++++++++++++++---------------\n lib/librte_hash/rte_cuckoo_hash.h | 2 +-\n 2 files changed, 51 insertions(+), 48 deletions(-)", "diff": "diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c\nindex 87a4c01f2..734bec2ac 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.c\n+++ b/lib/librte_hash/rte_cuckoo_hash.c\n@@ -24,7 +24,7 @@\n #include <rte_cpuflags.h>\n #include <rte_rwlock.h>\n #include <rte_spinlock.h>\n-#include <rte_ring.h>\n+#include <rte_ring_elem.h>\n #include <rte_compat.h>\n #include <rte_vect.h>\n #include <rte_tailq.h>\n@@ -136,7 +136,6 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \tchar ring_name[RTE_RING_NAMESIZE];\n \tchar ext_ring_name[RTE_RING_NAMESIZE];\n \tunsigned num_key_slots;\n-\tunsigned i;\n \tunsigned int hw_trans_mem_support = 0, use_local_cache = 0;\n \tunsigned int ext_table_support = 0;\n \tunsigned int readwrite_concur_support = 0;\n@@ -213,8 +212,8 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \n \tsnprintf(ring_name, sizeof(ring_name), \"HT_%s\", params->name);\n \t/* Create ring (Dummy slot index is not enqueued) */\n-\tr = rte_ring_create(ring_name, rte_align32pow2(num_key_slots),\n-\t\t\tparams->socket_id, 0);\n+\tr = rte_ring_create_elem(ring_name, sizeof(uint32_t),\n+\t\t\trte_align32pow2(num_key_slots), params->socket_id, 0);\n \tif (r == NULL) {\n \t\tRTE_LOG(ERR, HASH, \"memory allocation failed\\n\");\n \t\tgoto err;\n@@ -227,7 +226,7 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \tif (ext_table_support) {\n \t\tsnprintf(ext_ring_name, sizeof(ext_ring_name), \"HT_EXT_%s\",\n \t\t\t\t\t\t\t\tparams->name);\n-\t\tr_ext = rte_ring_create(ext_ring_name,\n+\t\tr_ext = rte_ring_create_elem(ext_ring_name, sizeof(uint32_t),\n \t\t\t\trte_align32pow2(num_buckets + 1),\n \t\t\t\tparams->socket_id, 0);\n \n@@ -294,8 +293,8 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \t\t * use bucket index for the linked list and 0 means NULL\n \t\t * for next bucket\n \t\t */\n-\t\tfor (i = 1; i <= num_buckets; i++)\n-\t\t\trte_ring_sp_enqueue(r_ext, (void *)((uintptr_t) i));\n+\t\tfor (uint32_t i = 1; i <= num_buckets; i++)\n+\t\t\trte_ring_sp_enqueue_elem(r_ext, &i, sizeof(uint32_t));\n \n \t\tif (readwrite_concur_lf_support) {\n \t\t\text_bkt_to_free = rte_zmalloc(NULL, sizeof(uint32_t) *\n@@ -433,8 +432,8 @@ rte_hash_create(const struct rte_hash_parameters *params)\n \t}\n \n \t/* Populate free slots ring. Entry zero is reserved for key misses. */\n-\tfor (i = 1; i < num_key_slots; i++)\n-\t\trte_ring_sp_enqueue(r, (void *)((uintptr_t) i));\n+\tfor (uint32_t i = 1; i < num_key_slots; i++)\n+\t\trte_ring_sp_enqueue_elem(r, &i, sizeof(uint32_t));\n \n \tte->data = (void *) h;\n \tTAILQ_INSERT_TAIL(hash_list, te, next);\n@@ -598,13 +597,13 @@ rte_hash_reset(struct rte_hash *h)\n \t\ttot_ring_cnt = h->entries;\n \n \tfor (i = 1; i < tot_ring_cnt + 1; i++)\n-\t\trte_ring_sp_enqueue(h->free_slots, (void *)((uintptr_t) i));\n+\t\trte_ring_sp_enqueue_elem(h->free_slots, &i, sizeof(uint32_t));\n \n \t/* Repopulate the free ext bkt ring. */\n \tif (h->ext_table_support) {\n \t\tfor (i = 1; i <= h->num_buckets; i++)\n-\t\t\trte_ring_sp_enqueue(h->free_ext_bkts,\n-\t\t\t\t\t\t(void *)((uintptr_t) i));\n+\t\t\trte_ring_sp_enqueue_elem(h->free_ext_bkts, &i,\n+\t\t\t\t\t\t\tsizeof(uint32_t));\n \t}\n \n \tif (h->use_local_cache) {\n@@ -623,13 +622,14 @@ rte_hash_reset(struct rte_hash *h)\n static inline void\n enqueue_slot_back(const struct rte_hash *h,\n \t\tstruct lcore_cache *cached_free_slots,\n-\t\tvoid *slot_id)\n+\t\tuint32_t slot_id)\n {\n \tif (h->use_local_cache) {\n \t\tcached_free_slots->objs[cached_free_slots->len] = slot_id;\n \t\tcached_free_slots->len++;\n \t} else\n-\t\trte_ring_sp_enqueue(h->free_slots, slot_id);\n+\t\trte_ring_sp_enqueue_elem(h->free_slots, &slot_id,\n+\t\t\t\t\t\tsizeof(uint32_t));\n }\n \n /* Search a key from bucket and update its data.\n@@ -923,9 +923,8 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \tuint32_t prim_bucket_idx, sec_bucket_idx;\n \tstruct rte_hash_bucket *prim_bkt, *sec_bkt, *cur_bkt;\n \tstruct rte_hash_key *new_k, *keys = h->key_store;\n-\tvoid *slot_id = NULL;\n-\tvoid *ext_bkt_id = NULL;\n-\tuint32_t new_idx, bkt_id;\n+\tuint32_t slot_id;\n+\tuint32_t ext_bkt_id;\n \tint ret;\n \tunsigned n_slots;\n \tunsigned lcore_id;\n@@ -968,8 +967,9 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \t\t/* Try to get a free slot from the local cache */\n \t\tif (cached_free_slots->len == 0) {\n \t\t\t/* Need to get another burst of free slots from global ring */\n-\t\t\tn_slots = rte_ring_mc_dequeue_burst(h->free_slots,\n+\t\t\tn_slots = rte_ring_mc_dequeue_burst_elem(h->free_slots,\n \t\t\t\t\tcached_free_slots->objs,\n+\t\t\t\t\tsizeof(uint32_t),\n \t\t\t\t\tLCORE_CACHE_SIZE, NULL);\n \t\t\tif (n_slots == 0) {\n \t\t\t\treturn -ENOSPC;\n@@ -982,13 +982,13 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \t\tcached_free_slots->len--;\n \t\tslot_id = cached_free_slots->objs[cached_free_slots->len];\n \t} else {\n-\t\tif (rte_ring_sc_dequeue(h->free_slots, &slot_id) != 0) {\n+\t\tif (rte_ring_sc_dequeue_elem(h->free_slots, &slot_id,\n+\t\t\t\t\t\tsizeof(uint32_t)) != 0) {\n \t\t\treturn -ENOSPC;\n \t\t}\n \t}\n \n-\tnew_k = RTE_PTR_ADD(keys, (uintptr_t)slot_id * h->key_entry_size);\n-\tnew_idx = (uint32_t)((uintptr_t) slot_id);\n+\tnew_k = RTE_PTR_ADD(keys, slot_id * h->key_entry_size);\n \t/* The store to application data (by the application) at *data should\n \t * not leak after the store of pdata in the key store. i.e. pdata is\n \t * the guard variable. Release the application data to the readers.\n@@ -1001,9 +1001,9 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \n \t/* Find an empty slot and insert */\n \tret = rte_hash_cuckoo_insert_mw(h, prim_bkt, sec_bkt, key, data,\n-\t\t\t\t\tshort_sig, new_idx, &ret_val);\n+\t\t\t\t\tshort_sig, slot_id, &ret_val);\n \tif (ret == 0)\n-\t\treturn new_idx - 1;\n+\t\treturn slot_id - 1;\n \telse if (ret == 1) {\n \t\tenqueue_slot_back(h, cached_free_slots, slot_id);\n \t\treturn ret_val;\n@@ -1011,9 +1011,9 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \n \t/* Primary bucket full, need to make space for new entry */\n \tret = rte_hash_cuckoo_make_space_mw(h, prim_bkt, sec_bkt, key, data,\n-\t\t\t\tshort_sig, prim_bucket_idx, new_idx, &ret_val);\n+\t\t\t\tshort_sig, prim_bucket_idx, slot_id, &ret_val);\n \tif (ret == 0)\n-\t\treturn new_idx - 1;\n+\t\treturn slot_id - 1;\n \telse if (ret == 1) {\n \t\tenqueue_slot_back(h, cached_free_slots, slot_id);\n \t\treturn ret_val;\n@@ -1021,10 +1021,10 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \n \t/* Also search secondary bucket to get better occupancy */\n \tret = rte_hash_cuckoo_make_space_mw(h, sec_bkt, prim_bkt, key, data,\n-\t\t\t\tshort_sig, sec_bucket_idx, new_idx, &ret_val);\n+\t\t\t\tshort_sig, sec_bucket_idx, slot_id, &ret_val);\n \n \tif (ret == 0)\n-\t\treturn new_idx - 1;\n+\t\treturn slot_id - 1;\n \telse if (ret == 1) {\n \t\tenqueue_slot_back(h, cached_free_slots, slot_id);\n \t\treturn ret_val;\n@@ -1067,10 +1067,10 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \t\t\t\t * and key.\n \t\t\t\t */\n \t\t\t\t__atomic_store_n(&cur_bkt->key_idx[i],\n-\t\t\t\t\t\t new_idx,\n+\t\t\t\t\t\t slot_id,\n \t\t\t\t\t\t __ATOMIC_RELEASE);\n \t\t\t\t__hash_rw_writer_unlock(h);\n-\t\t\t\treturn new_idx - 1;\n+\t\t\t\treturn slot_id - 1;\n \t\t\t}\n \t\t}\n \t}\n@@ -1078,26 +1078,26 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \t/* Failed to get an empty entry from extendable buckets. Link a new\n \t * extendable bucket. We first get a free bucket from ring.\n \t */\n-\tif (rte_ring_sc_dequeue(h->free_ext_bkts, &ext_bkt_id) != 0) {\n+\tif (rte_ring_sc_dequeue_elem(h->free_ext_bkts, &ext_bkt_id,\n+\t\t\t\t\t\tsizeof(uint32_t)) != 0) {\n \t\tret = -ENOSPC;\n \t\tgoto failure;\n \t}\n \n-\tbkt_id = (uint32_t)((uintptr_t)ext_bkt_id) - 1;\n \t/* Use the first location of the new bucket */\n-\t(h->buckets_ext[bkt_id]).sig_current[0] = short_sig;\n+\t(h->buckets_ext[ext_bkt_id - 1]).sig_current[0] = short_sig;\n \t/* Store to signature and key should not leak after\n \t * the store to key_idx. i.e. key_idx is the guard variable\n \t * for signature and key.\n \t */\n-\t__atomic_store_n(&(h->buckets_ext[bkt_id]).key_idx[0],\n-\t\t\t new_idx,\n+\t__atomic_store_n(&(h->buckets_ext[ext_bkt_id - 1]).key_idx[0],\n+\t\t\t slot_id,\n \t\t\t __ATOMIC_RELEASE);\n \t/* Link the new bucket to sec bucket linked list */\n \tlast = rte_hash_get_last_bkt(sec_bkt);\n-\tlast->next = &h->buckets_ext[bkt_id];\n+\tlast->next = &h->buckets_ext[ext_bkt_id - 1];\n \t__hash_rw_writer_unlock(h);\n-\treturn new_idx - 1;\n+\treturn slot_id - 1;\n \n failure:\n \t__hash_rw_writer_unlock(h);\n@@ -1373,8 +1373,9 @@ remove_entry(const struct rte_hash *h, struct rte_hash_bucket *bkt, unsigned i)\n \t\t/* Cache full, need to free it. */\n \t\tif (cached_free_slots->len == LCORE_CACHE_SIZE) {\n \t\t\t/* Need to enqueue the free slots in global ring. */\n-\t\t\tn_slots = rte_ring_mp_enqueue_burst(h->free_slots,\n+\t\t\tn_slots = rte_ring_mp_enqueue_burst_elem(h->free_slots,\n \t\t\t\t\t\tcached_free_slots->objs,\n+\t\t\t\t\t\tsizeof(uint32_t),\n \t\t\t\t\t\tLCORE_CACHE_SIZE, NULL);\n \t\t\tERR_IF_TRUE((n_slots == 0),\n \t\t\t\t\"%s: could not enqueue free slots in global ring\\n\",\n@@ -1383,11 +1384,11 @@ remove_entry(const struct rte_hash *h, struct rte_hash_bucket *bkt, unsigned i)\n \t\t}\n \t\t/* Put index of new free slot in cache. */\n \t\tcached_free_slots->objs[cached_free_slots->len] =\n-\t\t\t\t(void *)((uintptr_t)bkt->key_idx[i]);\n+\t\t\t\t\t\t\tbkt->key_idx[i];\n \t\tcached_free_slots->len++;\n \t} else {\n-\t\trte_ring_sp_enqueue(h->free_slots,\n-\t\t\t\t(void *)((uintptr_t)bkt->key_idx[i]));\n+\t\trte_ring_sp_enqueue_elem(h->free_slots,\n+\t\t\t\t&bkt->key_idx[i], sizeof(uint32_t));\n \t}\n }\n \n@@ -1551,7 +1552,8 @@ __rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key,\n \t\t\t */\n \t\t\th->ext_bkt_to_free[ret] = index;\n \t\telse\n-\t\t\trte_ring_sp_enqueue(h->free_ext_bkts, (void *)(uintptr_t)index);\n+\t\t\trte_ring_sp_enqueue_elem(h->free_ext_bkts, &index,\n+\t\t\t\t\t\t\tsizeof(uint32_t));\n \t}\n \t__hash_rw_writer_unlock(h);\n \treturn ret;\n@@ -1614,7 +1616,8 @@ rte_hash_free_key_with_position(const struct rte_hash *h,\n \t\tuint32_t index = h->ext_bkt_to_free[position];\n \t\tif (index) {\n \t\t\t/* Recycle empty ext bkt to free list. */\n-\t\t\trte_ring_sp_enqueue(h->free_ext_bkts, (void *)(uintptr_t)index);\n+\t\t\trte_ring_sp_enqueue_elem(h->free_ext_bkts, &index,\n+\t\t\t\t\t\t\tsizeof(uint32_t));\n \t\t\th->ext_bkt_to_free[position] = 0;\n \t\t}\n \t}\n@@ -1625,19 +1628,19 @@ rte_hash_free_key_with_position(const struct rte_hash *h,\n \t\t/* Cache full, need to free it. */\n \t\tif (cached_free_slots->len == LCORE_CACHE_SIZE) {\n \t\t\t/* Need to enqueue the free slots in global ring. */\n-\t\t\tn_slots = rte_ring_mp_enqueue_burst(h->free_slots,\n+\t\t\tn_slots = rte_ring_mp_enqueue_burst_elem(h->free_slots,\n \t\t\t\t\t\tcached_free_slots->objs,\n+\t\t\t\t\t\tsizeof(uint32_t),\n \t\t\t\t\t\tLCORE_CACHE_SIZE, NULL);\n \t\t\tRETURN_IF_TRUE((n_slots == 0), -EFAULT);\n \t\t\tcached_free_slots->len -= n_slots;\n \t\t}\n \t\t/* Put index of new free slot in cache. */\n-\t\tcached_free_slots->objs[cached_free_slots->len] =\n-\t\t\t\t\t(void *)((uintptr_t)key_idx);\n+\t\tcached_free_slots->objs[cached_free_slots->len] = key_idx;\n \t\tcached_free_slots->len++;\n \t} else {\n-\t\trte_ring_sp_enqueue(h->free_slots,\n-\t\t\t\t(void *)((uintptr_t)key_idx));\n+\t\trte_ring_sp_enqueue_elem(h->free_slots, &key_idx,\n+\t\t\t\t\t\tsizeof(uint32_t));\n \t}\n \n \treturn 0;\ndiff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/librte_hash/rte_cuckoo_hash.h\nindex fb19bb27d..345de6bf9 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.h\n+++ b/lib/librte_hash/rte_cuckoo_hash.h\n@@ -124,7 +124,7 @@ const rte_hash_cmp_eq_t cmp_jump_table[NUM_KEY_CMP_CASES] = {\n \n struct lcore_cache {\n \tunsigned len; /**< Cache len */\n-\tvoid *objs[LCORE_CACHE_SIZE]; /**< Cache objects */\n+\tuint32_t objs[LCORE_CACHE_SIZE]; /**< Cache objects */\n } __rte_cache_aligned;\n \n /* Structure that stores key-value pair */\n", "prefixes": [ "v8", "5/6" ] }