Patch Detail

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

{
    "id": 58328,
    "url": "https://patches.dpdk.org/api/patches/58328/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/a63af8b9f2b3331f7a4618e1a1975d82795b3006.1567239840.git.jackmin@mellanox.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": "<a63af8b9f2b3331f7a4618e1a1975d82795b3006.1567239840.git.jackmin@mellanox.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/a63af8b9f2b3331f7a4618e1a1975d82795b3006.1567239840.git.jackmin@mellanox.com",
    "date": "2019-08-31T08:28:53",
    "name": "[RFC] app/testpmd: support multiple raw encap/decap",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "6b3d55cd5c34ae2cd95cb1daa0f840170dd2c88d",
    "submitter": {
        "id": 1065,
        "url": "https://patches.dpdk.org/api/people/1065/?format=api",
        "name": "Xiaoyu Min",
        "email": "jackmin@mellanox.com"
    },
    "delegate": {
        "id": 319,
        "url": "https://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/a63af8b9f2b3331f7a4618e1a1975d82795b3006.1567239840.git.jackmin@mellanox.com/mbox/",
    "series": [
        {
            "id": 6184,
            "url": "https://patches.dpdk.org/api/series/6184/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6184",
            "date": "2019-08-31T08:28:53",
            "name": "[RFC] app/testpmd: support multiple raw encap/decap",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/6184/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/58328/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/58328/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5DB8A1EA75;\n\tSat, 31 Aug 2019 10:29:01 +0200 (CEST)",
            "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n\tby dpdk.org (Postfix) with ESMTP id 49A331D44E\n\tfor <dev@dpdk.org>; Sat, 31 Aug 2019 10:29:00 +0200 (CEST)"
        ],
        "From": "Xiaoyu Min <jackmin@mellanox.com>",
        "To": "orika@mellanox.com, Adrien Mazarguil <adrien.mazarguil@6wind.com>,\n\tWenzhuo Lu <wenzhuo.lu@intel.com>, Jingjing Wu <jingjing.wu@intel.com>,\n\tBernard Iremonger <bernard.iremonger@intel.com>",
        "Cc": "dev@dpdk.org",
        "Date": "Sat, 31 Aug 2019 16:28:53 +0800",
        "Message-Id": "<a63af8b9f2b3331f7a4618e1a1975d82795b3006.1567239840.git.jackmin@mellanox.com>",
        "X-Mailer": "git-send-email 2.21.0",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=UTF-8",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [RFC] app/testpmd: support multiple raw encap/decap",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "In some scenarios, the raw_encap/raw_decap actions could be multiple in\none single flow (e,g. hirepin flow):\n\n  ... actions raw_decap / raw_encap / raw_decap / raw_encap / ...\n\nThis requires the testpmd supports multiple raw_encap/raw_decap data\nsettings as well.\n\nWith the multiple raw_encap/raw_decap settings, the testpmd commands –\nset raw_encap / set raw_decap will become:\n\n  set raw_encap <index> <item pattern>\n  set raw_encap <index> <item pattern>\n\nAnd the actions – raw_encap/raw_decap also could optionally choose which\nglobal raw_encap/raw_decap confs to be used by index:\n\n  ... actions raw_decap index 1 / raw_encap index 2 / ...\n\nIf there is no `index` specified, the default index is 0.\n\nSigned-off-by: Xiaoyu Min <jackmin@mellanox.com>\n---\n app/test-pmd/cmdline_flow.c | 198 +++++++++++++++++++++++++++++++-----\n 1 file changed, 171 insertions(+), 27 deletions(-)",
    "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 495871394e..ff384ade42 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -51,6 +51,7 @@ enum index {\n \t/* Sub-leve commands. */\n \tSET_RAW_ENCAP,\n \tSET_RAW_DECAP,\n+\tSET_RAW_INDEX,\n \n \t/* Top-level command. */\n \tFLOW,\n@@ -297,6 +298,10 @@ enum index {\n \tACTION_DEC_TCP_ACK_VALUE,\n \tACTION_RAW_ENCAP,\n \tACTION_RAW_DECAP,\n+\tACTION_RAW_ENCAP_INDEX,\n+\tACTION_RAW_ENCAP_INDEX_VALUE,\n+\tACTION_RAW_DECAP_INDEX,\n+\tACTION_RAW_DECAP_INDEX_VALUE,\n };\n \n /** Maximum size for pattern in struct rte_flow_item_raw. */\n@@ -320,6 +325,7 @@ struct action_rss_data {\n #define ACTION_VXLAN_ENCAP_ITEMS_NUM 6\n \n #define ACTION_RAW_ENCAP_MAX_DATA 128\n+#define RAW_ENCAP_CONFS_MAX_NUM 8\n \n /** Storage for struct rte_flow_action_raw_encap. */\n struct raw_encap_conf {\n@@ -328,7 +334,7 @@ struct raw_encap_conf {\n \tsize_t size;\n };\n \n-struct raw_encap_conf raw_encap_conf = {.size = 0};\n+struct raw_encap_conf raw_encap_confs[RAW_ENCAP_CONFS_MAX_NUM];\n \n /** Storage for struct rte_flow_action_raw_decap. */\n struct raw_decap_conf {\n@@ -336,7 +342,7 @@ struct raw_decap_conf {\n \tsize_t size;\n };\n \n-struct raw_decap_conf raw_decap_conf = {.size = 0};\n+struct raw_decap_conf raw_decap_confs[RAW_ENCAP_CONFS_MAX_NUM];\n \n /** Storage for struct rte_flow_action_vxlan_encap including external data. */\n struct action_vxlan_encap_data {\n@@ -376,12 +382,14 @@ struct action_raw_encap_data {\n \tstruct rte_flow_action_raw_encap conf;\n \tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n \tuint8_t preserve[ACTION_RAW_ENCAP_MAX_DATA];\n+\tuint16_t idx;\n };\n \n /** Storage for struct rte_flow_action_raw_decap including external data. */\n struct action_raw_decap_data {\n \tstruct rte_flow_action_raw_decap conf;\n \tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n+\tuint16_t idx;\n };\n \n /** Maximum number of subsequent tokens and arguments on the stack. */\n@@ -1143,6 +1151,18 @@ static const enum index action_dec_tcp_ack[] = {\n \tZERO,\n };\n \n+static const enum index action_raw_encap[] = {\n+\tACTION_RAW_ENCAP_INDEX,\n+\tACTION_NEXT,\n+\tZERO,\n+};\n+\n+static const enum index action_raw_decap[] = {\n+\tACTION_RAW_DECAP_INDEX,\n+\tACTION_NEXT,\n+\tZERO,\n+};\n+\n static int parse_set_raw_encap_decap(struct context *, const struct token *,\n \t\t\t\t     const char *, unsigned int,\n \t\t\t\t     void *, unsigned int);\n@@ -1201,6 +1221,12 @@ static int parse_vc_action_raw_encap(struct context *,\n static int parse_vc_action_raw_decap(struct context *,\n \t\t\t\t     const struct token *, const char *,\n \t\t\t\t     unsigned int, void *, unsigned int);\n+static int parse_vc_action_raw_encap_index(struct context *,\n+\t\t\t\t\t   const struct token *, const char *,\n+\t\t\t\t\t   unsigned int, void *, unsigned int);\n+static int parse_vc_action_raw_decap_index(struct context *,\n+\t\t\t\t\t   const struct token *, const char *,\n+\t\t\t\t\t   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@@ -3095,18 +3121,41 @@ static const struct token token_list[] = {\n \t\t.name = \"raw_encap\",\n \t\t.help = \"encapsulation data, defined by set raw_encap\",\n \t\t.priv = PRIV_ACTION(RAW_ENCAP,\n-\t\t\tsizeof(struct rte_flow_action_raw_encap)),\n-\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t\tsizeof(struct action_raw_encap_data)),\n+\t\t.next = NEXT(action_raw_encap),\n \t\t.call = parse_vc_action_raw_encap,\n \t},\n+\t[ACTION_RAW_ENCAP_INDEX] = {\n+\t\t.name = \"index\",\n+\t\t.help = \"the index of raw_encap_confs\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_RAW_ENCAP_INDEX_VALUE)),\n+\t},\n+\t[ACTION_RAW_ENCAP_INDEX_VALUE] = {\n+\t\t.name = \"{index}\",\n+\t\t.help = \"the index value\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t.call = parse_vc_action_raw_encap_index,\n+\t},\n \t[ACTION_RAW_DECAP] = {\n \t\t.name = \"raw_decap\",\n \t\t.help = \"decapsulation data, defined by set raw_encap\",\n \t\t.priv = PRIV_ACTION(RAW_DECAP,\n-\t\t\tsizeof(struct rte_flow_action_raw_decap)),\n-\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t\tsizeof(struct action_raw_decap_data)),\n+\t\t.next = NEXT(action_raw_decap),\n \t\t.call = parse_vc_action_raw_decap,\n \t},\n+\t[ACTION_RAW_DECAP_INDEX] = {\n+\t\t.name = \"index\",\n+\t\t.help = \"the index of raw_decap_confs\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t.call = parse_vc_action_raw_decap_index,\n+\t},\n+\t[ACTION_RAW_DECAP_INDEX_VALUE] = {\n+\t\t.name = \"{index}\",\n+\t\t.help = \"the index value\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t.call = parse_vc_action_raw_decap_index,\n+\t},\n \t/* Top level command. */\n \t[SET] = {\n \t\t.name = \"set\",\n@@ -3121,14 +3170,21 @@ static const struct token token_list[] = {\n \t[SET_RAW_ENCAP] = {\n \t\t.name = \"raw_encap\",\n \t\t.help = \"set raw encap data\",\n-\t\t.next = NEXT(next_item),\n+\t\t.next = NEXT(next_item, NEXT_ENTRY(SET_RAW_INDEX)),\n+\t\t.args = ARGS(ARGS_ENTRY(struct buffer, port)),\n \t\t.call = parse_set_raw_encap_decap,\n \t},\n \t[SET_RAW_DECAP] = {\n \t\t.name = \"raw_decap\",\n \t\t.help = \"set raw decap data\",\n-\t\t.next = NEXT(next_item),\n+\t\t.next = NEXT(next_item, NEXT_ENTRY(SET_RAW_INDEX)),\n \t\t.call = parse_set_raw_encap_decap,\n+\t},\n+\t[SET_RAW_INDEX] = {\n+\t\t.name = \"{raw_index}\",\n+\t\t.help = \"index of raw_enca/raw_decap data\",\n+\t\t.call = parse_port,\n+\t\t.comp = comp_none,\n \t}\n };\n \n@@ -4423,6 +4479,92 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token,\n \treturn ret;\n }\n \n+static int\n+parse_vc_action_raw_decap_index(struct context *ctx, const struct token *token,\n+\t\t\t\tconst char *str, unsigned int len, void *buf,\n+\t\t\t\tunsigned int size)\n+{\n+\tstruct action_raw_decap_data *action_raw_decap_data;\n+\tstruct rte_flow_action *action;\n+\tconst struct arg *arg;\n+\tstruct buffer *out = buf;\n+\tuint8_t *data = NULL;\n+\tint ret;\n+\tuint16_t idx;\n+\n+\tRTE_SET_USED(token);\n+\tRTE_SET_USED(buf);\n+\tRTE_SET_USED(size);\n+\targ = ARGS_ENTRY_ARB_BOUNDED\n+\t\t(offsetof(struct action_raw_decap_data, idx),\n+\t\t sizeof(((struct action_raw_decap_data *)0)->idx),\n+\t\t 0, RAW_ENCAP_CONFS_MAX_NUM);\n+\tif (push_args(ctx, arg))\n+\t\treturn -1;\n+\tret = parse_int(ctx, token, str, len, NULL, 0);\n+\tif (ret < 0) {\n+\t\tpop_args(ctx);\n+\t\treturn -1;\n+\t}\n+\tif (!ctx->object)\n+\t\treturn len;\n+\taction = &out->args.vc.actions[out->args.vc.actions_n - 1];\n+\taction_raw_decap_data = ctx->object;\n+\tidx = action_raw_decap_data->idx;\n+\t/* data stored from tail of data buffer */\n+\tdata = (uint8_t *)&(raw_decap_confs[idx].data) +\n+\t\tACTION_RAW_ENCAP_MAX_DATA - raw_decap_confs[idx].size;\n+\taction_raw_decap_data->conf.data = data;\n+\taction_raw_decap_data->conf.size = raw_decap_confs[idx].size;\n+\taction->conf = &action_raw_decap_data->conf;\n+\treturn len;\n+}\n+\n+\n+static int\n+parse_vc_action_raw_encap_index(struct context *ctx, const struct token *token,\n+\t\t\t\tconst char *str, unsigned int len, void *buf,\n+\t\t\t\tunsigned int size)\n+{\n+\tstruct action_raw_encap_data *action_raw_encap_data;\n+\tstruct rte_flow_action *action;\n+\tconst struct arg *arg;\n+\tstruct buffer *out = buf;\n+\tuint8_t *data = NULL;\n+\tint ret;\n+\tuint16_t idx;\n+\n+\tRTE_SET_USED(token);\n+\tRTE_SET_USED(buf);\n+\tRTE_SET_USED(size);\n+\tif (ctx->curr != ACTION_RAW_ENCAP_INDEX_VALUE)\n+\t\treturn -1;\n+\targ = ARGS_ENTRY_ARB_BOUNDED\n+\t\t(offsetof(struct action_raw_encap_data, idx),\n+\t\t sizeof(((struct action_raw_encap_data *)0)->idx),\n+\t\t 0, RAW_ENCAP_CONFS_MAX_NUM);\n+\tif (push_args(ctx, arg))\n+\t\treturn -1;\n+\tret = parse_int(ctx, token, str, len, NULL, 0);\n+\tif (ret < 0) {\n+\t\tpop_args(ctx);\n+\t\treturn -1;\n+\t}\n+\tif (!ctx->object)\n+\t\treturn len;\n+\taction = &out->args.vc.actions[out->args.vc.actions_n - 1];\n+\taction_raw_encap_data = ctx->object;\n+\tidx = action_raw_encap_data->idx;\n+\t/* data stored from tail of data buffer */\n+\tdata = (uint8_t *)&(raw_encap_confs[idx].data) +\n+\t\tACTION_RAW_ENCAP_MAX_DATA - raw_encap_confs[idx].size;\n+\taction_raw_encap_data->conf.data = data;\n+\taction_raw_encap_data->conf.size = raw_encap_confs[idx].size;\n+\taction_raw_encap_data->conf.preserve = NULL;\n+\taction->conf = &action_raw_encap_data->conf;\n+\treturn len;\n+}\n+\n static int\n parse_vc_action_raw_encap(struct context *ctx, const struct token *token,\n \t\t\t  const char *str, unsigned int len, void *buf,\n@@ -4430,7 +4572,7 @@ parse_vc_action_raw_encap(struct context *ctx, const struct token *token,\n {\n \tstruct buffer *out = buf;\n \tstruct rte_flow_action *action;\n-\tstruct rte_flow_action_raw_encap *action_raw_encap_conf = NULL;\n+\tstruct action_raw_encap_data *action_raw_encap_data = NULL;\n \tuint8_t *data = NULL;\n \tint ret;\n \n@@ -4447,14 +4589,14 @@ parse_vc_action_raw_encap(struct context *ctx, const struct token *token,\n \tctx->object = out->args.vc.data;\n \tctx->objmask = NULL;\n \t/* Copy the headers to the buffer. */\n-\taction_raw_encap_conf = ctx->object;\n+\taction_raw_encap_data = ctx->object;\n \t/* data stored from tail of data buffer */\n-\tdata = (uint8_t *)&(raw_encap_conf.data) +\n-\t\tACTION_RAW_ENCAP_MAX_DATA - raw_encap_conf.size;\n-\taction_raw_encap_conf->data = data;\n-\taction_raw_encap_conf->preserve = NULL;\n-\taction_raw_encap_conf->size = raw_encap_conf.size;\n-\taction->conf = action_raw_encap_conf;\n+\tdata = (uint8_t *)&(raw_encap_confs[0].data) +\n+\t\tACTION_RAW_ENCAP_MAX_DATA - raw_encap_confs[0].size;\n+\taction_raw_encap_data->conf.data = data;\n+\taction_raw_encap_data->conf.preserve = NULL;\n+\taction_raw_encap_data->conf.size = raw_encap_confs[0].size;\n+\taction->conf = &action_raw_encap_data->conf;\n \treturn ret;\n }\n \n@@ -4465,7 +4607,7 @@ parse_vc_action_raw_decap(struct context *ctx, const struct token *token,\n {\n \tstruct buffer *out = buf;\n \tstruct rte_flow_action *action;\n-\tstruct rte_flow_action_raw_decap *action_raw_decap_conf = NULL;\n+\tstruct action_raw_decap_data *action_raw_decap_data = NULL;\n \tuint8_t *data = NULL;\n \tint ret;\n \n@@ -4482,13 +4624,13 @@ parse_vc_action_raw_decap(struct context *ctx, const struct token *token,\n \tctx->object = out->args.vc.data;\n \tctx->objmask = NULL;\n \t/* Copy the headers to the buffer. */\n-\taction_raw_decap_conf = ctx->object;\n+\taction_raw_decap_data = ctx->object;\n \t/* data stored from tail of data buffer */\n-\tdata = (uint8_t *)&(raw_decap_conf.data) +\n-\t\tACTION_RAW_ENCAP_MAX_DATA - raw_decap_conf.size;\n-\taction_raw_decap_conf->data = data;\n-\taction_raw_decap_conf->size = raw_decap_conf.size;\n-\taction->conf = action_raw_decap_conf;\n+\tdata = (uint8_t *)&(raw_decap_confs[0].data) +\n+\t\tACTION_RAW_ENCAP_MAX_DATA - raw_decap_confs[0].size;\n+\taction_raw_decap_data->conf.data = data;\n+\taction_raw_decap_data->conf.size = raw_decap_confs[0].size;\n+\taction->conf = &action_raw_decap_data->conf;\n \treturn ret;\n }\n \n@@ -5167,6 +5309,7 @@ parse_set_raw_encap_decap(struct context *ctx, const struct token *token,\n \t\treturn -1;\n \tctx->objdata = 0;\n \tctx->objmask = NULL;\n+\tctx->object = out;\n \tif (!out->command)\n \t\treturn -1;\n \tout->command = ctx->curr;\n@@ -5777,15 +5920,16 @@ cmd_set_raw_parsed(const struct buffer *in)\n \tsize_t *total_size = NULL;\n \tuint16_t upper_layer = 0;\n \tuint16_t proto = 0;\n+\tuint16_t idx = in->port; /* We borrow port field as index */\n \n \tRTE_ASSERT(in->command == SET_RAW_ENCAP ||\n \t\t   in->command == SET_RAW_DECAP);\n \tif (in->command == SET_RAW_ENCAP) {\n-\t\ttotal_size = &raw_encap_conf.size;\n-\t\tdata = (uint8_t *)&raw_encap_conf.data;\n+\t\ttotal_size = &raw_encap_confs[idx].size;\n+\t\tdata = (uint8_t *)&raw_encap_confs[idx].data;\n \t} else {\n-\t\ttotal_size = &raw_decap_conf.size;\n-\t\tdata = (uint8_t *)&raw_decap_conf.data;\n+\t\ttotal_size = &raw_decap_confs[idx].size;\n+\t\tdata = (uint8_t *)&raw_decap_confs[idx].data;\n \t}\n \t*total_size = 0;\n \tmemset(data, 0x00, ACTION_RAW_ENCAP_MAX_DATA);\n",
    "prefixes": [
        "RFC"
    ]
}