Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8135/?format=api
https://patches.dpdk.org/api/patches/8135/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1446052282-22391-2-git-send-email-roy.fan.zhang@intel.com/", "project": { "id": 1, "url": "https://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": "<1446052282-22391-2-git-send-email-roy.fan.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446052282-22391-2-git-send-email-roy.fan.zhang@intel.com", "date": "2015-10-28T17:11:16", "name": "[dpdk-dev,v4,1/7] librte_table: add key_mask parameter to 8- and 16-bytes key hash parameters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7ecc894b3ca405209afd097dbe521df72e4e5b0f", "submitter": { "id": 304, "url": "https://patches.dpdk.org/api/people/304/?format=api", "name": "Fan Zhang", "email": "roy.fan.zhang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1446052282-22391-2-git-send-email-roy.fan.zhang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8135/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8135/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 2521B8E6E;\n\tWed, 28 Oct 2015 18:11:34 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 6786C8DA9\n\tfor <dev@dpdk.org>; Wed, 28 Oct 2015 18:11:30 +0100 (CET)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP; 28 Oct 2015 10:11:29 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga001.jf.intel.com with ESMTP; 28 Oct 2015 10:11:28 -0700", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tt9SHBRv5002826; Wed, 28 Oct 2015 17:11:27 GMT", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id t9SHBRSu022441;\n\tWed, 28 Oct 2015 17:11:27 GMT", "(from fanzhan2@localhost)\n\tby sivswdev02.ir.intel.com with id t9SHBRcF022437;\n\tWed, 28 Oct 2015 17:11:27 GMT" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,210,1444719600\"; d=\"scan'208\";a=\"805686667\"", "From": "roy.fan.zhang@intel.com", "To": "dev@dpdk.org", "Date": "Wed, 28 Oct 2015 17:11:16 +0000", "Message-Id": "<1446052282-22391-2-git-send-email-roy.fan.zhang@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1446052282-22391-1-git-send-email-roy.fan.zhang@intel.com>", "References": "<1446052282-22391-1-git-send-email-roy.fan.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 1/7] librte_table: add key_mask parameter to\n\t8- and 16-bytes key hash parameters", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Fan Zhang <roy.fan.zhang@intel.com>\n\nThis patch relates to ABI change proposed for librte_table.\nThe key_mask parameter is added for 8-byte and 16-byte\nkey extendible bucket and LRU tables.The release notes\nis updated and the deprecation notice is removed.\n\nSigned-off-by: Fan Zhang <roy.fan.zhang@intel.com>\nSigned-off-by: Jasvinder Singh <jasvinder.singh@intel.com>\n---\n doc/guides/rel_notes/deprecation.rst | 4 ---\n doc/guides/rel_notes/release_2_2.rst | 4 +++\n lib/librte_table/rte_table_hash.h | 12 ++++++++\n lib/librte_table/rte_table_hash_key16.c | 52 ++++++++++++++++++++++++++-----\n lib/librte_table/rte_table_hash_key8.c | 54 +++++++++++++++++++++++++++------\n lib/librte_table/rte_table_version.map | 7 +++++\n 6 files changed, 112 insertions(+), 21 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex a391ff0..16ec9f8 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -44,10 +44,6 @@ Deprecation Notices\n * librte_table: New functions for table entry bulk add/delete will be added\n to the table operations structure.\n \n-* librte_table hash: Key mask parameter will be added to the hash table\n- parameter structure for 8-byte key and 16-byte key extendible bucket and\n- LRU tables.\n-\n * librte_pipeline: The prototype for the pipeline input port, output port\n and table action handlers will be updated:\n the pipeline parameter will be added, the packets mask parameter will be\ndiff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst\nindex 128f956..7beba40 100644\n--- a/doc/guides/rel_notes/release_2_2.rst\n+++ b/doc/guides/rel_notes/release_2_2.rst\n@@ -132,6 +132,10 @@ ABI Changes\n * librte_cfgfile: Allow longer names and values by increasing the constants\n CFG_NAME_LEN and CFG_VALUE_LEN to 64 and 256 respectively.\n \n+* librte_table hash: The key mask parameter is added to the hash table\n+ parameter structure for 8-byte key and 16-byte key extendible bucket\n+ and LRU tables.\n+\n \n Shared Library Versions\n -----------------------\ndiff --git a/lib/librte_table/rte_table_hash.h b/lib/librte_table/rte_table_hash.h\nindex 9181942..e2c60e1 100644\n--- a/lib/librte_table/rte_table_hash.h\n+++ b/lib/librte_table/rte_table_hash.h\n@@ -196,6 +196,9 @@ struct rte_table_hash_key8_lru_params {\n \n \t/** Byte offset within packet meta-data where the key is located */\n \tuint32_t key_offset;\n+\n+\t/** Bit-mask to be AND-ed to the key on lookup */\n+\tuint8_t *key_mask;\n };\n \n /** LRU hash table operations for pre-computed key signature */\n@@ -226,6 +229,9 @@ struct rte_table_hash_key8_ext_params {\n \n \t/** Byte offset within packet meta-data where the key is located */\n \tuint32_t key_offset;\n+\n+\t/** Bit-mask to be AND-ed to the key on lookup */\n+\tuint8_t *key_mask;\n };\n \n /** Extendible bucket hash table operations for pre-computed key signature */\n@@ -257,6 +263,9 @@ struct rte_table_hash_key16_lru_params {\n \n \t/** Byte offset within packet meta-data where the key is located */\n \tuint32_t key_offset;\n+\n+\t/** Bit-mask to be AND-ed to the key on lookup */\n+\tuint8_t *key_mask;\n };\n \n /** LRU hash table operations for pre-computed key signature */\n@@ -284,6 +293,9 @@ struct rte_table_hash_key16_ext_params {\n \n \t/** Byte offset within packet meta-data where the key is located */\n \tuint32_t key_offset;\n+\n+\t/** Bit-mask to be AND-ed to the key on lookup */\n+\tuint8_t *key_mask;\n };\n \n /** Extendible bucket operations for pre-computed key signature */\ndiff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c\nindex f6a3306..0d6cc55 100644\n--- a/lib/librte_table/rte_table_hash_key16.c\n+++ b/lib/librte_table/rte_table_hash_key16.c\n@@ -85,6 +85,7 @@ struct rte_table_hash {\n \tuint32_t bucket_size;\n \tuint32_t signature_offset;\n \tuint32_t key_offset;\n+\tuint64_t key_mask[2];\n \trte_table_hash_op_hash f_hash;\n \tuint64_t seed;\n \n@@ -164,6 +165,14 @@ rte_table_hash_create_key16_lru(void *params,\n \tf->f_hash = p->f_hash;\n \tf->seed = p->seed;\n \n+\tif (p->key_mask != NULL) {\n+\t\tf->key_mask[0] = ((uint64_t *)p->key_mask)[0];\n+\t\tf->key_mask[1] = ((uint64_t *)p->key_mask)[1];\n+\t} else {\n+\t\tf->key_mask[0] = 0xFFFFFFFFFFFFFFFFLLU;\n+\t\tf->key_mask[1] = 0xFFFFFFFFFFFFFFFFLLU;\n+\t}\n+\n \tfor (i = 0; i < n_buckets; i++) {\n \t\tstruct rte_bucket_4_16 *bucket;\n \n@@ -384,6 +393,14 @@ rte_table_hash_create_key16_ext(void *params,\n \tfor (i = 0; i < n_buckets_ext; i++)\n \t\tf->stack[i] = i;\n \n+\tif (p->key_mask != NULL) {\n+\t\tf->key_mask[0] = (((uint64_t *)p->key_mask)[0]);\n+\t\tf->key_mask[1] = (((uint64_t *)p->key_mask)[1]);\n+\t} else {\n+\t\tf->key_mask[0] = 0xFFFFFFFFFFFFFFFFLLU;\n+\t\tf->key_mask[1] = 0xFFFFFFFFFFFFFFFFLLU;\n+\t}\n+\n \treturn f;\n }\n \n@@ -609,11 +626,14 @@ rte_table_hash_entry_delete_key16_ext(\n \tvoid *a;\t\t\t\t\t\t\\\n \tuint64_t pkt_mask;\t\t\t\t\t\\\n \tuint64_t *key;\t\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer[2];\t\t\\\n \tuint32_t pos;\t\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey = RTE_MBUF_METADATA_UINT64_PTR(mbuf2, f->key_offset);\\\n+\thash_key_buffer[0] = key[0] & f->key_mask[0];\t\\\n+\thash_key_buffer[1] = key[1] & f->key_mask[1];\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key16_cmp(key, bucket2, pos);\t\t\t\\\n+\tlookup_key16_cmp(hash_key_buffer, bucket2, pos);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt_mask = (bucket2->signature[pos] & 1LLU) << pkt2_index;\\\n \tpkts_mask_out |= pkt_mask;\t\t\t\t\\\n@@ -631,11 +651,14 @@ rte_table_hash_entry_delete_key16_ext(\n \tvoid *a;\t\t\t\t\t\t\\\n \tuint64_t pkt_mask, bucket_mask;\t\t\t\t\\\n \tuint64_t *key;\t\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer[2];\t\t\\\n \tuint32_t pos;\t\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey = RTE_MBUF_METADATA_UINT64_PTR(mbuf2, f->key_offset);\\\n+\thash_key_buffer[0] = key[0] & f->key_mask[0];\t\\\n+\thash_key_buffer[1] = key[1] & f->key_mask[1];\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key16_cmp(key, bucket2, pos);\t\t\t\\\n+\tlookup_key16_cmp(hash_key_buffer, bucket2, pos);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt_mask = (bucket2->signature[pos] & 1LLU) << pkt2_index;\\\n \tpkts_mask_out |= pkt_mask;\t\t\t\t\\\n@@ -658,12 +681,15 @@ rte_table_hash_entry_delete_key16_ext(\n \tvoid *a;\t\t\t\t\t\t\\\n \tuint64_t pkt_mask, bucket_mask;\t\t\t\t\\\n \tuint64_t *key;\t\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer[2];\t\t\\\n \tuint32_t pos;\t\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tbucket = buckets[pkt_index];\t\t\t\t\\\n \tkey = keys[pkt_index];\t\t\t\t\t\\\n+\thash_key_buffer[0] = key[0] & f->key_mask[0];\t\\\n+\thash_key_buffer[1] = key[1] & f->key_mask[1];\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key16_cmp(key, bucket, pos);\t\t\t\\\n+\tlookup_key16_cmp(hash_key_buffer, bucket, pos);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt_mask = (bucket->signature[pos] & 1LLU) << pkt_index;\\\n \tpkts_mask_out |= pkt_mask;\t\t\t\t\\\n@@ -749,13 +775,19 @@ rte_table_hash_entry_delete_key16_ext(\n \tvoid *a20, *a21;\t\t\t\t\t\\\n \tuint64_t pkt20_mask, pkt21_mask;\t\t\t\\\n \tuint64_t *key20, *key21;\t\t\t\t\\\n+\tuint64_t hash_key_buffer20[2];\t\t\t\\\n+\tuint64_t hash_key_buffer21[2];\t\t\t\\\n \tuint32_t pos20, pos21;\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey20 = RTE_MBUF_METADATA_UINT64_PTR(mbuf20, f->key_offset);\\\n \tkey21 = RTE_MBUF_METADATA_UINT64_PTR(mbuf21, f->key_offset);\\\n+\thash_key_buffer20[0] = key20[0] & f->key_mask[0];\t\\\n+\thash_key_buffer20[1] = key20[1] & f->key_mask[1];\t\\\n+\thash_key_buffer21[0] = key21[0] & f->key_mask[0];\t\\\n+\thash_key_buffer21[1] = key21[1] & f->key_mask[1];\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key16_cmp(key20, bucket20, pos20);\t\t\\\n-\tlookup_key16_cmp(key21, bucket21, pos21);\t\t\\\n+\tlookup_key16_cmp(hash_key_buffer20, bucket20, pos20);\t\\\n+\tlookup_key16_cmp(hash_key_buffer21, bucket21, pos21);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt20_mask = (bucket20->signature[pos20] & 1LLU) << pkt20_index;\\\n \tpkt21_mask = (bucket21->signature[pos21] & 1LLU) << pkt21_index;\\\n@@ -778,13 +810,19 @@ rte_table_hash_entry_delete_key16_ext(\n \tvoid *a20, *a21;\t\t\t\t\t\\\n \tuint64_t pkt20_mask, pkt21_mask, bucket20_mask, bucket21_mask;\\\n \tuint64_t *key20, *key21;\t\t\t\t\\\n+\tuint64_t hash_key_buffer20[2];\t\t\t\\\n+\tuint64_t hash_key_buffer21[2];\t\t\t\\\n \tuint32_t pos20, pos21;\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey20 = RTE_MBUF_METADATA_UINT64_PTR(mbuf20, f->key_offset);\\\n \tkey21 = RTE_MBUF_METADATA_UINT64_PTR(mbuf21, f->key_offset);\\\n+\thash_key_buffer20[0] = key20[0] & f->key_mask[0];\t\\\n+\thash_key_buffer20[1] = key20[1] & f->key_mask[1];\t\\\n+\thash_key_buffer21[0] = key21[0] & f->key_mask[0];\t\\\n+\thash_key_buffer21[1] = key21[1] & f->key_mask[1];\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key16_cmp(key20, bucket20, pos20);\t\t\\\n-\tlookup_key16_cmp(key21, bucket21, pos21);\t\t\\\n+\tlookup_key16_cmp(hash_key_buffer20, bucket20, pos20);\t\\\n+\tlookup_key16_cmp(hash_key_buffer21, bucket21, pos21);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt20_mask = (bucket20->signature[pos20] & 1LLU) << pkt20_index;\\\n \tpkt21_mask = (bucket21->signature[pos21] & 1LLU) << pkt21_index;\\\ndiff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c\nindex b351a49..ccb20cf 100644\n--- a/lib/librte_table/rte_table_hash_key8.c\n+++ b/lib/librte_table/rte_table_hash_key8.c\n@@ -82,6 +82,7 @@ struct rte_table_hash {\n \tuint32_t bucket_size;\n \tuint32_t signature_offset;\n \tuint32_t key_offset;\n+\tuint64_t key_mask;\n \trte_table_hash_op_hash f_hash;\n \tuint64_t seed;\n \n@@ -160,6 +161,11 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)\n \tf->f_hash = p->f_hash;\n \tf->seed = p->seed;\n \n+\tif (p->key_mask != NULL)\n+\t\tf->key_mask = ((uint64_t *)p->key_mask)[0];\n+\telse\n+\t\tf->key_mask = 0xFFFFFFFFFFFFFFFFLLU;\n+\n \tfor (i = 0; i < n_buckets; i++) {\n \t\tstruct rte_bucket_4_8 *bucket;\n \n@@ -372,6 +378,11 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)\n \tf->stack = (uint32_t *)\n \t\t&f->memory[(n_buckets + n_buckets_ext) * f->bucket_size];\n \n+\tif (p->key_mask != NULL)\n+\t\tf->key_mask = ((uint64_t *)p->key_mask)[0];\n+\telse\n+\t\tf->key_mask = 0xFFFFFFFFFFFFFFFFLLU;\n+\n \tfor (i = 0; i < n_buckets_ext; i++)\n \t\tf->stack[i] = i;\n \n@@ -586,9 +597,12 @@ rte_table_hash_entry_delete_key8_ext(\n \tuint64_t *key;\t\t\t\t\t\t\\\n \tuint64_t signature;\t\t\t\t\t\\\n \tuint32_t bucket_index;\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer;\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey = RTE_MBUF_METADATA_UINT64_PTR(mbuf1, f->key_offset);\\\n-\tsignature = f->f_hash(key, RTE_TABLE_HASH_KEY_SIZE, f->seed);\\\n+\thash_key_buffer = *key & f->key_mask;\t\t\t\\\n+\tsignature = f->f_hash(&hash_key_buffer,\t\t\t\\\n+\t\tRTE_TABLE_HASH_KEY_SIZE, f->seed);\t\t\\\n \tbucket_index = signature & (f->n_buckets - 1);\t\t\\\n \tbucket1 = (struct rte_bucket_4_8 *)\t\t\t\\\n \t\t&f->memory[bucket_index * f->bucket_size];\t\\\n@@ -602,10 +616,12 @@ rte_table_hash_entry_delete_key8_ext(\n \tuint64_t pkt_mask;\t\t\t\t\t\\\n \tuint64_t *key;\t\t\t\t\t\t\\\n \tuint32_t pos;\t\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer;\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey = RTE_MBUF_METADATA_UINT64_PTR(mbuf2, f->key_offset);\\\n+\thash_key_buffer = key[0] & f->key_mask;\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key8_cmp(key, bucket2, pos);\t\t\t\\\n+\tlookup_key8_cmp((&hash_key_buffer), bucket2, pos);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt_mask = ((bucket2->signature >> pos) & 1LLU) << pkt2_index;\\\n \tpkts_mask_out |= pkt_mask;\t\t\t\t\\\n@@ -624,10 +640,12 @@ rte_table_hash_entry_delete_key8_ext(\n \tuint64_t pkt_mask, bucket_mask;\t\t\t\t\\\n \tuint64_t *key;\t\t\t\t\t\t\\\n \tuint32_t pos;\t\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer;\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey = RTE_MBUF_METADATA_UINT64_PTR(mbuf2, f->key_offset);\\\n+\thash_key_buffer = *key & f->key_mask;\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key8_cmp(key, bucket2, pos);\t\t\t\\\n+\tlookup_key8_cmp((&hash_key_buffer), bucket2, pos);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt_mask = ((bucket2->signature >> pos) & 1LLU) << pkt2_index;\\\n \tpkts_mask_out |= pkt_mask;\t\t\t\t\\\n@@ -651,11 +669,13 @@ rte_table_hash_entry_delete_key8_ext(\n \tuint64_t pkt_mask, bucket_mask;\t\t\t\t\\\n \tuint64_t *key;\t\t\t\t\t\t\\\n \tuint32_t pos;\t\t\t\t\t\t\\\n+\tuint64_t hash_key_buffer;\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tbucket = buckets[pkt_index];\t\t\t\t\\\n \tkey = keys[pkt_index];\t\t\t\t\t\\\n+\thash_key_buffer = (*key) & f->key_mask;\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key8_cmp(key, bucket, pos);\t\t\t\\\n+\tlookup_key8_cmp((&hash_key_buffer), bucket, pos);\t\\\n \t\t\t\t\t\t\t\t\\\n \tpkt_mask = ((bucket->signature >> pos) & 1LLU) << pkt_index;\\\n \tpkts_mask_out |= pkt_mask;\t\t\t\t\\\n@@ -736,6 +756,8 @@ rte_table_hash_entry_delete_key8_ext(\n #define lookup2_stage1_dosig(mbuf10, mbuf11, bucket10, bucket11, f)\\\n {\t\t\t\t\t\t\t\t\\\n \tuint64_t *key10, *key11;\t\t\t\t\\\n+\tuint64_t hash_offset_buffer10;\t\t\t\t\\\n+\tuint64_t hash_offset_buffer11;\t\t\t\t\\\n \tuint64_t signature10, signature11;\t\t\t\\\n \tuint32_t bucket10_index, bucket11_index;\t\t\\\n \trte_table_hash_op_hash f_hash = f->f_hash;\t\t\\\n@@ -744,14 +766,18 @@ rte_table_hash_entry_delete_key8_ext(\n \t\t\t\t\t\t\t\t\\\n \tkey10 = RTE_MBUF_METADATA_UINT64_PTR(mbuf10, key_offset);\\\n \tkey11 = RTE_MBUF_METADATA_UINT64_PTR(mbuf11, key_offset);\\\n+\thash_offset_buffer10 = *key10 & f->key_mask;\t\t\\\n+\thash_offset_buffer11 = *key11 & f->key_mask;\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tsignature10 = f_hash(key10, RTE_TABLE_HASH_KEY_SIZE, seed);\\\n+\tsignature10 = f_hash(&hash_offset_buffer10,\t\t\\\n+\t\tRTE_TABLE_HASH_KEY_SIZE, seed);\t\t\t\\\n \tbucket10_index = signature10 & (f->n_buckets - 1);\t\\\n \tbucket10 = (struct rte_bucket_4_8 *)\t\t\t\\\n \t\t&f->memory[bucket10_index * f->bucket_size];\t\\\n \trte_prefetch0(bucket10);\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tsignature11 = f_hash(key11, RTE_TABLE_HASH_KEY_SIZE, seed);\\\n+\tsignature11 = f_hash(&hash_offset_buffer11,\t\t\\\n+\t\tRTE_TABLE_HASH_KEY_SIZE, seed);\t\t\t\\\n \tbucket11_index = signature11 & (f->n_buckets - 1);\t\\\n \tbucket11 = (struct rte_bucket_4_8 *)\t\t\t\\\n \t\t&f->memory[bucket11_index * f->bucket_size];\t\\\n@@ -764,13 +790,17 @@ rte_table_hash_entry_delete_key8_ext(\n \tvoid *a20, *a21;\t\t\t\t\t\\\n \tuint64_t pkt20_mask, pkt21_mask;\t\t\t\\\n \tuint64_t *key20, *key21;\t\t\t\t\\\n+\tuint64_t hash_offset_buffer20;\t\t\t\t\\\n+\tuint64_t hash_offset_buffer21;\t\t\t\t\\\n \tuint32_t pos20, pos21;\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey20 = RTE_MBUF_METADATA_UINT64_PTR(mbuf20, f->key_offset);\\\n \tkey21 = RTE_MBUF_METADATA_UINT64_PTR(mbuf21, f->key_offset);\\\n+\thash_offset_buffer20 = *key20 & f->key_mask;\t\t\\\n+\thash_offset_buffer21 = *key21 & f->key_mask;\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key8_cmp(key20, bucket20, pos20);\t\t\\\n-\tlookup_key8_cmp(key21, bucket21, pos21);\t\t\\\n+\tlookup_key8_cmp((&hash_offset_buffer20), bucket20, pos20);\\\n+\tlookup_key8_cmp((&hash_offset_buffer21), bucket21, pos21);\\\n \t\t\t\t\t\t\t\t\\\n \tpkt20_mask = ((bucket20->signature >> pos20) & 1LLU) << pkt20_index;\\\n \tpkt21_mask = ((bucket21->signature >> pos21) & 1LLU) << pkt21_index;\\\n@@ -793,13 +823,17 @@ rte_table_hash_entry_delete_key8_ext(\n \tvoid *a20, *a21;\t\t\t\t\t\\\n \tuint64_t pkt20_mask, pkt21_mask, bucket20_mask, bucket21_mask;\\\n \tuint64_t *key20, *key21;\t\t\t\t\\\n+\tuint64_t hash_offset_buffer20;\t\t\t\t\\\n+\tuint64_t hash_offset_buffer21;\t\t\t\t\\\n \tuint32_t pos20, pos21;\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\\\n \tkey20 = RTE_MBUF_METADATA_UINT64_PTR(mbuf20, f->key_offset);\\\n \tkey21 = RTE_MBUF_METADATA_UINT64_PTR(mbuf21, f->key_offset);\\\n+\thash_offset_buffer20 = *key20 & f->key_mask;\t\t\\\n+\thash_offset_buffer21 = *key21 & f->key_mask;\t\t\\\n \t\t\t\t\t\t\t\t\\\n-\tlookup_key8_cmp(key20, bucket20, pos20);\t\t\\\n-\tlookup_key8_cmp(key21, bucket21, pos21);\t\t\\\n+\tlookup_key8_cmp((&hash_offset_buffer20), bucket20, pos20);\\\n+\tlookup_key8_cmp((&hash_offset_buffer21), bucket21, pos21);\\\n \t\t\t\t\t\t\t\t\\\n \tpkt20_mask = ((bucket20->signature >> pos20) & 1LLU) << pkt20_index;\\\n \tpkt21_mask = ((bucket21->signature >> pos21) & 1LLU) << pkt21_index;\\\ndiff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map\nindex d33f926..2138698 100644\n--- a/lib/librte_table/rte_table_version.map\n+++ b/lib/librte_table/rte_table_version.map\n@@ -19,3 +19,10 @@ DPDK_2.0 {\n \n \tlocal: *;\n };\n+\n+DPDK_2.2 {\n+\tglobal:\n+\n+\trte_table_hash_key16_ext_dosig_ops;\n+\n+} DPDK_2.0;\n", "prefixes": [ "dpdk-dev", "v4", "1/7" ] }{ "id": 8135, "url": "