Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17033/?format=api
https://patches.dpdk.org/api/patches/17033/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/d60026ef3c34a67b6e01d4525d6a94f55d423300.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": "<d60026ef3c34a67b6e01d4525d6a94f55d423300.1479309720.git.adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d60026ef3c34a67b6e01d4525d6a94f55d423300.1479309720.git.adrien.mazarguil@6wind.com", "date": "2016-11-16T16:23:35", "name": "[dpdk-dev,09/22] app/testpmd: add flow destroy command", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "eb4e8acbe76a6488398a77303027aee53c356558", "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/d60026ef3c34a67b6e01d4525d6a94f55d423300.1479309720.git.adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17033/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/17033/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 A74486CB9;\n\tWed, 16 Nov 2016 17:25:21 +0100 (CET)", "from mail-wm0-f53.google.com (mail-wm0-f53.google.com\n\t[74.125.82.53]) by dpdk.org (Postfix) with ESMTP id B962A5681\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 17:24:26 +0100 (CET)", "by mail-wm0-f53.google.com with SMTP id a197so249919213wmd.0\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 08:24:26 -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\ta13sm10987253wma.18.2016.11.16.08.24.24\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 16 Nov 2016 08:24:24 -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=gNRUiH/MQe2XS/Ap5TtMJumKOqrC/MEIvOKTMEayRT0=;\n\tb=uqsyDmJG0H6TidjufyzOoze9dT6zdXAXGh67OoeuZwld7mBzm8jsOAahknSUTXhixU\n\t4SKsiONKaTTmvbYYAbifw26z83yC6TUS2NBvSvVQK5jr0fVqRHnq9ymldyhqDYfKIOsb\n\t0XqRikfRQpdlv8iO+UW9V9JNceG9lLfpsmmPZZ0RBNcI3QboO9Ti7SiiL9QPUAfWERox\n\trboqEIwh7MqST+nfTMWPEQdJfADf53v0k17GAGjKwiA1keIoqtBo7rVy9L2VV6MaY7CA\n\t3gYdrkeRDrg6K8J2AfIx1TljUX12aaTh6DFNFieCenSNOzpccG+kiTRxRMRO238Oh1y6\n\tQlHA==", "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=gNRUiH/MQe2XS/Ap5TtMJumKOqrC/MEIvOKTMEayRT0=;\n\tb=C+kUspQCTFS8DF98Uv+Rh3sZMOc6+CMli81ZV+s2MHScZpxPfVKpaUOl1yKIB0FvE8\n\tRH1o6JiXZFhnKd2RZVdz4LWB+cLE1gvoJ6wk2bx86ArxFHUJOBt5886H8K5guL6eagk9\n\tq5122uepL7arsUEU9RqnzGKo+JocEmHUADNVwaunamVKYkLnUgTX/sKmhJAEvneM9+gA\n\t/K26a07WArQfbr/0jHa0bZ6yVM+qUQ9mcovtgLhLQ+i91M4FDQD1dwjXz7jxtW9IFyDJ\n\tSIlZlZ9vp4jXW9Lc0/ItELPGuyiN5exUrfTcBMAOBtbyQmQFOEswzqobVpNBkK8IbrSD\n\t2jdg==", "X-Gm-Message-State": "ABUngvfqoUvCn51LQyMbgbXEftk7286mbBmi1/fzymXIiEzOK9y0HnXxOvmdyiVH0VE/D6j1", "X-Received": "by 10.194.248.233 with SMTP id yp9mr2560161wjc.228.1479313465926;\n\tWed, 16 Nov 2016 08:24:25 -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:35 +0100", "Message-Id": "<d60026ef3c34a67b6e01d4525d6a94f55d423300.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 09/22] app/testpmd: add flow destroy 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 destroy {port_id} rule {rule_id} [...]\n\nDestroy a given set of flow rules associated with a port.\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 | 106 ++++++++++++++++++++++++++++++++++++++-\n 2 files changed, 108 insertions(+), 1 deletion(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 9f124fc..20a64b6 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -811,6 +811,9 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\" (select|add)\\n\"\n \t\t\t\" Set the input set for FDir.\\n\\n\"\n \n+\t\t\t\"flow destroy {port_id} rule {rule_id} [...]\\n\"\n+\t\t\t\" Destroy specific flow rules.\\n\\n\"\n+\n \t\t\t\"flow flush {port_id}\\n\"\n \t\t\t\" Destroy all flow rules.\\n\\n\"\n \ndiff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 414bacc..5a8980c 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -56,6 +56,7 @@ enum index {\n \t/* Common tokens. */\n \tINTEGER,\n \tUNSIGNED,\n+\tRULE_ID,\n \tPORT_ID,\n \tGROUP_ID,\n \n@@ -63,9 +64,13 @@ enum index {\n \tFLOW,\n \n \t/* Sub-level commands. */\n+\tDESTROY,\n \tFLUSH,\n \tLIST,\n \n+\t/* Destroy arguments. */\n+\tDESTROY_RULE,\n+\n \t/* List arguments. */\n \tLIST_GROUP,\n };\n@@ -165,12 +170,22 @@ struct buffer {\n \tuint16_t port; /**< Affected port ID. */\n \tunion {\n \t\tstruct {\n+\t\t\tuint32_t *rule;\n+\t\t\tuint32_t rule_n;\n+\t\t} destroy; /**< Destroy arguments. */\n+\t\tstruct {\n \t\t\tuint32_t *group;\n \t\t\tuint32_t group_n;\n \t\t} list; /**< List arguments. */\n \t} args; /**< Command arguments. */\n };\n \n+static const enum index next_destroy_attr[] = {\n+\tDESTROY_RULE,\n+\tEND,\n+\t0,\n+};\n+\n static const enum index next_list_attr[] = {\n \tLIST_GROUP,\n \tEND,\n@@ -180,6 +195,9 @@ static const enum index next_list_attr[] = {\n static int parse_init(struct context *, const struct token *,\n \t\t const char *, unsigned int,\n \t\t 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 static int parse_flush(struct context *, const struct token *,\n \t\t const char *, unsigned int,\n \t\t void *, unsigned int);\n@@ -196,6 +214,8 @@ static int comp_none(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+\t\t\tunsigned int, char *, unsigned int);\n \n /** Token definitions. */\n static const struct token token_list[] = {\n@@ -225,6 +245,13 @@ static const struct token token_list[] = {\n \t\t.call = parse_int,\n \t\t.comp = comp_none,\n \t},\n+\t[RULE_ID] = {\n+\t\t.name = \"{rule id}\",\n+\t\t.type = \"RULE ID\",\n+\t\t.help = \"rule identifier\",\n+\t\t.call = parse_int,\n+\t\t.comp = comp_rule_id,\n+\t},\n \t[PORT_ID] = {\n \t\t.name = \"{port_id}\",\n \t\t.type = \"PORT ID\",\n@@ -245,11 +272,19 @@ static const struct token token_list[] = {\n \t\t.type = \"{command} {port_id} [{arg} [...]]\",\n \t\t.help = \"manage ingress/egress flow rules\",\n \t\t.next = NEXT(NEXT_ENTRY\n-\t\t\t (FLUSH,\n+\t\t\t (DESTROY,\n+\t\t\t FLUSH,\n \t\t\t LIST)),\n \t\t.call = parse_init,\n \t},\n \t/* Sub-level commands. */\n+\t[DESTROY] = {\n+\t\t.name = \"destroy\",\n+\t\t.help = \"destroy specific flow rules\",\n+\t\t.next = NEXT(NEXT_ENTRY(DESTROY_RULE), NEXT_ENTRY(PORT_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, port)),\n+\t\t.call = parse_destroy,\n+\t},\n \t[FLUSH] = {\n \t\t.name = \"flush\",\n \t\t.help = \"destroy all flow rules\",\n@@ -264,6 +299,14 @@ static const struct token token_list[] = {\n \t\t.args = ARGS(ARGS_ENTRY(struct buffer, port)),\n \t\t.call = parse_list,\n \t},\n+\t/* Destroy arguments. */\n+\t[DESTROY_RULE] = {\n+\t\t.name = \"rule\",\n+\t\t.help = \"specify a rule identifier\",\n+\t\t.next = NEXT(next_destroy_attr, NEXT_ENTRY(RULE_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.destroy.rule)),\n+\t\t.call = parse_destroy,\n+\t},\n \t/* List arguments. */\n \t[LIST_GROUP] = {\n \t\t.name = \"group\",\n@@ -329,6 +372,39 @@ parse_init(struct context *ctx, const struct token *token,\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+\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 != DESTROY)\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->object = out;\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+\t\treturn len;\n+\t}\n+\tif (((uint8_t *)(out->args.destroy.rule + out->args.destroy.rule_n) +\n+\t sizeof(*out->args.destroy.rule)) > (uint8_t *)out + size)\n+\t\treturn -1;\n+\tctx->object = out->args.destroy.rule + out->args.destroy.rule_n++;\n+\treturn len;\n+}\n+\n /** Parse tokens for flush command. */\n static int\n parse_flush(struct context *ctx, const struct token *token,\n@@ -494,6 +570,30 @@ comp_port(struct context *ctx, const struct token *token,\n \treturn i;\n }\n \n+/** Complete available rule IDs. */\n+static int\n+comp_rule_id(struct context *ctx, const struct token *token,\n+\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\tunsigned int i = 0;\n+\tstruct rte_port *port;\n+\tstruct port_flow *pf;\n+\n+\t(void)token;\n+\tif (port_id_is_invalid(ctx->port, DISABLED_WARN) ||\n+\t ctx->port == (uint16_t)RTE_PORT_ALL)\n+\t\treturn -1;\n+\tport = &ports[ctx->port];\n+\tfor (pf = port->flow_list; pf != NULL; pf = pf->next) {\n+\t\tif (buf && i == ent)\n+\t\t\treturn snprintf(buf, size, \"%u\", pf->id);\n+\t\t++i;\n+\t}\n+\tif (buf)\n+\t\treturn -1;\n+\treturn i;\n+}\n+\n /** Internal context. */\n static struct context cmd_flow_context;\n \n@@ -736,6 +836,10 @@ static void\n cmd_flow_parsed(const struct buffer *in)\n {\n \tswitch (in->command) {\n+\tcase DESTROY:\n+\t\tport_flow_destroy(in->port, in->args.destroy.rule_n,\n+\t\t\t\t in->args.destroy.rule);\n+\t\tbreak;\n \tcase FLUSH:\n \t\tport_flow_flush(in->port);\n \t\tbreak;\n", "prefixes": [ "dpdk-dev", "09/22" ] }{ "id": 17033, "url": "