Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17035/?format=api
https://patches.dpdk.org/api/patches/17035/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/12249d4ce53dbb4e9a967fff6d75be165d0c34e4.1479309720.git.adrien.mazarguil@6wind.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": "<12249d4ce53dbb4e9a967fff6d75be165d0c34e4.1479309720.git.adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/12249d4ce53dbb4e9a967fff6d75be165d0c34e4.1479309720.git.adrien.mazarguil@6wind.com", "date": "2016-11-16T16:23:37", "name": "[dpdk-dev,11/22] app/testpmd: add flow query command", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a57c171644713a4f2586e0f013dda0affc7e92d9", "submitter": { "id": 165, "url": "https://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/12249d4ce53dbb4e9a967fff6d75be165d0c34e4.1479309720.git.adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17035/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/17035/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 6A3D4D4A2;\n\tWed, 16 Nov 2016 17:25:25 +0100 (CET)", "from mail-wm0-f47.google.com (mail-wm0-f47.google.com\n\t[74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 0A2CC5684\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 17:24:32 +0100 (CET)", "by mail-wm0-f47.google.com with SMTP id t79so83424941wmt.0\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 08:24:32 -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\t191sm7855573wmr.11.2016.11.16.08.24.29\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 16 Nov 2016 08:24:31 -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:cc:subject:date:message-id:in-reply-to:references;\n\tbh=6w9dpyDM3UxcCTVcZPidX/Ft1wNAUOkiwVfw8479eK4=;\n\tb=m8YcG0L2hzcVVsgYWvvGqTIixVuwyKEoIFJPZ5Kze1smPH+bX8xzn7JFLYU+7Udr9g\n\trm5Wm3A0P0kFxtlvoCB275VodJgRR6DtuHJWr4QTa8SStdhwpuXOsZEKI7LaRAMdQx+n\n\t6BRUMZyIf34asjsxd3/6I6vGmWmuM5gsSClTVeFHKXSedhlLj5g1yRzIlyX6c30BfFhK\n\t3Otrwr4hzPHkUVlJQQ7bAS0iba/Fci9JQI2NLVEcDfxE89GWOdF5aejV3c6hAnZd14HV\n\tLvJlNVMaWGFaLBsgCxfdUI/u8xgIyJNCq5rt0ABwGXjSdCwX072J3hGh+20Ugs3Zmwv0\n\tWcIg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=6w9dpyDM3UxcCTVcZPidX/Ft1wNAUOkiwVfw8479eK4=;\n\tb=kSFv0ImTmXpVzUT8gQ6g4Jc+vLkPo9xTyFpOND76Tw8Dg+T0U+y75OVxGOKQIlovU2\n\tNModw2h+15gBjfnzJqShpzj2J1JAMNdGLPTQYi4FQ/LVGnlrVo4LvtVywxV2hla0FhRX\n\tt9OQNvG2MLGZ3ceHdADhsWufJ14KvRG5GiceP9dgTq21045yDcuzJGSqxEvFO4sZeQok\n\tLnApHMNd86b8joTzrHgHMj0LId9saojbP0x9gAeq11JupTpYq0kfrVJq0jDW6Aa/NgYx\n\tOEVeUoE95VRP06CYueBGwYJhvuWa6MkfPTbjMl0tOeEq1TqaJAlIPSUb+n+Hg09RGtNn\n\tTWIg==", "X-Gm-Message-State": "ABUngveGV8F29Yjhg4cU3SQ4iG6eAjQsVgFUhy3s4qS2KGOrz8xQ+ApUzcaGUxn+NL5luKbp", "X-Received": "by 10.28.167.139 with SMTP id q133mr12037940wme.15.1479313472573;\n\tWed, 16 Nov 2016 08:24:32 -0800 (PST)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Cc": "Thomas Monjalon <thomas.monjalon@6wind.com>,\n\tPablo de Lara <pablo.de.lara.guarch@intel.com>,\n\tOlivier Matz <olivier.matz@6wind.com>", "Date": "Wed, 16 Nov 2016 17:23:37 +0100", "Message-Id": "<12249d4ce53dbb4e9a967fff6d75be165d0c34e4.1479309720.git.adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<cover.1479309719.git.adrien.mazarguil@6wind.com>", "References": "<cover.1471632644.git.adrien.mazarguil@6wind.com>\n\t<cover.1479309719.git.adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH 11/22] app/testpmd: add flow query command", "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": "Syntax:\n\n flow query {port_id} {rule_id} {action}\n\nQuery a specific action of an existing flow rule.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n app/test-pmd/cmdline.c | 3 +\n app/test-pmd/cmdline_flow.c | 121 ++++++++++++++++++++++++++++++++++++++-\n 2 files changed, 123 insertions(+), 1 deletion(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 851cc16..edd1ee3 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -831,6 +831,9 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\"flow flush {port_id}\\n\"\n \t\t\t\" Destroy all flow rules.\\n\\n\"\n \n+\t\t\t\"flow query {port_id} {rule_id} {action}\\n\"\n+\t\t\t\" Query an existing flow rule.\\n\\n\"\n+\n \t\t\t\"flow list {port_id} [group {group_id}] [...]\\n\"\n \t\t\t\" List existing flow rules sorted by priority,\"\n \t\t\t\" filtered by group identifiers.\\n\\n\"\ndiff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 1874849..e70e8e2 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -69,11 +69,15 @@ enum index {\n \tCREATE,\n \tDESTROY,\n \tFLUSH,\n+\tQUERY,\n \tLIST,\n \n \t/* Destroy arguments. */\n \tDESTROY_RULE,\n \n+\t/* Query arguments. */\n+\tQUERY_ACTION,\n+\n \t/* List arguments. */\n \tLIST_GROUP,\n \n@@ -208,6 +212,10 @@ struct buffer {\n \t\t\tuint32_t rule_n;\n \t\t} destroy; /**< Destroy arguments. */\n \t\tstruct {\n+\t\t\tuint32_t rule;\n+\t\t\tenum rte_flow_action_type action;\n+\t\t} query; /**< Query arguments. */\n+\t\tstruct {\n \t\t\tuint32_t *group;\n \t\t\tuint32_t group_n;\n \t\t} list; /**< List arguments. */\n@@ -285,6 +293,12 @@ static int parse_destroy(struct context *, const struct token *,\n static int parse_flush(struct context *, const struct token *,\n \t\t const char *, unsigned int,\n \t\t void *, unsigned int);\n+static int parse_query(struct context *, const struct token *,\n+\t\t const char *, unsigned int,\n+\t\t void *, unsigned int);\n+static int parse_action(struct context *, const struct token *,\n+\t\t\tconst char *, unsigned int,\n+\t\t\tvoid *, unsigned int);\n static int parse_list(struct context *, const struct token *,\n \t\t const char *, unsigned int,\n \t\t void *, unsigned int);\n@@ -296,6 +310,8 @@ static int parse_port(struct context *, const struct token *,\n \t\t void *, unsigned int);\n static int comp_none(struct context *, const struct token *,\n \t\t unsigned int, char *, unsigned int);\n+static int comp_action(struct context *, const struct token *,\n+\t\t unsigned int, char *, unsigned int);\n static int comp_port(struct context *, const struct token *,\n \t\t unsigned int, char *, unsigned int);\n static int comp_rule_id(struct context *, const struct token *,\n@@ -367,7 +383,8 @@ static const struct token token_list[] = {\n \t\t\t CREATE,\n \t\t\t DESTROY,\n \t\t\t FLUSH,\n-\t\t\t LIST)),\n+\t\t\t LIST,\n+\t\t\t QUERY)),\n \t\t.call = parse_init,\n \t},\n \t/* Sub-level commands. */\n@@ -399,6 +416,17 @@ static const struct token token_list[] = {\n \t\t.args = ARGS(ARGS_ENTRY(struct buffer, port)),\n \t\t.call = parse_flush,\n \t},\n+\t[QUERY] = {\n+\t\t.name = \"query\",\n+\t\t.help = \"query an existing flow rule\",\n+\t\t.next = NEXT(NEXT_ENTRY(QUERY_ACTION),\n+\t\t\t NEXT_ENTRY(RULE_ID),\n+\t\t\t NEXT_ENTRY(PORT_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, args.query.action),\n+\t\t\t ARGS_ENTRY(struct buffer, args.query.rule),\n+\t\t\t ARGS_ENTRY(struct buffer, port)),\n+\t\t.call = parse_query,\n+\t},\n \t[LIST] = {\n \t\t.name = \"list\",\n \t\t.help = \"list existing flow rules\",\n@@ -414,6 +442,14 @@ static const struct token token_list[] = {\n \t\t.args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.destroy.rule)),\n \t\t.call = parse_destroy,\n \t},\n+\t/* Query arguments. */\n+\t[QUERY_ACTION] = {\n+\t\t.name = \"{action}\",\n+\t\t.type = \"ACTION\",\n+\t\t.help = \"action to query, must be part of the rule\",\n+\t\t.call = parse_action,\n+\t\t.comp = comp_action,\n+\t},\n \t/* List arguments. */\n \t[LIST_GROUP] = {\n \t\t.name = \"group\",\n@@ -730,6 +766,67 @@ parse_flush(struct context *ctx, const struct token *token,\n \treturn len;\n }\n \n+/** Parse tokens for query command. */\n+static int\n+parse_query(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+\n+\t/* Token name must match. */\n+\tif (parse_default(ctx, token, str, len, NULL, 0) < 0)\n+\t\treturn -1;\n+\t/* Nothing else to do if there is no buffer. */\n+\tif (!out)\n+\t\treturn len;\n+\tif (!out->command) {\n+\t\tif (ctx->curr != QUERY)\n+\t\t\treturn -1;\n+\t\tif (sizeof(*out) > size)\n+\t\t\treturn -1;\n+\t\tout->command = ctx->curr;\n+\t\tctx->objdata = 0;\n+\t\tctx->object = out;\n+\t}\n+\treturn len;\n+}\n+\n+/** Parse action names. */\n+static int\n+parse_action(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+\tconst struct arg *arg = pop_args(ctx);\n+\tunsigned int i;\n+\n+\t(void)size;\n+\t/* Argument is expected. */\n+\tif (!arg)\n+\t\treturn -1;\n+\t/* Parse action name. */\n+\tfor (i = 0; next_action[i]; ++i) {\n+\t\tconst struct parse_action_priv *priv;\n+\n+\t\ttoken = &token_list[next_action[i]];\n+\t\tif (strncmp(token->name, str, len))\n+\t\t\tcontinue;\n+\t\tpriv = token->priv;\n+\t\tif (!priv)\n+\t\t\tgoto error;\n+\t\tif (out)\n+\t\t\tmemcpy((uint8_t *)ctx->object + arg->offset,\n+\t\t\t &priv->type,\n+\t\t\t arg->size);\n+\t\treturn len;\n+\t}\n+error:\n+\tpush_args(ctx, arg);\n+\treturn -1;\n+}\n+\n /** Parse tokens for list command. */\n static int\n parse_list(struct context *ctx, const struct token *token,\n@@ -853,6 +950,24 @@ comp_none(struct context *ctx, const struct token *token,\n \treturn 0;\n }\n \n+/** Complete action names. */\n+static int\n+comp_action(struct context *ctx, const struct token *token,\n+\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\tunsigned int i;\n+\n+\t(void)ctx;\n+\t(void)token;\n+\tfor (i = 0; next_action[i]; ++i)\n+\t\tif (buf && i == ent)\n+\t\t\treturn snprintf(buf, size, \"%s\",\n+\t\t\t\t\ttoken_list[next_action[i]].name);\n+\tif (buf)\n+\t\treturn -1;\n+\treturn i;\n+}\n+\n /** Complete available ports. */\n static int\n comp_port(struct context *ctx, const struct token *token,\n@@ -1155,6 +1270,10 @@ cmd_flow_parsed(const struct buffer *in)\n \tcase FLUSH:\n \t\tport_flow_flush(in->port);\n \t\tbreak;\n+\tcase QUERY:\n+\t\tport_flow_query(in->port, in->args.query.rule,\n+\t\t\t\tin->args.query.action);\n+\t\tbreak;\n \tcase LIST:\n \t\tport_flow_list(in->port, in->args.list.group_n,\n \t\t\t in->args.list.group);\n", "prefixes": [ "dpdk-dev", "11/22" ] }{ "id": 17035, "url": "