Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 7192,
    "url": "https://patches.dpdk.org/api/patches/7192/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1443220392-13434-3-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": "<1443220392-13434-3-git-send-email-roy.fan.zhang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1443220392-13434-3-git-send-email-roy.fan.zhang@intel.com",
    "date": "2015-09-25T22:33:06",
    "name": "[dpdk-dev,2/8] librte_table: add key_mask parameter to 16-byte key hash parameters",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "2cd8961f19336236eea7ce357386563df68626aa",
    "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/1443220392-13434-3-git-send-email-roy.fan.zhang@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/7192/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/7192/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 099518E78;\n\tSat, 26 Sep 2015 00:33:21 +0200 (CEST)",
            "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id E88748D96\n\tfor <dev@dpdk.org>; Sat, 26 Sep 2015 00:33:17 +0200 (CEST)",
            "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga103.jf.intel.com with ESMTP; 25 Sep 2015 15:33:17 -0700",
            "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga003.jf.intel.com with ESMTP; 25 Sep 2015 15:33:16 -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\tt8PMXFw2015192; Fri, 25 Sep 2015 23:33:15 +0100",
            "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id t8PMXF3o013662;\n\tFri, 25 Sep 2015 23:33:15 +0100",
            "(from fanzhan2@localhost)\n\tby sivswdev02.ir.intel.com with  id t8PMXFqU013658;\n\tFri, 25 Sep 2015 23:33:15 +0100"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.17,588,1437462000\"; d=\"scan'208\";a=\"652457370\"",
        "From": "roy.fan.zhang@intel.com",
        "To": "dev@dpdk.org",
        "Date": "Fri, 25 Sep 2015 23:33:06 +0100",
        "Message-Id": "<1443220392-13434-3-git-send-email-roy.fan.zhang@intel.com>",
        "X-Mailer": "git-send-email 1.7.4.1",
        "In-Reply-To": "<1443220392-13434-1-git-send-email-roy.fan.zhang@intel.com>",
        "References": "<1443220392-13434-1-git-send-email-roy.fan.zhang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 2/8] librte_table: add key_mask parameter to\n\t16-byte 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. key_mask\nparameter is added for 16-byte key extendible bucket and LRU tables.\n\nSigned-off-by: Fan Zhang <roy.fan.zhang@intel.com>\n---\n lib/librte_table/rte_table_hash.h       |  6 ++++\n lib/librte_table/rte_table_hash_key16.c | 53 ++++++++++++++++++++++++++++-----\n 2 files changed, 52 insertions(+), 7 deletions(-)",
    "diff": "diff --git a/lib/librte_table/rte_table_hash.h b/lib/librte_table/rte_table_hash.h\nindex ef65355..e2c60e1 100644\n--- a/lib/librte_table/rte_table_hash.h\n+++ b/lib/librte_table/rte_table_hash.h\n@@ -263,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@@ -290,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..ffd3249 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;\\\n@@ -1115,3 +1153,4 @@ struct rte_table_ops rte_table_hash_key16_ext_ops = {\n \t.f_lookup = rte_table_hash_lookup_key16_ext,\n \t.f_stats = rte_table_hash_key16_stats_read,\n };\n+\n",
    "prefixes": [
        "dpdk-dev",
        "2/8"
    ]
}