Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 17031,
    "url": "https://patches.dpdk.org/api/patches/17031/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/83203ed6d586efc26dd293bda5f4d06a6d12f969.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": "<83203ed6d586efc26dd293bda5f4d06a6d12f969.1479309720.git.adrien.mazarguil@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/83203ed6d586efc26dd293bda5f4d06a6d12f969.1479309720.git.adrien.mazarguil@6wind.com",
    "date": "2016-11-16T16:23:33",
    "name": "[dpdk-dev,07/22] app/testpmd: add flow list command",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "67336ae2cb924851d58f520c04aa7daaa0d1474f",
    "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/83203ed6d586efc26dd293bda5f4d06a6d12f969.1479309720.git.adrien.mazarguil@6wind.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/17031/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/17031/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 CDD955936;\n\tWed, 16 Nov 2016 17:25:16 +0100 (CET)",
            "from mail-wm0-f50.google.com (mail-wm0-f50.google.com\n\t[74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 442E7567E\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 17:24:21 +0100 (CET)",
            "by mail-wm0-f50.google.com with SMTP id t79so83413223wmt.0\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 08:24:21 -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\tx188sm10950106wmx.4.2016.11.16.08.24.18\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 16 Nov 2016 08:24:19 -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=purWCtq1zgttvxvSYNS9twM2tB2WSfPK/mRn7ZIa4iU=;\n\tb=VZiNGNkMNEy40Ess9GeMRlmLWs0tgFYNX0zppPyvvw/AtrPfVqbzE6h3k0q7DJ2PoR\n\tST/U53bGtj6v0qsR4PWQy2oY+1eeD54RxtP0UQKzNeeBCwdOmdL7esvg1IViwaNBqEnJ\n\thJ87z1G225WlQ0ivKtMSCo3rMosJwU5Mke3IuBI+6Ai+r36FECNGaRU4tgOkkJJuQwlD\n\tJ8tBYHUb8GcSN4QP28EBjXYjDmkCQ1041EsZjWW1SZcFeWw3ork/W6X79XSFxUcFY2Nf\n\tpG+uvsZFhh03YQfuHAOct/l0w4TGp1aoQaG96l+8SGlxFBNtaWdQrdqS6Z67+bTkzDKy\n\tmHcQ==",
        "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=purWCtq1zgttvxvSYNS9twM2tB2WSfPK/mRn7ZIa4iU=;\n\tb=UEaBV9UP+iz4dI0l/hQ2Q9dRo4aye+TV7p2rmW0NhrJlUcc3TDzdLBpAf7nRbkoY6c\n\tylfcRzL887DabEFHv1v7WCZdRgCEWA5hh/NJeC1mS3mtTP/HmxdkTb1zkY8SPX9iWVUO\n\tULiM01swPhcx3Op1OLV6euQcwvm7JhNoSLVBLjIaO0gsBjIxQ/WAj2RjkJO1E4gR4L7w\n\taaSJEZXttji8xyGJKdgugFqQez7JXTIWO6JtmYGIXVpsQPf4sECWGLFO2HZnbh6IyOhz\n\tnyen1jN/nIm7SIyAma0NocpxmWxaUCjGxD390H1W0/Odl6Zv4gJWnyF1/u0CvJ2teDSn\n\tkvUw==",
        "X-Gm-Message-State": "ABUngvf5egl9BH7drA8U9t0HnoVX90L39O2ouedwVaWF5ew/AUdwIvI1RtEsP3FqQPZZAbP5",
        "X-Received": "by 10.194.85.137 with SMTP id h9mr2438378wjz.23.1479313460674;\n\tWed, 16 Nov 2016 08:24:20 -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:33 +0100",
        "Message-Id": "<83203ed6d586efc26dd293bda5f4d06a6d12f969.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 07/22] app/testpmd: add flow list 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 list {port_id} [group {group_id}] [...]\n\nList configured flow rules on a port. Output can optionally be limited to a\ngiven set of group identifiers.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n app/test-pmd/cmdline.c      |   4 ++\n app/test-pmd/cmdline_flow.c | 141 +++++++++++++++++++++++++++++++++++++++\n 2 files changed, 145 insertions(+)",
    "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex b7d10b3..09357c0 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -810,6 +810,10 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\"sctp-src-port|sctp-dst-port|sctp-veri-tag|none)\"\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 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\"\n \t\t);\n \t}\n }\ndiff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 7078f80..727fe78 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -56,9 +56,17 @@ enum index {\n \t/* Common tokens. */\n \tINTEGER,\n \tUNSIGNED,\n+\tPORT_ID,\n+\tGROUP_ID,\n \n \t/* Top-level command. */\n \tFLOW,\n+\n+\t/* Sub-level commands. */\n+\tLIST,\n+\n+\t/* List arguments. */\n+\tLIST_GROUP,\n };\n \n /** Maximum number of subsequent tokens and arguments on the stack. */\n@@ -77,6 +85,7 @@ struct context {\n \tuint32_t reparse:1; /**< Start over from the beginning. */\n \tuint32_t eol:1; /**< EOL has been detected. */\n \tuint32_t last:1; /**< No more arguments. */\n+\tuint16_t port; /**< Current port ID (for completions). */\n \tvoid *object; /**< Address of current object for relative offsets. */\n };\n \n@@ -153,16 +162,36 @@ struct token {\n struct buffer {\n \tenum index command; /**< Flow command. */\n \tuint16_t port; /**< Affected port ID. */\n+\tunion {\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_list_attr[] = {\n+\tLIST_GROUP,\n+\tEND,\n+\t0,\n };\n \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_list(struct context *, const struct token *,\n+\t\t      const char *, unsigned int,\n+\t\t      void *, unsigned int);\n static int parse_int(struct context *, const struct token *,\n \t\t     const char *, unsigned int,\n \t\t     void *, unsigned int);\n+static int parse_port(struct context *, const struct token *,\n+\t\t      const char *, unsigned int,\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_port(struct context *, const struct token *,\n+\t\t     unsigned int, char *, unsigned int);\n \n /** Token definitions. */\n static const struct token token_list[] = {\n@@ -192,13 +221,44 @@ static const struct token token_list[] = {\n \t\t.call = parse_int,\n \t\t.comp = comp_none,\n \t},\n+\t[PORT_ID] = {\n+\t\t.name = \"{port_id}\",\n+\t\t.type = \"PORT ID\",\n+\t\t.help = \"port identifier\",\n+\t\t.call = parse_port,\n+\t\t.comp = comp_port,\n+\t},\n+\t[GROUP_ID] = {\n+\t\t.name = \"{group_id}\",\n+\t\t.type = \"GROUP ID\",\n+\t\t.help = \"group identifier\",\n+\t\t.call = parse_int,\n+\t\t.comp = comp_none,\n+\t},\n \t/* Top-level command. */\n \t[FLOW] = {\n \t\t.name = \"flow\",\n \t\t.type = \"{command} {port_id} [{arg} [...]]\",\n \t\t.help = \"manage ingress/egress flow rules\",\n+\t\t.next = NEXT(NEXT_ENTRY(LIST)),\n \t\t.call = parse_init,\n \t},\n+\t/* Sub-level commands. */\n+\t[LIST] = {\n+\t\t.name = \"list\",\n+\t\t.help = \"list existing flow rules\",\n+\t\t.next = NEXT(next_list_attr, NEXT_ENTRY(PORT_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, port)),\n+\t\t.call = parse_list,\n+\t},\n+\t/* List arguments. */\n+\t[LIST_GROUP] = {\n+\t\t.name = \"group\",\n+\t\t.help = \"specify a group\",\n+\t\t.next = NEXT(next_list_attr, NEXT_ENTRY(GROUP_ID)),\n+\t\t.args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.list.group)),\n+\t\t.call = parse_list,\n+\t},\n };\n \n /** Remove and return last entry from argument stack. */\n@@ -256,6 +316,39 @@ parse_init(struct context *ctx, const struct token *token,\n \treturn len;\n }\n \n+/** Parse tokens for list command. */\n+static int\n+parse_list(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 != LIST)\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.list.group =\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.list.group + out->args.list.group_n) +\n+\t     sizeof(*out->args.list.group)) > (uint8_t *)out + size)\n+\t\treturn -1;\n+\tctx->object = out->args.list.group + out->args.list.group_n++;\n+\treturn len;\n+}\n+\n /**\n  * Parse signed/unsigned integers 8 to 64-bit long.\n  *\n@@ -307,6 +400,29 @@ parse_int(struct context *ctx, const struct token *token,\n \treturn -1;\n }\n \n+/** Parse port and update context. */\n+static int\n+parse_port(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 = &(struct buffer){ .port = 0 };\n+\tint ret;\n+\n+\tif (buf)\n+\t\tout = buf;\n+\telse {\n+\t\tctx->object = out;\n+\t\tsize = sizeof(*out);\n+\t}\n+\tret = parse_int(ctx, token, str, len, out, size);\n+\tif (ret >= 0)\n+\t\tctx->port = out->port;\n+\tif (!buf)\n+\t\tctx->object = NULL;\n+\treturn ret;\n+}\n+\n /** No completion. */\n static int\n comp_none(struct context *ctx, const struct token *token,\n@@ -320,6 +436,26 @@ comp_none(struct context *ctx, const struct token *token,\n \treturn 0;\n }\n \n+/** Complete available ports. */\n+static int\n+comp_port(struct context *ctx, const struct token *token,\n+\t  unsigned int ent, char *buf, unsigned int size)\n+{\n+\tunsigned int i = 0;\n+\tportid_t p;\n+\n+\t(void)ctx;\n+\t(void)token;\n+\tFOREACH_PORT(p, ports) {\n+\t\tif (buf && i == ent)\n+\t\t\treturn snprintf(buf, size, \"%u\", p);\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@@ -338,6 +474,7 @@ cmd_flow_context_init(struct context *ctx)\n \tctx->reparse = 0;\n \tctx->eol = 0;\n \tctx->last = 0;\n+\tctx->port = 0;\n \tctx->object = NULL;\n }\n \n@@ -561,6 +698,10 @@ static void\n cmd_flow_parsed(const struct buffer *in)\n {\n \tswitch (in->command) {\n+\tcase LIST:\n+\t\tport_flow_list(in->port, in->args.list.group_n,\n+\t\t\t       in->args.list.group);\n+\t\tbreak;\n \tdefault:\n \t\tbreak;\n \t}\n",
    "prefixes": [
        "dpdk-dev",
        "07/22"
    ]
}