Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/5281/?format=api
{ "id": 5281, "url": "http://patches.dpdk.org/api/patches/5281/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1433760090-17110-4-git-send-email-konstantin.ananyev@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": "<1433760090-17110-4-git-send-email-konstantin.ananyev@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1433760090-17110-4-git-send-email-konstantin.ananyev@intel.com", "date": "2015-06-08T10:41:25", "name": "[dpdk-dev,PATCHv2,3/8] acl: add function to check build input parameters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7f6c7663149e1a9cf7125eca918a2caf07994556", "submitter": { "id": 33, "url": "http://patches.dpdk.org/api/people/33/?format=api", "name": "Ananyev, Konstantin", "email": "konstantin.ananyev@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1433760090-17110-4-git-send-email-konstantin.ananyev@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/5281/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/5281/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 781932716;\n\tMon, 8 Jun 2015 12:43:55 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 11DF6DE0\n\tfor <dev@dpdk.org>; Mon, 8 Jun 2015 12:43:52 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga103.fm.intel.com with ESMTP; 08 Jun 2015 03:41:38 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga002.fm.intel.com with ESMTP; 08 Jun 2015 03:41:39 -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\tt58AfbW7029633; Mon, 8 Jun 2015 11:41:37 +0100", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id t58AfbpL017565;\n\tMon, 8 Jun 2015 11:41:37 +0100", "(from kananye1@localhost)\n\tby sivswdev02.ir.intel.com with id t58AfbB3017561;\n\tMon, 8 Jun 2015 11:41:37 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,573,1427785200\"; d=\"scan'208\";a=\"739316881\"", "From": "Konstantin Ananyev <konstantin.ananyev@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 8 Jun 2015 11:41:25 +0100", "Message-Id": "<1433760090-17110-4-git-send-email-konstantin.ananyev@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1433760090-17110-1-git-send-email-konstantin.ananyev@intel.com>", "References": "<1433373024-5558-2-git-send-email-konstantin.ananyev@intel.com>\n\t<1433760090-17110-1-git-send-email-konstantin.ananyev@intel.com>", "Subject": "[dpdk-dev] [PATCHv2 3/8] acl: add function to check build input\n\tparameters", "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": "Move check for build confg parameter into a separate function.\nSimplify acl_calc_wildness() function.\n\nSigned-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n lib/librte_acl/acl_bld.c | 107 ++++++++++++++++++++++++-----------------------\n 1 file changed, 54 insertions(+), 53 deletions(-)", "diff": "diff --git a/lib/librte_acl/acl_bld.c b/lib/librte_acl/acl_bld.c\nindex ff3ba8b..45ee065 100644\n--- a/lib/librte_acl/acl_bld.c\n+++ b/lib/librte_acl/acl_bld.c\n@@ -1350,7 +1350,7 @@ build_trie(struct acl_build_context *context, struct rte_acl_build_rule *head,\n \treturn trie;\n }\n \n-static int\n+static void\n acl_calc_wildness(struct rte_acl_build_rule *head,\n \tconst struct rte_acl_config *config)\n {\n@@ -1362,10 +1362,10 @@ acl_calc_wildness(struct rte_acl_build_rule *head,\n \t\tfor (n = 0; n < config->num_fields; n++) {\n \n \t\t\tdouble wild = 0;\n-\t\t\tuint64_t msk_val =\n-\t\t\t\tRTE_LEN2MASK(CHAR_BIT * config->defs[n].size,\n+\t\t\tuint32_t bit_len = CHAR_BIT * config->defs[n].size;\n+\t\t\tuint64_t msk_val = RTE_LEN2MASK(bit_len,\n \t\t\t\ttypeof(msk_val));\n-\t\t\tdouble size = CHAR_BIT * config->defs[n].size;\n+\t\t\tdouble size = bit_len;\n \t\t\tint field_index = config->defs[n].field_index;\n \t\t\tconst struct rte_acl_field *fld = rule->f->field +\n \t\t\t\tfield_index;\n@@ -1382,54 +1382,15 @@ acl_calc_wildness(struct rte_acl_build_rule *head,\n \t\t\t\tbreak;\n \n \t\t\tcase RTE_ACL_FIELD_TYPE_RANGE:\n-\t\t\t\tswitch (rule->config->defs[n].size) {\n-\t\t\t\tcase sizeof(uint8_t):\n-\t\t\t\t\twild = ((double)fld->mask_range.u8 -\n-\t\t\t\t\t\tfld->value.u8) / UINT8_MAX;\n-\t\t\t\t\tbreak;\n-\t\t\t\tcase sizeof(uint16_t):\n-\t\t\t\t\twild = ((double)fld->mask_range.u16 -\n-\t\t\t\t\t\tfld->value.u16) / UINT16_MAX;\n-\t\t\t\t\tbreak;\n-\t\t\t\tcase sizeof(uint32_t):\n-\t\t\t\t\twild = ((double)fld->mask_range.u32 -\n-\t\t\t\t\t\tfld->value.u32) / UINT32_MAX;\n-\t\t\t\t\tbreak;\n-\t\t\t\tcase sizeof(uint64_t):\n-\t\t\t\t\twild = ((double)fld->mask_range.u64 -\n-\t\t\t\t\t\tfld->value.u64) / UINT64_MAX;\n-\t\t\t\t\tbreak;\n-\t\t\t\tdefault:\n-\t\t\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\t\t\t\"%s(rule: %u) invalid %u-th \"\n-\t\t\t\t\t\t\"field, type: %hhu, \"\n-\t\t\t\t\t\t\"unknown size: %hhu\\n\",\n-\t\t\t\t\t\t__func__,\n-\t\t\t\t\t\trule->f->data.userdata,\n-\t\t\t\t\t\tn,\n-\t\t\t\t\t\trule->config->defs[n].type,\n-\t\t\t\t\t\trule->config->defs[n].size);\n-\t\t\t\t\treturn -EINVAL;\n-\t\t\t\t}\n+\t\t\t\twild = (fld->mask_range.u64 & msk_val) -\n+\t\t\t\t\t(fld->value.u64 & msk_val);\n+\t\t\t\twild = wild / msk_val;\n \t\t\t\tbreak;\n-\n-\t\t\tdefault:\n-\t\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\t\t\"%s(rule: %u) invalid %u-th \"\n-\t\t\t\t\t\"field, unknown type: %hhu\\n\",\n-\t\t\t\t\t__func__,\n-\t\t\t\t\trule->f->data.userdata,\n-\t\t\t\t\tn,\n-\t\t\t\t\trule->config->defs[n].type);\n-\t\t\t\t\treturn -EINVAL;\n-\n \t\t\t}\n \n \t\t\trule->wildness[field_index] = (uint32_t)(wild * 100);\n \t\t}\n \t}\n-\n-\treturn 0;\n }\n \n static void\n@@ -1602,7 +1563,6 @@ static int\n acl_build_tries(struct acl_build_context *context,\n \tstruct rte_acl_build_rule *head)\n {\n-\tint32_t rc;\n \tuint32_t n, num_tries;\n \tstruct rte_acl_config *config;\n \tstruct rte_acl_build_rule *last;\n@@ -1621,9 +1581,7 @@ acl_build_tries(struct acl_build_context *context,\n \tcontext->tries[0].type = RTE_ACL_FULL_TRIE;\n \n \t/* calc wildness of each field of each rule */\n-\trc = acl_calc_wildness(head, config);\n-\tif (rc != 0)\n-\t\treturn rc;\n+\tacl_calc_wildness(head, config);\n \n \tfor (n = 0;; n = num_tries) {\n \n@@ -1801,6 +1759,49 @@ acl_bld(struct acl_build_context *bcx, struct rte_acl_ctx *ctx,\n \treturn rc;\n }\n \n+/*\n+ * Check that parameters for acl_build() are valid.\n+ */\n+static int\n+acl_check_bld_param(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg)\n+{\n+\tstatic const size_t field_sizes[] = {\n+\t\tsizeof(uint8_t), sizeof(uint16_t),\n+\t\tsizeof(uint32_t), sizeof(uint64_t),\n+\t};\n+\n+\tuint32_t i, j;\n+\n+\tif (ctx == NULL || cfg == NULL || cfg->num_categories == 0 ||\n+\t\t\tcfg->num_categories > RTE_ACL_MAX_CATEGORIES ||\n+\t\t\tcfg->num_fields == 0 ||\n+\t\t\tcfg->num_fields > RTE_ACL_MAX_FIELDS)\n+\t\treturn -EINVAL;\n+\n+\tfor (i = 0; i != cfg->num_fields; i++) {\n+\t\tif (cfg->defs[i].type > RTE_ACL_FIELD_TYPE_BITMASK) {\n+\t\t\tRTE_LOG(ERR, ACL,\n+\t\t\t\"ACL context: %s, invalid type: %hhu for %u-th field\\n\",\n+\t\t\tctx->name, cfg->defs[i].type, i);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tfor (j = 0;\n+\t\t\t\tj != RTE_DIM(field_sizes) &&\n+\t\t\t\tcfg->defs[i].size != field_sizes[j];\n+\t\t\t\tj++)\n+\t\t\t;\n+\n+\t\tif (j == RTE_DIM(field_sizes)) {\n+\t\t\tRTE_LOG(ERR, ACL,\n+\t\t\t\"ACL context: %s, invalid size: %hhu for %u-th field\\n\",\n+\t\t\tctx->name, cfg->defs[i].size, i);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n int\n rte_acl_build(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg)\n {\n@@ -1809,9 +1810,9 @@ rte_acl_build(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg)\n \tsize_t max_size;\n \tstruct acl_build_context bcx;\n \n-\tif (ctx == NULL || cfg == NULL || cfg->num_categories == 0 ||\n-\t\t\tcfg->num_categories > RTE_ACL_MAX_CATEGORIES)\n-\t\treturn -EINVAL;\n+\trc = acl_check_bld_param(ctx, cfg);\n+\tif (rc != 0)\n+\t\treturn rc;\n \n \tacl_build_reset(ctx);\n \n", "prefixes": [ "dpdk-dev", "PATCHv2", "3/8" ] }