Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/59273/?format=api
{ "id": 59273, "url": "https://patches.dpdk.org/api/patches/59273/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/d370bda6fd66d423d88716875f811a0b95f9dda4.1568625415.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": "<d370bda6fd66d423d88716875f811a0b95f9dda4.1568625415.git.jackmin@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d370bda6fd66d423d88716875f811a0b95f9dda4.1568625415.git.jackmin@mellanox.com", "date": "2019-09-16T09:21:02", "name": "app/testpmd: support multiple raw encap/decap", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c20df79de51173370caa30335bda3718a4b331ae", "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/d370bda6fd66d423d88716875f811a0b95f9dda4.1568625415.git.jackmin@mellanox.com/mbox/", "series": [ { "id": 6412, "url": "https://patches.dpdk.org/api/series/6412/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6412", "date": "2019-09-16T09:21:02", "name": "app/testpmd: support multiple raw encap/decap", "version": 1, "mbox": "https://patches.dpdk.org/series/6412/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/59273/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/59273/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 9BA7F1BF78;\n\tMon, 16 Sep 2019 11:21:10 +0200 (CEST)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n\tby dpdk.org (Postfix) with ESMTP id EFCCE1BF70\n\tfor <dev@dpdk.org>; Mon, 16 Sep 2019 11:21:07 +0200 (CEST)" ], "From": "Xiaoyu Min <jackmin@mellanox.com>", "To": "Wenzhuo Lu <wenzhuo.lu@intel.com>, Jingjing Wu <jingjing.wu@intel.com>, \n\tBernard Iremonger <bernard.iremonger@intel.com>,\n\tAdrien Mazarguil <adrien.mazarguil@6wind.com>,\n\tJohn McNamara <john.mcnamara@intel.com>,\n\tMarko Kovacevic <marko.kovacevic@intel.com>", "Cc": "dev@dpdk.org,\n\torika@mellanox.com", "Date": "Mon, 16 Sep 2019 17:21:02 +0800", "Message-Id": "<d370bda6fd66d423d88716875f811a0b95f9dda4.1568625415.git.jackmin@mellanox.com>", "X-Mailer": "git-send-email 2.23.0", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH] 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_decap <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\n set raw_encap <item pattern>\n ... actions raw_decap / raw_encap / ...\n\nwhich will use raw_encap index 0.\n\nIn addition to the set raw_encap/raw_decap commands,\n\n show <raw_encap/raw_decap> <index>\n show <raw_encap/raw_decap> all\n\nare also introduced into in order to check which index is set and to\nwhat.\n\nSigned-off-by: Xiaoyu Min <jackmin@mellanox.com>\n---\n app/test-pmd/cmdline.c | 2 +\n app/test-pmd/cmdline_flow.c | 310 ++++++++++++++++++--\n app/test-pmd/testpmd.h | 2 +\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 57 +++-\n 4 files changed, 331 insertions(+), 40 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex b6bc34b4d2..9a7aae8b0e 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -19017,6 +19017,8 @@ cmdline_parse_ctx_t main_ctx[] = {\n \t(cmdline_parse_inst_t *)&cmd_config_tx_metadata_specific,\n \t(cmdline_parse_inst_t *)&cmd_show_tx_metadata,\n \t(cmdline_parse_inst_t *)&cmd_set_raw,\n+\t(cmdline_parse_inst_t *)&cmd_show_set_raw,\n+\t(cmdline_parse_inst_t *)&cmd_show_set_raw_all,\n \tNULL,\n };\n \ndiff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 495871394e..f5a1178d9d 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -19,7 +19,10 @@\n #include <rte_byteorder.h>\n #include <cmdline_parse.h>\n #include <cmdline_parse_etheraddr.h>\n+#include <cmdline_parse_string.h>\n+#include <cmdline_parse_num.h>\n #include <rte_flow.h>\n+#include <rte_hexdump.h>\n \n #include \"testpmd.h\"\n \n@@ -51,6 +54,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 +301,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 +328,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 +337,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 +345,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 +385,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@@ -902,6 +913,12 @@ static const enum index item_meta[] = {\n \tZERO,\n };\n \n+static const enum index next_set_raw[] = {\n+\tSET_RAW_INDEX,\n+\tITEM_ETH,\n+\tZERO,\n+};\n+\n static const enum index next_action[] = {\n \tACTION_END,\n \tACTION_VOID,\n@@ -1143,6 +1160,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 +1230,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@@ -1260,6 +1295,8 @@ static int comp_vc_action_rss_type(struct context *, const struct token *,\n \t\t\t\t unsigned int, char *, unsigned int);\n static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t\t\t\t unsigned int, char *, unsigned int);\n+static int comp_set_raw_index(struct context *, const struct token *,\n+\t\t\t unsigned int, char *, unsigned int);\n \n /** Token definitions. */\n static const struct token token_list[] = {\n@@ -3095,23 +3132,49 @@ 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.type = \"UNSIGNED\",\n+\t\t.help = \"unsigned integer value\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t.call = parse_vc_action_raw_encap_index,\n+\t\t.comp = comp_set_raw_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_encap_confs\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_RAW_DECAP_INDEX_VALUE)),\n+\t},\n+\t[ACTION_RAW_DECAP_INDEX_VALUE] = {\n+\t\t.name = \"{index}\",\n+\t\t.type = \"UNSIGNED\",\n+\t\t.help = \"unsigned integer value\",\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t.call = parse_vc_action_raw_decap_index,\n+\t\t.comp = comp_set_raw_index,\n+\t},\n \t/* Top level command. */\n \t[SET] = {\n \t\t.name = \"set\",\n \t\t.help = \"set raw encap/decap data\",\n-\t\t.type = \"set raw_encap|raw_decap <pattern>\",\n+\t\t.type = \"set raw_encap|raw_decap <index> <pattern>\",\n \t\t.next = NEXT(NEXT_ENTRY\n \t\t\t (SET_RAW_ENCAP,\n \t\t\t SET_RAW_DECAP)),\n@@ -3121,14 +3184,29 @@ 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_set_raw),\n+\t\t.args = ARGS(ARGS_ENTRY_ARB_BOUNDED\n+\t\t\t\t(offsetof(struct buffer, port),\n+\t\t\t\t sizeof(((struct buffer *)0)->port),\n+\t\t\t\t 0, RAW_ENCAP_CONFS_MAX_NUM - 1)),\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_set_raw),\n+\t\t.args = ARGS(ARGS_ENTRY_ARB_BOUNDED\n+\t\t\t\t(offsetof(struct buffer, port),\n+\t\t\t\t sizeof(((struct buffer *)0)->port),\n+\t\t\t\t 0, RAW_ENCAP_CONFS_MAX_NUM - 1)),\n \t\t.call = parse_set_raw_encap_decap,\n+\t},\n+\t[SET_RAW_INDEX] = {\n+\t\t.name = \"{index}\",\n+\t\t.type = \"UNSIGNED\",\n+\t\t.help = \"index of raw_encap/raw_decap data\",\n+\t\t.next = NEXT(next_item),\n+\t\t.call = parse_port,\n \t}\n };\n \n@@ -4423,6 +4501,84 @@ 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+\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 - 1);\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+\taction_raw_decap_data->conf.data = raw_decap_confs[idx].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+\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 - 1);\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+\taction_raw_encap_data->conf.data = raw_encap_confs[idx].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,8 +4586,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-\tuint8_t *data = NULL;\n+\tstruct action_raw_encap_data *action_raw_encap_data = NULL;\n \tint ret;\n \n \tret = parse_vc(ctx, token, str, len, buf, size);\n@@ -4447,14 +4602,11 @@ 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-\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+\taction_raw_encap_data = ctx->object;\n+\taction_raw_encap_data->conf.data = raw_encap_confs[0].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,8 +4617,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-\tuint8_t *data = NULL;\n+\tstruct action_raw_decap_data *action_raw_decap_data = NULL;\n \tint ret;\n \n \tret = parse_vc(ctx, token, str, len, buf, size);\n@@ -4482,13 +4633,10 @@ 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-\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+\taction_raw_decap_data = ctx->object;\n+\taction_raw_decap_data->conf.data = raw_decap_confs[0].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 +5315,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@@ -5343,6 +5492,24 @@ comp_vc_action_rss_queue(struct context *ctx, const struct token *token,\n \treturn -1;\n }\n \n+/** Complete index number for set raw_encap/raw_decap commands. */\n+static int\n+comp_set_raw_index(struct context *ctx, const struct token *token,\n+\t\t unsigned int ent, char *buf, unsigned int size)\n+{\n+\tuint16_t idx = 0;\n+\tuint16_t nb = 0;\n+\n+\tRTE_SET_USED(ctx);\n+\tRTE_SET_USED(token);\n+\tfor (idx = 0; idx < RAW_ENCAP_CONFS_MAX_NUM; ++idx) {\n+\t\tif (buf && idx == ent)\n+\t\t\treturn snprintf(buf, size, \"%u\", idx);\n+\t\t++nb;\n+\t}\n+\treturn nb;\n+}\n+\n /** Internal context. */\n static struct context cmd_flow_context;\n \n@@ -5777,15 +5944,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@@ -5855,6 +6023,7 @@ cmd_set_raw_parsed(const struct buffer *in)\n \tif (verbose_level & 0x1)\n \t\tprintf(\"total data size is %zu\\n\", (*total_size));\n \tRTE_ASSERT((*total_size) <= ACTION_RAW_ENCAP_MAX_DATA);\n+\tmemmove(data, (data_tail - (*total_size)), *total_size);\n }\n \n /** Populate help strings for current token (cmdline API). */\n@@ -5939,3 +6108,80 @@ cmdline_parse_inst_t cmd_set_raw = {\n \t\tNULL,\n \t}, /**< Tokens are returned by cmd_flow_tok(). */\n };\n+\n+/* *** display raw_encap/raw_decap buf */\n+struct cmd_show_set_raw_result {\n+\tcmdline_fixed_string_t cmd_show;\n+\tcmdline_fixed_string_t cmd_what;\n+\tcmdline_fixed_string_t cmd_all;\n+\tuint16_t cmd_index;\n+};\n+\n+static void\n+cmd_show_set_raw_parsed(void *parsed_result, struct cmdline *cl, void *data)\n+{\n+\tstruct cmd_show_set_raw_result *res = parsed_result;\n+\tuint16_t index = res->cmd_index;\n+\tuint8_t all = 0;\n+\tuint8_t *raw_data = NULL;\n+\tsize_t raw_size = 0;\n+\tchar title[16] = {0};\n+\n+\tRTE_SET_USED(cl);\n+\tRTE_SET_USED(data);\n+\tif (!strcmp(res->cmd_all, \"all\")) {\n+\t\tall = 1;\n+\t\tindex = 0;\n+\t} else if (index >= RAW_ENCAP_CONFS_MAX_NUM) {\n+\t\tprintf(\"index should be 0-%u\\n\", RAW_ENCAP_CONFS_MAX_NUM - 1);\n+\t\treturn;\n+\t}\n+\tdo {\n+\t\tif (!strcmp(res->cmd_what, \"raw_encap\")) {\n+\t\t\traw_data = (uint8_t *)&raw_encap_confs[index].data;\n+\t\t\traw_size = raw_encap_confs[index].size;\n+\t\t\tsnprintf(title, 16, \"\\nindex: %u\", index);\n+\t\t\trte_hexdump(stdout, title, raw_data, raw_size);\n+\t\t} else {\n+\t\t\traw_data = (uint8_t *)&raw_decap_confs[index].data;\n+\t\t\traw_size = raw_decap_confs[index].size;\n+\t\t\tsnprintf(title, 16, \"\\nindex: %u\", index);\n+\t\t\trte_hexdump(stdout, title, raw_data, raw_size);\n+\t\t}\n+\t} while (all && ++index < RAW_ENCAP_CONFS_MAX_NUM);\n+}\n+\n+cmdline_parse_token_string_t cmd_show_set_raw_cmd_show =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,\n+\t\t\tcmd_show, \"show\");\n+cmdline_parse_token_string_t cmd_show_set_raw_cmd_what =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,\n+\t\t\tcmd_what, \"raw_encap#raw_decap\");\n+cmdline_parse_token_num_t cmd_show_set_raw_cmd_index =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_show_set_raw_result,\n+\t\t\tcmd_index, UINT16);\n+cmdline_parse_token_string_t cmd_show_set_raw_cmd_all =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,\n+\t\t\tcmd_all, \"all\");\n+cmdline_parse_inst_t cmd_show_set_raw = {\n+\t.f = cmd_show_set_raw_parsed,\n+\t.data = NULL,\n+\t.help_str = \"show <raw_encap|raw_decap> <index>\",\n+\t.tokens = {\n+\t\t(void *)&cmd_show_set_raw_cmd_show,\n+\t\t(void *)&cmd_show_set_raw_cmd_what,\n+\t\t(void *)&cmd_show_set_raw_cmd_index,\n+\t\tNULL,\n+\t},\n+};\n+cmdline_parse_inst_t cmd_show_set_raw_all = {\n+\t.f = cmd_show_set_raw_parsed,\n+\t.data = NULL,\n+\t.help_str = \"show <raw_encap|raw_decap> all\",\n+\t.tokens = {\n+\t\t(void *)&cmd_show_set_raw_cmd_show,\n+\t\t(void *)&cmd_show_set_raw_cmd_what,\n+\t\t(void *)&cmd_show_set_raw_cmd_all,\n+\t\tNULL,\n+\t},\n+};\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex ce13eb8e6a..a65635d6ff 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -265,6 +265,8 @@ extern struct fwd_engine ieee1588_fwd_engine;\n \n extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */\n extern cmdline_parse_inst_t cmd_set_raw;\n+extern cmdline_parse_inst_t cmd_show_set_raw;\n+extern cmdline_parse_inst_t cmd_show_set_raw_all;\n \n extern uint16_t mempool_flags;\n \ndiff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\nindex 67f4339ca9..1cf9a2bdff 100644\n--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n@@ -540,6 +540,25 @@ Dumps the log level for all the dpdk modules::\n \n testpmd> dump_log_types\n \n+show (raw_encap|raw_decap)\n+~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+Display content of raw_encap/raw_decap buffers in hex::\n+\n+ testpmd> show <raw_encap|raw_decap> <index>\n+ testpmd> show <raw_encap|raw_decap> all\n+\n+For example::\n+\n+ testpmd> show raw_encap 6\n+\n+ index: 6 at [0x1c565b0], len=50\n+ 00000000: 00 00 00 00 00 00 16 26 36 46 56 66 08 00 45 00 | .......&6FVf..E.\n+ 00000010: 00 00 00 00 00 00 00 11 00 00 C0 A8 01 06 C0 A8 | ................\n+ 00000020: 03 06 00 00 00 FA 00 00 00 00 08 00 00 00 00 00 | ................\n+ 00000030: 06 00 | ..\n+\n+\n Configuration Functions\n -----------------------\n \n@@ -1844,12 +1863,22 @@ Config Raw Encapsulation\n Configure the raw data to be used when encapsulating a packet by\n rte_flow_action_raw_encap::\n \n+ set raw_encap {index} {item} [/ {item} [...]] / end_set\n+\n+There are multiple global buffers for ``raw_encap``, this command will set one\n+internal buffer index by ``{index}``.\n+If there is no ``{index}`` specified::\n+\n set raw_encap {item} [/ {item} [...]] / end_set\n \n-This command will set an internal buffer inside testpmd, any following flow rule\n-using the action raw_encap will use the last configuration set.\n-To have a different encapsulation header, this command must be called before the\n-flow rule creation.\n+the default index ``0`` is used.\n+In order to use different encapsulating header, ``index`` must be specified\n+during the flow rule creation::\n+\n+ testpmd> flow create 0 egress pattern eth / ipv4 / end actions\n+ raw_encap index 2 / end\n+\n+Otherwise the default index ``0`` is used.\n \n Config Raw Decapsulation\n ~~~~~~~~~~~~~~~~~~~~~~~~\n@@ -1857,10 +1886,22 @@ Config Raw Decapsulation\n Configure the raw data to be used when decapsulating a packet by\n rte_flow_action_raw_decap::\n \n+ set raw_decap {index} {item} [/ {item} [...]] / end_set\n+\n+There are multiple global buffers for ``raw_decap``, this command will set\n+one internal buffer index by ``{index}``.\n+If there is no ``{index}`` specified::\n+\n set raw_decap {item} [/ {item} [...]] / end_set\n \n-This command will set an internal buffer inside testpmd, any following flow rule\n-using the action raw_decap will use the last configuration set.\n+the default index ``0`` is used.\n+In order to use different decapsulating header, ``index`` must be specified\n+during the flow rule creation::\n+\n+ testpmd> flow create 0 egress pattern eth / ipv4 / end actions\n+ raw_encap index 3 / end\n+\n+Otherwise the default index ``0`` is used.\n \n Port Functions\n --------------\n@@ -4658,11 +4699,11 @@ Raw encapsulation configuration can be set by the following commands\n \n Eecapsulating VxLAN::\n \n- testpmd> set raw_encap eth src is 10:11:22:33:44:55 / vlan tci is 1\n+ testpmd> set raw_encap 4 eth src is 10:11:22:33:44:55 / vlan tci is 1\n inner_type is 0x0800 / ipv4 / udp dst is 4789 / vxlan vni\n is 2 / end_set\n testpmd> flow create 0 egress pattern eth / ipv4 / end actions\n- raw_encap / end\n+ raw_encap index 4 / end\n \n Sample Raw decapsulation rule\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", "prefixes": [] }