Patch Detail

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

{
    "id": 17030,
    "url": "https://patches.dpdk.org/api/patches/17030/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/b74be7cb2964ae190c08f3e5aabd8c488548a947.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": "<b74be7cb2964ae190c08f3e5aabd8c488548a947.1479309720.git.adrien.mazarguil@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/b74be7cb2964ae190c08f3e5aabd8c488548a947.1479309720.git.adrien.mazarguil@6wind.com",
    "date": "2016-11-16T16:23:32",
    "name": "[dpdk-dev,06/22] app/testpmd: add rte_flow integer support",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "28b3d6587024ac5e78366eb8d7cd2aee1064e1b3",
    "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/b74be7cb2964ae190c08f3e5aabd8c488548a947.1479309720.git.adrien.mazarguil@6wind.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/17030/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/17030/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 135666893;\n\tWed, 16 Nov 2016 17:25:14 +0100 (CET)",
            "from mail-wm0-f54.google.com (mail-wm0-f54.google.com\n\t[74.125.82.54]) by dpdk.org (Postfix) with ESMTP id B04CC559C\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 17:24:18 +0100 (CET)",
            "by mail-wm0-f54.google.com with SMTP id g23so250203874wme.1\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 08:24:18 -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\tgk6sm41331064wjc.21.2016.11.16.08.24.16\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 16 Nov 2016 08:24:17 -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=dqVwkd07/r6AH35n7NznZUfr1PVdVoaaKqQC4RSJy4s=;\n\tb=YxtrdpOKHRkJFhQDdNupQrmC0YaeD1IRDd9UKbtcSlB4gQySu4gYGHra0MkeNDBDhT\n\toK6RP0KEb4iy/6NT/HQjM/qmd/I2AHr09wai3iACfRA0Hqyzwm6/Rj56S0elesxwGOPL\n\tazOP+ovnSi15o4hAeT5YDVy0i7zio63mFLXMiNgCyF03JX+4GP2Lz/CSZH2IALLYK9dP\n\tet1r2qoA1QPZDEPz1+YxejAMSGdZeUsO2Mw5KbHIEl181yoDHBlv6jcgdxBBTfxNiMx4\n\t+q7xjQhG0ZOaptZrm9pOSpfFQHUSVDhAgZMNvN8pPghbeNrPAdD2AcH6M0w0PwZroQt9\n\t+BDA==",
        "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=dqVwkd07/r6AH35n7NznZUfr1PVdVoaaKqQC4RSJy4s=;\n\tb=Eqju8igFWQVcE4LWhPmDFXl2HiD5huhRWBDJEjuDcTbAYP+FXj7HISI3MnZqD5DSab\n\toBMt5Yjw2/jomO39TlALGaRMEWCAHkKwibvZa3NPHU/4kgTj9r8QoUmvT4b5QChbXoOt\n\tKP+D9LUGUvyEuljrxBNoon6u6H86WKlOQIZTyrutnSdCgIW/ysZTsffNPrTqQrUcnexG\n\tp/2xRIATY6csT1BZ4gW8JpeoKLXX9zIaEkwftXls/il9+IU/GEWV1rnnKpwhWX6lQjoF\n\tpxwN4HQJyIbF7cZQFUvaadDY9ctRJhXTLNSk6OVFKXm/ZAcP6m4usmg95at2VxTCzD3r\n\t0zHA==",
        "X-Gm-Message-State": "ABUngvcpnPq3u4HBVeOcgLEaSjGtGFiYkDgsQqUkBGHTHLFcPztoK0c3JoVjxcSfv9Dcn4WF",
        "X-Received": "by 10.194.115.226 with SMTP id jr2mr2491594wjb.75.1479313458086; \n\tWed, 16 Nov 2016 08:24:18 -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:32 +0100",
        "Message-Id": "<b74be7cb2964ae190c08f3e5aabd8c488548a947.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 06/22] app/testpmd: add rte_flow integer support",
        "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": "Parse all integer types and handle conversion to network byte order in a\nsingle function.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n app/test-pmd/cmdline_flow.c | 148 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 148 insertions(+)",
    "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 7dbda84..7078f80 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -34,11 +34,14 @@\n #include <stddef.h>\n #include <stdint.h>\n #include <stdio.h>\n+#include <inttypes.h>\n+#include <errno.h>\n #include <ctype.h>\n #include <string.h>\n \n #include <rte_common.h>\n #include <rte_ethdev.h>\n+#include <rte_byteorder.h>\n #include <cmdline_parse.h>\n #include <rte_flow.h>\n \n@@ -50,6 +53,10 @@ enum index {\n \tZERO = 0,\n \tEND,\n \n+\t/* Common tokens. */\n+\tINTEGER,\n+\tUNSIGNED,\n+\n \t/* Top-level command. */\n \tFLOW,\n };\n@@ -61,12 +68,24 @@ enum index {\n struct context {\n \t/** Stack of subsequent token lists to process. */\n \tconst enum index *next[CTX_STACK_SIZE];\n+\t/** Arguments for stacked tokens. */\n+\tconst void *args[CTX_STACK_SIZE];\n \tenum index curr; /**< Current token index. */\n \tenum index prev; /**< Index of the last token seen. */\n \tint next_num; /**< Number of entries in next[]. */\n+\tint args_num; /**< Number of entries in args[]. */\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+\tvoid *object; /**< Address of current object for relative offsets. */\n+};\n+\n+/** Token argument. */\n+struct arg {\n+\tuint32_t hton:1; /**< Use network byte ordering. */\n+\tuint32_t sign:1; /**< Value is signed. */\n+\tuint32_t offset; /**< Relative offset from ctx->object. */\n+\tuint32_t size; /**< Field size. */\n };\n \n /** Parser token definition. */\n@@ -80,6 +99,8 @@ struct token {\n \t * parser consumes the last entry of that stack.\n \t */\n \tconst enum index *const *next;\n+\t/** Arguments stack for subsequent tokens that need them. */\n+\tconst struct arg *const *args;\n \t/**\n \t * Token-processing callback, returns -1 in case of error, the\n \t * length of the matched string otherwise. If NULL, attempts to\n@@ -112,6 +133,22 @@ struct token {\n /** Static initializer for a NEXT() entry. */\n #define NEXT_ENTRY(...) (const enum index []){ __VA_ARGS__, 0, }\n \n+/** Static initializer for the args field. */\n+#define ARGS(...) (const struct arg *const []){ __VA_ARGS__, NULL, }\n+\n+/** Static initializer for ARGS() to target a field. */\n+#define ARGS_ENTRY(s, f) \\\n+\t(&(const struct arg){ \\\n+\t\t.offset = offsetof(s, f), \\\n+\t\t.size = sizeof(((s *)0)->f), \\\n+\t})\n+\n+/** Static initializer for ARGS() to target a pointer. */\n+#define ARGS_ENTRY_PTR(s, f) \\\n+\t(&(const struct arg){ \\\n+\t\t.size = sizeof(*((s *)0)->f), \\\n+\t})\n+\n /** Parser output buffer layout expected by cmd_flow_parsed(). */\n struct buffer {\n \tenum index command; /**< Flow command. */\n@@ -121,6 +158,11 @@ struct buffer {\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_int(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 \n /** Token definitions. */\n static const struct token token_list[] = {\n@@ -135,6 +177,21 @@ static const struct token token_list[] = {\n \t\t.type = \"RETURN\",\n \t\t.help = \"command may end here\",\n \t},\n+\t/* Common tokens. */\n+\t[INTEGER] = {\n+\t\t.name = \"{int}\",\n+\t\t.type = \"INTEGER\",\n+\t\t.help = \"integer value\",\n+\t\t.call = parse_int,\n+\t\t.comp = comp_none,\n+\t},\n+\t[UNSIGNED] = {\n+\t\t.name = \"{unsigned}\",\n+\t\t.type = \"UNSIGNED\",\n+\t\t.help = \"unsigned integer value\",\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@@ -144,6 +201,23 @@ static const struct token token_list[] = {\n \t},\n };\n \n+/** Remove and return last entry from argument stack. */\n+static const struct arg *\n+pop_args(struct context *ctx)\n+{\n+\treturn ctx->args_num ? ctx->args[--ctx->args_num] : NULL;\n+}\n+\n+/** Add entry on top of the argument stack. */\n+static int\n+push_args(struct context *ctx, const struct arg *arg)\n+{\n+\tif (ctx->args_num == CTX_STACK_SIZE)\n+\t\treturn -1;\n+\tctx->args[ctx->args_num++] = arg;\n+\treturn 0;\n+}\n+\n /** Default parsing function for token name matching. */\n static int\n parse_default(struct context *ctx, const struct token *token,\n@@ -178,9 +252,74 @@ parse_init(struct context *ctx, const struct token *token,\n \t/* Initialize buffer. */\n \tmemset(out, 0x00, sizeof(*out));\n \tmemset((uint8_t *)out + sizeof(*out), 0x22, size - sizeof(*out));\n+\tctx->object = out;\n \treturn len;\n }\n \n+/**\n+ * Parse signed/unsigned integers 8 to 64-bit long.\n+ *\n+ * Last argument (ctx->args) is retrieved to determine integer type and\n+ * storage location.\n+ */\n+static int\n+parse_int(struct context *ctx, const struct token *token,\n+\t  const char *str, unsigned int len,\n+\t  void *buf, unsigned int size)\n+{\n+\tconst struct arg *arg = pop_args(ctx);\n+\tuintmax_t u;\n+\tchar *end;\n+\n+\t(void)token;\n+\t/* Argument is expected. */\n+\tif (!arg)\n+\t\treturn -1;\n+\terrno = 0;\n+\tu = arg->sign ?\n+\t\t(uintmax_t)strtoimax(str, &end, 0) :\n+\t\tstrtoumax(str, &end, 0);\n+\tif (errno || (size_t)(end - str) != len)\n+\t\tgoto error;\n+\tif (!ctx->object)\n+\t\treturn len;\n+\tbuf = (uint8_t *)ctx->object + arg->offset;\n+\tsize = arg->size;\n+\tswitch (size) {\n+\tcase sizeof(uint8_t):\n+\t\t*(uint8_t *)buf = u;\n+\t\tbreak;\n+\tcase sizeof(uint16_t):\n+\t\t*(uint16_t *)buf = arg->hton ? rte_cpu_to_be_16(u) : u;\n+\t\tbreak;\n+\tcase sizeof(uint32_t):\n+\t\t*(uint32_t *)buf = arg->hton ? rte_cpu_to_be_32(u) : u;\n+\t\tbreak;\n+\tcase sizeof(uint64_t):\n+\t\t*(uint64_t *)buf = arg->hton ? rte_cpu_to_be_64(u) : u;\n+\t\tbreak;\n+\tdefault:\n+\t\tgoto error;\n+\t}\n+\treturn len;\n+error:\n+\tpush_args(ctx, arg);\n+\treturn -1;\n+}\n+\n+/** No completion. */\n+static int\n+comp_none(struct context *ctx, const struct token *token,\n+\t  unsigned int ent, char *buf, unsigned int size)\n+{\n+\t(void)ctx;\n+\t(void)token;\n+\t(void)ent;\n+\t(void)buf;\n+\t(void)size;\n+\treturn 0;\n+}\n+\n /** Internal context. */\n static struct context cmd_flow_context;\n \n@@ -195,9 +334,11 @@ cmd_flow_context_init(struct context *ctx)\n \tctx->curr = 0;\n \tctx->prev = 0;\n \tctx->next_num = 0;\n+\tctx->args_num = 0;\n \tctx->reparse = 0;\n \tctx->eol = 0;\n \tctx->last = 0;\n+\tctx->object = NULL;\n }\n \n /** Parse a token (cmdline API). */\n@@ -270,6 +411,13 @@ cmd_flow_parse(cmdline_parse_token_hdr_t *hdr, const char *src, void *result,\n \t\t\t\treturn -1;\n \t\t\tctx->next[ctx->next_num++] = token->next[i];\n \t\t}\n+\t/* Push arguments if any. */\n+\tif (token->args)\n+\t\tfor (i = 0; token->args[i]; ++i) {\n+\t\t\tif (ctx->args_num == RTE_DIM(ctx->args))\n+\t\t\t\treturn -1;\n+\t\t\tctx->args[ctx->args_num++] = token->args[i];\n+\t\t}\n \treturn len;\n }\n \n",
    "prefixes": [
        "dpdk-dev",
        "06/22"
    ]
}