Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114885/?format=api
{ "id": 114885, "url": "http://patches.dpdk.org/api/patches/114885/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220812095445.1253138-3-cristian.dumitrescu@intel.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": "<20220812095445.1253138-3-cristian.dumitrescu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220812095445.1253138-3-cristian.dumitrescu@intel.com", "date": "2022-08-12T09:54:43", "name": "[2/4] pipeline: read large structure fields on the control path", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "45b292fe079e22d3e36c9d6ca2a738a39d3c9c71", "submitter": { "id": 19, "url": "http://patches.dpdk.org/api/people/19/?format=api", "name": "Cristian Dumitrescu", "email": "cristian.dumitrescu@intel.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/20220812095445.1253138-3-cristian.dumitrescu@intel.com/mbox/", "series": [ { "id": 24289, "url": "http://patches.dpdk.org/api/series/24289/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24289", "date": "2022-08-12T09:54:41", "name": "pipeline: support large structure fields", "version": 1, "mbox": "http://patches.dpdk.org/series/24289/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/114885/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/114885/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B0027A0543;\n\tFri, 12 Aug 2022 11:54:59 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id F104042C04;\n\tFri, 12 Aug 2022 11:54:50 +0200 (CEST)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by mails.dpdk.org (Postfix) with ESMTP id C2A8C410E7\n for <dev@dpdk.org>; Fri, 12 Aug 2022 11:54:49 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 12 Aug 2022 02:54:49 -0700", "from silpixa00400573.ir.intel.com (HELO\n silpixa00400573.ger.corp.intel.com.) ([10.237.223.157])\n by orsmga008.jf.intel.com with ESMTP; 12 Aug 2022 02:54:48 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1660298089; x=1691834089;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=EvnaB5jnOVA2lUTYDU1Sf47PjzYptVLmCUNFa2tLbCQ=;\n b=n5sz6BaZSn/3PPovdaJA8m9AjmraxzLjm3iwnammvKXMQZfiEg0N37ol\n JQfjO2BuGr0Wi9pn7zS0oYvMxBl08tzNAJ1jPr74WRfRJOelc3vvutExv\n Btyj/YI0mGfGQ9gWT4SALwHyDvoa6zr6YsL8Q70SJQ3mo1ZDyemsmxWRZ\n yeAiy5VJOUzbXHGihOl8AWcB9liZvh7ZoHnlCPEz2cx9v1tJIYDA0AmDP\n u9Fwq997n8p+Jrkf7wByxHTUv5LsikSBho2r5XezAwL+EMwWpci+ng/Ap\n I1z0MC6cHbOnERgvYUVVrQ8Y+BcN9H6Sjjb2ceBpGyi1+m7fkA7WPoMJQ Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10436\"; a=\"289135016\"", "E=Sophos;i=\"5.93,231,1654585200\"; d=\"scan'208\";a=\"289135016\"", "E=Sophos;i=\"5.93,231,1654585200\"; d=\"scan'208\";a=\"634589086\"" ], "X-ExtLoop1": "1", "From": "Cristian Dumitrescu <cristian.dumitrescu@intel.com>", "To": "dev@dpdk.org", "Cc": "Harshad Suresh Narayane <harshad.suresh.narayane@intel.com>", "Subject": "[PATCH 2/4] pipeline: read large structure fields on the control path", "Date": "Fri, 12 Aug 2022 09:54:43 +0000", "Message-Id": "<20220812095445.1253138-3-cristian.dumitrescu@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220812095445.1253138-1-cristian.dumitrescu@intel.com>", "References": "<20220812095445.1253138-1-cristian.dumitrescu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Support reading structure fields that are bigger than 64 bits on the\ncontrol path for the table update operations.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Harshad Suresh Narayane <harshad.suresh.narayane@intel.com>\n---\n lib/pipeline/rte_swx_ctl.c | 357 +++++++++++++++++++++++++++++++------\n 1 file changed, 298 insertions(+), 59 deletions(-)", "diff": "diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c\nindex 1b776fc543..bdbcd8f50a 100644\n--- a/lib/pipeline/rte_swx_ctl.c\n+++ b/lib/pipeline/rte_swx_ctl.c\n@@ -2694,6 +2694,270 @@ mask_to_prefix(uint64_t mask, uint32_t mask_length, uint32_t *prefix_length)\n \treturn 0;\n }\n \n+static int\n+large_mask_to_prefix(uint8_t *mask, uint32_t n_mask_bytes, uint32_t *prefix_length)\n+{\n+\tuint32_t pl, i;\n+\n+\t/* Check input arguments. */\n+\tif (!mask || !n_mask_bytes || !prefix_length)\n+\t\treturn -EINVAL;\n+\n+\t/* Count leading bits of one. */\n+\tfor (i = 0; i < n_mask_bytes * 8; i++) {\n+\t\tuint32_t byte_id = i / 8;\n+\t\tuint32_t bit_id = i & 7;\n+\n+\t\tuint32_t byte = mask[byte_id];\n+\t\tuint32_t bit = byte & (1 << (7 - bit_id));\n+\n+\t\tif (!bit)\n+\t\t\tbreak;\n+\t}\n+\n+\t/* Save the potential prefix length. */\n+\tpl = i;\n+\n+\t/* Check that all remaining bits are zeros. */\n+\tfor ( ; i < n_mask_bytes * 8; i++) {\n+\t\tuint32_t byte_id = i / 8;\n+\t\tuint32_t bit_id = i & 7;\n+\n+\t\tuint32_t byte = mask[byte_id];\n+\t\tuint32_t bit = byte & (1 << (7 - bit_id));\n+\n+\t\tif (bit)\n+\t\t\tbreak;\n+\t}\n+\n+\tif (i < n_mask_bytes * 8)\n+\t\treturn -EINVAL;\n+\n+\t*prefix_length = pl;\n+\treturn 0;\n+}\n+\n+static int\n+char_to_hex(char c, uint8_t *val)\n+{\n+\tif (c >= '0' && c <= '9') {\n+\t\t*val = c - '0';\n+\t\treturn 0;\n+\t}\n+\n+\tif (c >= 'A' && c <= 'F') {\n+\t\t*val = c - 'A' + 10;\n+\t\treturn 0;\n+\t}\n+\n+\tif (c >= 'a' && c <= 'f') {\n+\t\t*val = c - 'a' + 10;\n+\t\treturn 0;\n+\t}\n+\n+\treturn -EINVAL;\n+}\n+\n+static int\n+hex_string_parse(char *src, uint8_t *dst, uint32_t n_dst_bytes)\n+{\n+\tuint32_t i;\n+\n+\t/* Check input arguments. */\n+\tif (!src || !src[0] || !dst || !n_dst_bytes)\n+\t\treturn -EINVAL;\n+\n+\t/* Skip any leading \"0x\" or \"0X\" in the src string. */\n+\tif ((src[0] == '0') && (src[1] == 'x' || src[1] == 'X'))\n+\t\tsrc += 2;\n+\n+\t/* Convert each group of two hex characters in the src string to one byte in dst array. */\n+\tfor (i = 0; i < n_dst_bytes; i++) {\n+\t\tuint8_t a, b;\n+\t\tint status;\n+\n+\t\tstatus = char_to_hex(*src, &a);\n+\t\tif (status)\n+\t\t\treturn status;\n+\t\tsrc++;\n+\n+\t\tstatus = char_to_hex(*src, &b);\n+\t\tif (status)\n+\t\t\treturn status;\n+\t\tsrc++;\n+\n+\t\tdst[i] = a * 16 + b;\n+\t}\n+\n+\t/* Check for the end of the src string. */\n+\tif (*src)\n+\t\treturn -EINVAL;\n+\n+\treturn 0;\n+}\n+\n+static int\n+table_entry_match_field_read(struct table *table,\n+\t\t\t struct rte_swx_table_entry *entry,\n+\t\t\t uint32_t mf_id,\n+\t\t\t char *mf_val,\n+\t\t\t char *mf_mask,\n+\t\t\t int *lpm,\n+\t\t\t uint32_t *lpm_prefix_length_max,\n+\t\t\t uint32_t *lpm_prefix_length)\n+{\n+\tstruct rte_swx_ctl_table_match_field_info *mf = &table->mf[mf_id];\n+\tuint64_t val, mask = UINT64_MAX;\n+\tuint32_t offset = (mf->offset - table->mf_first->offset) / 8;\n+\n+\t/*\n+\t * Mask.\n+\t */\n+\tif (mf_mask) {\n+\t\t/* Parse. */\n+\t\tmask = strtoull(mf_mask, &mf_mask, 0);\n+\t\tif (mf_mask[0])\n+\t\t\treturn -EINVAL;\n+\n+\t\t/* LPM. */\n+\t\tif (mf->match_type == RTE_SWX_TABLE_MATCH_LPM) {\n+\t\t\tint status;\n+\n+\t\t\t*lpm = 1;\n+\n+\t\t\t*lpm_prefix_length_max = mf->n_bits;\n+\n+\t\t\tstatus = mask_to_prefix(mask, mf->n_bits, lpm_prefix_length);\n+\t\t\tif (status)\n+\t\t\t\treturn status;\n+\t\t}\n+\n+\t\t/* Endianness conversion. */\n+\t\tif (mf->is_header)\n+\t\t\tmask = field_hton(mask, mf->n_bits);\n+\t}\n+\n+\t/* Copy to entry. */\n+\tif (entry->key_mask)\n+\t\tmemcpy(&entry->key_mask[offset], (uint8_t *)&mask, mf->n_bits / 8);\n+\n+\t/*\n+\t * Value.\n+\t */\n+\t/* Parse. */\n+\tval = strtoull(mf_val, &mf_val, 0);\n+\tif (mf_val[0])\n+\t\treturn -EINVAL;\n+\n+\t/* Endianness conversion. */\n+\tif (mf->is_header)\n+\t\tval = field_hton(val, mf->n_bits);\n+\n+\t/* Copy to entry. */\n+\tmemcpy(&entry->key[offset], (uint8_t *)&val, mf->n_bits / 8);\n+\n+\treturn 0;\n+}\n+\n+static int\n+table_entry_action_argument_read(struct action *action,\n+\t\t\t\t struct rte_swx_table_entry *entry,\n+\t\t\t\t uint32_t arg_id,\n+\t\t\t\t uint32_t arg_offset,\n+\t\t\t\t char *arg_val)\n+{\n+\tstruct rte_swx_ctl_action_arg_info *arg = &action->args[arg_id];\n+\tuint64_t val;\n+\n+\tval = strtoull(arg_val, &arg_val, 0);\n+\tif (arg_val[0])\n+\t\treturn -EINVAL;\n+\n+\t/* Endianness conversion. */\n+\tif (arg->is_network_byte_order)\n+\t\tval = field_hton(val, arg->n_bits);\n+\n+\t/* Copy to entry. */\n+\tmemcpy(&entry->action_data[arg_offset],\n+\t (uint8_t *)&val,\n+\t arg->n_bits / 8);\n+\n+\treturn 0;\n+}\n+\n+static int\n+table_entry_large_match_field_read(struct table *table,\n+\t\t\t\t struct rte_swx_table_entry *entry,\n+\t\t\t\t uint32_t mf_id,\n+\t\t\t\t char *mf_val,\n+\t\t\t\t char *mf_mask,\n+\t\t\t\t int *lpm,\n+\t\t\t\t uint32_t *lpm_prefix_length_max,\n+\t\t\t\t uint32_t *lpm_prefix_length)\n+{\n+\tstruct rte_swx_ctl_table_match_field_info *mf = &table->mf[mf_id];\n+\tuint32_t offset = (mf->offset - table->mf_first->offset) / 8;\n+\tint status;\n+\n+\t/*\n+\t * Mask.\n+\t */\n+\tif (!entry->key_mask)\n+\t\tgoto value;\n+\n+\tif (!mf_mask) {\n+\t\t/* Set mask to all-ones. */\n+\t\tmemset(&entry->key_mask[offset], 0xFF, mf->n_bits / 8);\n+\t\tgoto value;\n+\t}\n+\n+\t/* Parse. */\n+\tstatus = hex_string_parse(mf_mask, &entry->key_mask[offset], mf->n_bits / 8);\n+\tif (status)\n+\t\treturn -EINVAL;\n+\n+\t/* LPM. */\n+\tif (mf->match_type == RTE_SWX_TABLE_MATCH_LPM) {\n+\t\t*lpm = 1;\n+\n+\t\t*lpm_prefix_length_max = mf->n_bits;\n+\n+\t\tstatus = large_mask_to_prefix(&entry->key_mask[offset],\n+\t\t\t\t\t mf->n_bits / 8,\n+\t\t\t\t\t lpm_prefix_length);\n+\t\tif (status)\n+\t\t\treturn status;\n+\t}\n+\n+\t/*\n+\t * Value.\n+\t */\n+value:\n+\t/* Parse. */\n+\tstatus = hex_string_parse(mf_val, &entry->key[offset], mf->n_bits / 8);\n+\tif (status)\n+\t\treturn -EINVAL;\n+\n+\treturn 0;\n+}\n+\n+static int\n+table_entry_large_action_argument_read(struct action *action,\n+\t\t\t\t struct rte_swx_table_entry *entry,\n+\t\t\t\t uint32_t arg_id,\n+\t\t\t\t uint32_t arg_offset,\n+\t\t\t\t char *arg_val)\n+{\n+\tstruct rte_swx_ctl_action_arg_info *arg = &action->args[arg_id];\n+\tint status;\n+\n+\tstatus = hex_string_parse(arg_val, &entry->action_data[arg_offset], arg->n_bits / 8);\n+\tif (status)\n+\t\treturn -EINVAL;\n+\n+\treturn 0;\n+}\n+\n static int\n token_is_comment(const char *token)\n {\n@@ -2778,62 +3042,35 @@ rte_swx_ctl_pipeline_table_entry_read(struct rte_swx_ctl_pipeline *ctl,\n \tfor (i = 0; i < table->info.n_match_fields; i++) {\n \t\tstruct rte_swx_ctl_table_match_field_info *mf = &table->mf[i];\n \t\tchar *mf_val = tokens[1 + i], *mf_mask = NULL;\n-\t\tuint64_t val, mask = UINT64_MAX;\n-\t\tuint32_t offset = (mf->offset - table->mf_first->offset) / 8;\n+\t\tint status;\n \n-\t\t/*\n-\t\t * Mask.\n-\t\t */\n \t\tmf_mask = strchr(mf_val, '/');\n \t\tif (mf_mask) {\n \t\t\t*mf_mask = 0;\n \t\t\tmf_mask++;\n-\n-\t\t\t/* Parse. */\n-\t\t\tmask = strtoull(mf_mask, &mf_mask, 0);\n-\t\t\tif (mf_mask[0])\n-\t\t\t\tgoto error;\n-\n-\t\t\t/* LPM. */\n-\t\t\tif (mf->match_type == RTE_SWX_TABLE_MATCH_LPM) {\n-\t\t\t\tint status;\n-\n-\t\t\t\tlpm = 1;\n-\n-\t\t\t\tlpm_prefix_length_max = mf->n_bits;\n-\n-\t\t\t\tstatus = mask_to_prefix(mask, mf->n_bits, &lpm_prefix_length);\n-\t\t\t\tif (status)\n-\t\t\t\t\tgoto error;\n-\t\t\t}\n-\n-\t\t\t/* Endianness conversion. */\n-\t\t\tif (mf->is_header)\n-\t\t\t\tmask = field_hton(mask, mf->n_bits);\n \t\t}\n \n-\t\t/* Copy to entry. */\n-\t\tif (entry->key_mask)\n-\t\t\tmemcpy(&entry->key_mask[offset],\n-\t\t\t (uint8_t *)&mask,\n-\t\t\t mf->n_bits / 8);\n-\n-\t\t/*\n-\t\t * Value.\n-\t\t */\n-\t\t/* Parse. */\n-\t\tval = strtoull(mf_val, &mf_val, 0);\n-\t\tif (mf_val[0])\n+\t\tif (mf->n_bits <= 64)\n+\t\t\tstatus = table_entry_match_field_read(table,\n+\t\t\t\t\t\t\t entry,\n+\t\t\t\t\t\t\t i,\n+\t\t\t\t\t\t\t mf_val,\n+\t\t\t\t\t\t\t mf_mask,\n+\t\t\t\t\t\t\t &lpm,\n+\t\t\t\t\t\t\t &lpm_prefix_length_max,\n+\t\t\t\t\t\t\t &lpm_prefix_length);\n+\t\telse\n+\t\t\tstatus = table_entry_large_match_field_read(table,\n+\t\t\t\t\t\t\t\t entry,\n+\t\t\t\t\t\t\t\t i,\n+\t\t\t\t\t\t\t\t mf_val,\n+\t\t\t\t\t\t\t\t mf_mask,\n+\t\t\t\t\t\t\t\t &lpm,\n+\t\t\t\t\t\t\t\t &lpm_prefix_length_max,\n+\t\t\t\t\t\t\t\t &lpm_prefix_length);\n+\t\tif (status)\n \t\t\tgoto error;\n \n-\t\t/* Endianness conversion. */\n-\t\tif (mf->is_header)\n-\t\t\tval = field_hton(val, mf->n_bits);\n-\n-\t\t/* Copy to entry. */\n-\t\tmemcpy(&entry->key[offset],\n-\t\t (uint8_t *)&val,\n-\t\t mf->n_bits / 8);\n \t}\n \n \ttokens += 1 + table->info.n_match_fields;\n@@ -2889,7 +3126,7 @@ rte_swx_ctl_pipeline_table_entry_read(struct rte_swx_ctl_pipeline *ctl,\n \tfor (i = 0; i < action->info.n_args; i++) {\n \t\tstruct rte_swx_ctl_action_arg_info *arg = &action->args[i];\n \t\tchar *arg_name, *arg_val;\n-\t\tuint64_t val;\n+\t\tint status;\n \n \t\targ_name = tokens[2 + i * 2];\n \t\targ_val = tokens[2 + i * 2 + 1];\n@@ -2897,19 +3134,21 @@ rte_swx_ctl_pipeline_table_entry_read(struct rte_swx_ctl_pipeline *ctl,\n \t\tif (strcmp(arg_name, arg->name))\n \t\t\tgoto error;\n \n-\t\tval = strtoull(arg_val, &arg_val, 0);\n-\t\tif (arg_val[0])\n+\t\tif (arg->n_bits <= 64)\n+\t\t\tstatus = table_entry_action_argument_read(action,\n+\t\t\t\t\t\t\t\t entry,\n+\t\t\t\t\t\t\t\t i,\n+\t\t\t\t\t\t\t\t arg_offset,\n+\t\t\t\t\t\t\t\t arg_val);\n+\t\telse\n+\t\t\tstatus = table_entry_large_action_argument_read(action,\n+\t\t\t\t\t\t\t\t\tentry,\n+\t\t\t\t\t\t\t\t\ti,\n+\t\t\t\t\t\t\t\t\targ_offset,\n+\t\t\t\t\t\t\t\t\targ_val);\n+\t\tif (status)\n \t\t\tgoto error;\n \n-\t\t/* Endianness conversion. */\n-\t\tif (arg->is_network_byte_order)\n-\t\t\tval = field_hton(val, arg->n_bits);\n-\n-\t\t/* Copy to entry. */\n-\t\tmemcpy(&entry->action_data[arg_offset],\n-\t\t (uint8_t *)&val,\n-\t\t arg->n_bits / 8);\n-\n \t\targ_offset += arg->n_bits / 8;\n \t}\n \n", "prefixes": [ "2/4" ] }