Patch Detail

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

{
    "id": 17036,
    "url": "https://patches.dpdk.org/api/patches/17036/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/2d37e8ee1c613557e94acef94e381b72b2a535ce.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": "<2d37e8ee1c613557e94acef94e381b72b2a535ce.1479309720.git.adrien.mazarguil@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/2d37e8ee1c613557e94acef94e381b72b2a535ce.1479309720.git.adrien.mazarguil@6wind.com",
    "date": "2016-11-16T16:23:38",
    "name": "[dpdk-dev,12/22] app/testpmd: add rte_flow item spec handler",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "714ea5fb0f8cc599aa051d60f809fea46c3e56a0",
    "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/2d37e8ee1c613557e94acef94e381b72b2a535ce.1479309720.git.adrien.mazarguil@6wind.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/17036/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/17036/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 C64D2D4A8;\n\tWed, 16 Nov 2016 17:25:26 +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 0148A5599\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 17:24:35 +0100 (CET)",
            "by mail-wm0-f50.google.com with SMTP id t79so83428030wmt.0\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 08:24:35 -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\tx140sm10941242wme.19.2016.11.16.08.24.33\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 16 Nov 2016 08:24:34 -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=UIEFnNmnJSVW76761LS57op7YwBMx+dgFVLYJl9em28=;\n\tb=sAEGBLlRwYEwkneyG0WaeglCeTf++slvajR2OKCi4NRnvmYWMWL3HWMQM1emB15z5x\n\t+KRxKkB5/V/3g9ybqMJ49FCKqLgYfK4F1wmEFOKZXDZJLWHzhtADfZu2oVPSa+UYGVfE\n\tDd/fpn4kCa6y7lvM/1KDxqN6bcA3Jum1FzGwN/rdeXwb44Kc4n7ayLyCPPLfO2D9AoEk\n\td2sQKvYbN8tfd1IPvQJmKv2XAYJWES/fWTooHmoZSRiRgzArrJCgVfoiwhKWP4+NWflm\n\te1lR31o+eYL+GWWr9Z6gbcfHDwXmavboF8s4C9WHBiYfoXZzvIxiY+fMPfTz5bjamaCu\n\txWxQ==",
        "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=UIEFnNmnJSVW76761LS57op7YwBMx+dgFVLYJl9em28=;\n\tb=SGm/TGtRoZzcKM03igrBhgtiDwdtdaQUs59dkW6QID8S9nrU2tTSGglrUDeeTa05bC\n\tbk5s90HzPdkBgG73tLwB6Fk+PGQBmtEX5pWqljKDZcO0FRc4CO1A/uacp9Vx+PnVHhpA\n\tJoPznvCi4v2gFhSF73L67RGXhxtn6CwER/WGpC0Lycf74y8oHNHOR47crmUQVyb4YD3Y\n\tYrPclyW/WVmftvSe5pp8TmLkWkHRg7Ql530fv2tOkk+LHIPnij4Uc97POwkLMOS1w/7v\n\ti6t8Y9OayFkNoNi8NyVTPfU7N+LWB7cFc4HhvSVAvGv2mBD0GnrTXJMj4aVZkhysc6eh\n\ttZ7Q==",
        "X-Gm-Message-State": "ABUngveBP7Cr45D+3gWGKxsWxTETvY2sdBgr3kVRSRxpEsu0U9k+MwiSTUeM3WCHhRkmo49y",
        "X-Received": "by 10.28.236.83 with SMTP id k80mr10295967wmh.0.1479313475555;\n\tWed, 16 Nov 2016 08:24:35 -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:38 +0100",
        "Message-Id": "<2d37e8ee1c613557e94acef94e381b72b2a535ce.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 12/22] app/testpmd: add rte_flow item spec handler",
        "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": "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>\n---\n app/test-pmd/cmdline_flow.c | 110 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 110 insertions(+)",
    "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex e70e8e2..790b4b8 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_FIX,\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,14 @@ static const enum index next_list_attr[] = {\n \t0,\n };\n \n+static const enum index item_param[] = {\n+\tITEM_PARAM_FIX,\n+\tITEM_PARAM_SPEC,\n+\tITEM_PARAM_LAST,\n+\tITEM_PARAM_MASK,\n+\t0,\n+};\n+\n static const enum index next_item[] = {\n \tITEM_END,\n \tITEM_VOID,\n@@ -287,6 +300,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 +507,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_FIX] = {\n+\t\t.name = \"fix\",\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 +640,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 +668,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 +690,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 +699,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 +722,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 +739,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 +747,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_FIX:\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 +823,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 +834,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 +860,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 +887,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 +949,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 +960,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 +993,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 +1010,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 +1035,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 +1142,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",
        "12/22"
    ]
}