Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/18369/?format=api
http://patches.dpdk.org/api/patches/18369/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/165156b37461936923ce5d62a13d3ba27d0f6d8c.1482331076.git.adrien.mazarguil@6wind.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": "<165156b37461936923ce5d62a13d3ba27d0f6d8c.1482331076.git.adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/165156b37461936923ce5d62a13d3ba27d0f6d8c.1482331076.git.adrien.mazarguil@6wind.com", "date": "2016-12-21T14:51:30", "name": "[dpdk-dev,v5,14/26] app/testpmd: add rte_flow item spec handler", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "998b94c09a32a5b7492e468145c7a73d68538b25", "submitter": { "id": 165, "url": "http://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.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/165156b37461936923ce5d62a13d3ba27d0f6d8c.1482331076.git.adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/18369/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/18369/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 94A7310CA7;\n\tWed, 21 Dec 2016 15:52:51 +0100 (CET)", "from mail-wj0-f177.google.com (mail-wj0-f177.google.com\n\t[209.85.210.177]) by dpdk.org (Postfix) with ESMTP id 5A5D110C47\n\tfor <dev@dpdk.org>; Wed, 21 Dec 2016 15:52:31 +0100 (CET)", "by mail-wj0-f177.google.com with SMTP id v7so204900825wjy.2\n\tfor <dev@dpdk.org>; Wed, 21 Dec 2016 06:52:31 -0800 (PST)", "from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\tb15sm27513125wma.5.2016.12.21.06.52.29\n\tfor <dev@dpdk.org> (version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 21 Dec 2016 06:52:29 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:subject:date:message-id:in-reply-to:references;\n\tbh=ZrIHAROvNL45dYTAyLBQfsLgpSVKoKOwkpDizlHDt68=;\n\tb=pmQlCCPJJwQLBL0lQ7AUTP9CjQsaPCIn3TxqUQp3y/99CjbRNslV0tN+6Y8Uq9dJUJ\n\tpzbHha4Rekoce4LErjLz2vwKw913iOEXrGPPnQJa6DGu1PeApiGOwzmWzeLtzAbp8HPc\n\tbCouNbuz8lzM7dFV6UOoUWnNgFZKtsojiFuJXURHeBK4fw1l0VhJQzATmENvjU2ZhI8V\n\tGlgQxFZlDQmIvHrblNKSfeIsrI++Ym7NOpslU6uRxg7YGlLG2h9Wjt+TCyW8a+j99xSs\n\tVON35hEJhMZ+3DcKxaO1dOHd6fCXyXtx/cX4upfGWtywSCz/yEZxZdsOBOB/aI4Geexw\n\td1ZQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=ZrIHAROvNL45dYTAyLBQfsLgpSVKoKOwkpDizlHDt68=;\n\tb=ACmH4O1MRlE8cZw5mFB3TLZZB0OggdTqan3Q/aUdMJZ5wVu1uTBVjdW16suphrgOsp\n\tDuDybVTamHULEne7sYFHuG8eJZnzyarfPA7j/xgLE4L+ytHfp239Y6m55oQK7u+EZw8t\n\tCRA5sUk5kxSAvNC5q9mrSR47XEUDWz7EEv/+/b2iZ8+BPLvPHQU0XEwCsrR+VoqXs3GU\n\tjeSCQo8g641cJNgJ+2qJ3hcRJwbNWWbKzw6WTCFYfac8fDsKRT+Vddeep/GYCvai0WO8\n\tO1VubMlaKnqds4l02ZrFAJwjiYYMu6GE4d8/7r9I20S+1EZkWI4fT10+fDWsJU72SCCQ\n\tk/TA==", "X-Gm-Message-State": "AIkVDXIZh4dnVZVmiAF22xBOAeHfkHQz4/mBlySru9jWGofB12KttOmT8/e8aWkfQKeVSRjN", "X-Received": "by 10.194.145.197 with SMTP id sw5mr4748231wjb.156.1482331950554;\n\tWed, 21 Dec 2016 06:52:30 -0800 (PST)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Wed, 21 Dec 2016 15:51:30 +0100", "Message-Id": "<165156b37461936923ce5d62a13d3ba27d0f6d8c.1482331076.git.adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<cover.1482331076.git.adrien.mazarguil@6wind.com>", "References": "<cover.1482257521.git.adrien.mazarguil@6wind.com>\n\t<cover.1482331076.git.adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH v5 14/26] app/testpmd: add rte_flow item spec\n\thandler", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <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": "Add parser code to fully set individual fields of pattern item\nspecification structures, using the following operators:\n\n- fix: sets field and applies full bit-mask for perfect matching.\n- spec: sets field without modifying its bit-mask.\n- last: sets upper value of the spec => last range.\n- mask: sets bit-mask affecting both spec and last from arbitrary value.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\nAcked-by: Olga Shern <olgas@mellanox.com>\n---\n app/test-pmd/cmdline_flow.c | 111 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 111 insertions(+)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex fb9489d..7bc1aa7 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -89,6 +89,10 @@ enum index {\n \n \t/* Validate/create pattern. */\n \tPATTERN,\n+\tITEM_PARAM_IS,\n+\tITEM_PARAM_SPEC,\n+\tITEM_PARAM_LAST,\n+\tITEM_PARAM_MASK,\n \tITEM_NEXT,\n \tITEM_END,\n \tITEM_VOID,\n@@ -121,6 +125,7 @@ struct context {\n \tuint16_t port; /**< Current port ID (for completions). */\n \tuint32_t objdata; /**< Object-specific data. */\n \tvoid *object; /**< Address of current object for relative offsets. */\n+\tvoid *objmask; /**< Object a full mask must be written to. */\n };\n \n /** Token argument. */\n@@ -267,6 +272,15 @@ static const enum index next_list_attr[] = {\n \tZERO,\n };\n \n+__rte_unused\n+static const enum index item_param[] = {\n+\tITEM_PARAM_IS,\n+\tITEM_PARAM_SPEC,\n+\tITEM_PARAM_LAST,\n+\tITEM_PARAM_MASK,\n+\tZERO,\n+};\n+\n static const enum index next_item[] = {\n \tITEM_END,\n \tITEM_VOID,\n@@ -287,6 +301,8 @@ static int parse_init(struct context *, const struct token *,\n static int parse_vc(struct context *, const struct token *,\n \t\t const char *, unsigned int,\n \t\t void *, unsigned int);\n+static int parse_vc_spec(struct context *, const struct token *,\n+\t\t\t const char *, unsigned int, void *, unsigned int);\n static int parse_destroy(struct context *, const struct token *,\n \t\t\t const char *, unsigned int,\n \t\t\t void *, unsigned int);\n@@ -492,6 +508,26 @@ static const struct token token_list[] = {\n \t\t.next = NEXT(next_item),\n \t\t.call = parse_vc,\n \t},\n+\t[ITEM_PARAM_IS] = {\n+\t\t.name = \"is\",\n+\t\t.help = \"match value perfectly (with full bit-mask)\",\n+\t\t.call = parse_vc_spec,\n+\t},\n+\t[ITEM_PARAM_SPEC] = {\n+\t\t.name = \"spec\",\n+\t\t.help = \"match value according to configured bit-mask\",\n+\t\t.call = parse_vc_spec,\n+\t},\n+\t[ITEM_PARAM_LAST] = {\n+\t\t.name = \"last\",\n+\t\t.help = \"specify upper bound to establish a range\",\n+\t\t.call = parse_vc_spec,\n+\t},\n+\t[ITEM_PARAM_MASK] = {\n+\t\t.name = \"mask\",\n+\t\t.help = \"specify bit-mask with relevant bits set to one\",\n+\t\t.call = parse_vc_spec,\n+\t},\n \t[ITEM_NEXT] = {\n \t\t.name = \"/\",\n \t\t.help = \"specify next pattern item\",\n@@ -605,6 +641,7 @@ parse_init(struct context *ctx, const struct token *token,\n \tmemset((uint8_t *)out + sizeof(*out), 0x22, size - sizeof(*out));\n \tctx->objdata = 0;\n \tctx->object = out;\n+\tctx->objmask = NULL;\n \treturn len;\n }\n \n@@ -632,11 +669,13 @@ parse_vc(struct context *ctx, const struct token *token,\n \t\tout->command = ctx->curr;\n \t\tctx->objdata = 0;\n \t\tctx->object = out;\n+\t\tctx->objmask = NULL;\n \t\tout->args.vc.data = (uint8_t *)out + size;\n \t\treturn len;\n \t}\n \tctx->objdata = 0;\n \tctx->object = &out->args.vc.attr;\n+\tctx->objmask = NULL;\n \tswitch (ctx->curr) {\n \tcase GROUP:\n \tcase PRIORITY:\n@@ -652,6 +691,7 @@ parse_vc(struct context *ctx, const struct token *token,\n \t\t\t(void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),\n \t\t\t\t\t sizeof(double));\n \t\tctx->object = out->args.vc.pattern;\n+\t\tctx->objmask = NULL;\n \t\treturn len;\n \tcase ACTIONS:\n \t\tout->args.vc.actions =\n@@ -660,6 +700,7 @@ parse_vc(struct context *ctx, const struct token *token,\n \t\t\t\t\t\tout->args.vc.pattern_n),\n \t\t\t\t\t sizeof(double));\n \t\tctx->object = out->args.vc.actions;\n+\t\tctx->objmask = NULL;\n \t\treturn len;\n \tdefault:\n \t\tif (!token->priv)\n@@ -682,6 +723,7 @@ parse_vc(struct context *ctx, const struct token *token,\n \t\t};\n \t\t++out->args.vc.pattern_n;\n \t\tctx->object = item;\n+\t\tctx->objmask = NULL;\n \t} else {\n \t\tconst struct parse_action_priv *priv = token->priv;\n \t\tstruct rte_flow_action *action =\n@@ -698,6 +740,7 @@ parse_vc(struct context *ctx, const struct token *token,\n \t\t};\n \t\t++out->args.vc.actions_n;\n \t\tctx->object = action;\n+\t\tctx->objmask = NULL;\n \t}\n \tmemset(data, 0, data_size);\n \tout->args.vc.data = data;\n@@ -705,6 +748,60 @@ parse_vc(struct context *ctx, const struct token *token,\n \treturn len;\n }\n \n+/** Parse pattern item parameter type. */\n+static int\n+parse_vc_spec(struct context *ctx, const struct token *token,\n+\t const char *str, unsigned int len,\n+\t void *buf, unsigned int size)\n+{\n+\tstruct buffer *out = buf;\n+\tstruct rte_flow_item *item;\n+\tuint32_t data_size;\n+\tint index;\n+\tint objmask = 0;\n+\n+\t(void)size;\n+\t/* Token name must match. */\n+\tif (parse_default(ctx, token, str, len, NULL, 0) < 0)\n+\t\treturn -1;\n+\t/* Parse parameter types. */\n+\tswitch (ctx->curr) {\n+\tcase ITEM_PARAM_IS:\n+\t\tindex = 0;\n+\t\tobjmask = 1;\n+\t\tbreak;\n+\tcase ITEM_PARAM_SPEC:\n+\t\tindex = 0;\n+\t\tbreak;\n+\tcase ITEM_PARAM_LAST:\n+\t\tindex = 1;\n+\t\tbreak;\n+\tcase ITEM_PARAM_MASK:\n+\t\tindex = 2;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -1;\n+\t}\n+\t/* Nothing else to do if there is no buffer. */\n+\tif (!out)\n+\t\treturn len;\n+\tif (!out->args.vc.pattern_n)\n+\t\treturn -1;\n+\titem = &out->args.vc.pattern[out->args.vc.pattern_n - 1];\n+\tdata_size = ctx->objdata / 3; /* spec, last, mask */\n+\t/* Point to selected object. */\n+\tctx->object = out->args.vc.data + (data_size * index);\n+\tif (objmask) {\n+\t\tctx->objmask = out->args.vc.data + (data_size * 2); /* mask */\n+\t\titem->mask = ctx->objmask;\n+\t} else\n+\t\tctx->objmask = NULL;\n+\t/* Update relevant item pointer. */\n+\t*((const void **[]){ &item->spec, &item->last, &item->mask })[index] =\n+\t\tctx->object;\n+\treturn len;\n+}\n+\n /** Parse tokens for destroy command. */\n static int\n parse_destroy(struct context *ctx, const struct token *token,\n@@ -727,6 +824,7 @@ parse_destroy(struct context *ctx, const struct token *token,\n \t\tout->command = ctx->curr;\n \t\tctx->objdata = 0;\n \t\tctx->object = out;\n+\t\tctx->objmask = NULL;\n \t\tout->args.destroy.rule =\n \t\t\t(void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),\n \t\t\t\t\t sizeof(double));\n@@ -737,6 +835,7 @@ parse_destroy(struct context *ctx, const struct token *token,\n \t\treturn -1;\n \tctx->objdata = 0;\n \tctx->object = out->args.destroy.rule + out->args.destroy.rule_n++;\n+\tctx->objmask = NULL;\n \treturn len;\n }\n \n@@ -762,6 +861,7 @@ parse_flush(struct context *ctx, const struct token *token,\n \t\tout->command = ctx->curr;\n \t\tctx->objdata = 0;\n \t\tctx->object = out;\n+\t\tctx->objmask = NULL;\n \t}\n \treturn len;\n }\n@@ -788,6 +888,7 @@ parse_query(struct context *ctx, const struct token *token,\n \t\tout->command = ctx->curr;\n \t\tctx->objdata = 0;\n \t\tctx->object = out;\n+\t\tctx->objmask = NULL;\n \t}\n \treturn len;\n }\n@@ -849,6 +950,7 @@ parse_list(struct context *ctx, const struct token *token,\n \t\tout->command = ctx->curr;\n \t\tctx->objdata = 0;\n \t\tctx->object = out;\n+\t\tctx->objmask = NULL;\n \t\tout->args.list.group =\n \t\t\t(void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),\n \t\t\t\t\t sizeof(double));\n@@ -859,6 +961,7 @@ parse_list(struct context *ctx, const struct token *token,\n \t\treturn -1;\n \tctx->objdata = 0;\n \tctx->object = out->args.list.group + out->args.list.group_n++;\n+\tctx->objmask = NULL;\n \treturn len;\n }\n \n@@ -891,6 +994,7 @@ parse_int(struct context *ctx, const struct token *token,\n \t\treturn len;\n \tbuf = (uint8_t *)ctx->object + arg->offset;\n \tsize = arg->size;\n+objmask:\n \tswitch (size) {\n \tcase sizeof(uint8_t):\n \t\t*(uint8_t *)buf = u;\n@@ -907,6 +1011,11 @@ parse_int(struct context *ctx, const struct token *token,\n \tdefault:\n \t\tgoto error;\n \t}\n+\tif (ctx->objmask && buf != (uint8_t *)ctx->objmask + arg->offset) {\n+\t\tu = -1;\n+\t\tbuf = (uint8_t *)ctx->objmask + arg->offset;\n+\t\tgoto objmask;\n+\t}\n \treturn len;\n error:\n \tpush_args(ctx, arg);\n@@ -927,6 +1036,7 @@ parse_port(struct context *ctx, const struct token *token,\n \telse {\n \t\tctx->objdata = 0;\n \t\tctx->object = out;\n+\t\tctx->objmask = NULL;\n \t\tsize = sizeof(*out);\n \t}\n \tret = parse_int(ctx, token, str, len, out, size);\n@@ -1033,6 +1143,7 @@ cmd_flow_context_init(struct context *ctx)\n \tctx->port = 0;\n \tctx->objdata = 0;\n \tctx->object = NULL;\n+\tctx->objmask = NULL;\n }\n \n /** Parse a token (cmdline API). */\n", "prefixes": [ "dpdk-dev", "v5", "14/26" ] }{ "id": 18369, "url": "