Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/46318/?format=api
{ "id": 46318, "url": "http://patches.dpdk.org/api/patches/46318/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/5adde6f8fdbfe12f885c343b6189e6d31c03c434.1539073823.git.rahul.lakkireddy@chelsio.com/", "project": { "id": 1, "url": "http://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": "<5adde6f8fdbfe12f885c343b6189e6d31c03c434.1539073823.git.rahul.lakkireddy@chelsio.com>", "list_archive_url": "https://inbox.dpdk.org/dev/5adde6f8fdbfe12f885c343b6189e6d31c03c434.1539073823.git.rahul.lakkireddy@chelsio.com", "date": "2018-10-09T08:44:36", "name": "[v3,1/3] ethdev: add flow api actions to modify IP addresses", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e085fa4313c26222ad06f15c22410862414bf784", "submitter": { "id": 241, "url": "http://patches.dpdk.org/api/people/241/?format=api", "name": "Rahul Lakkireddy", "email": "rahul.lakkireddy@chelsio.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/5adde6f8fdbfe12f885c343b6189e6d31c03c434.1539073823.git.rahul.lakkireddy@chelsio.com/mbox/", "series": [ { "id": 1769, "url": "http://patches.dpdk.org/api/series/1769/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1769", "date": "2018-10-09T08:44:35", "name": "ethdev: add IP address and TCP/UDP port rewrite actions to flow API", "version": 3, "mbox": "http://patches.dpdk.org/series/1769/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/46318/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/46318/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 7D2B25F65;\n\tTue, 9 Oct 2018 10:45:04 +0200 (CEST)", "from stargate.chelsio.com (stargate.chelsio.com [12.32.117.8])\n\tby dpdk.org (Postfix) with ESMTP id 4A4F05F30\n\tfor <dev@dpdk.org>; Tue, 9 Oct 2018 10:45:02 +0200 (CEST)", "from localhost (scalar.blr.asicdesigners.com [10.193.185.94])\n\tby stargate.chelsio.com (8.13.8/8.13.8) with ESMTP id w998ixeK020822; \n\tTue, 9 Oct 2018 01:45:00 -0700" ], "From": "Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>", "To": "dev@dpdk.org", "Cc": "indranil@chelsio.com, nirranjan@chelsio.com", "Date": "Tue, 9 Oct 2018 14:14:36 +0530", "Message-Id": "<5adde6f8fdbfe12f885c343b6189e6d31c03c434.1539073823.git.rahul.lakkireddy@chelsio.com>", "X-Mailer": "git-send-email 2.5.3", "In-Reply-To": [ "<cover.1539073823.git.rahul.lakkireddy@chelsio.com>", "<cover.1539073823.git.rahul.lakkireddy@chelsio.com>" ], "References": [ "<1538840520-10369-1-git-send-email-rahul.lakkireddy@chelsio.com>\n\t<cover.1539073823.git.rahul.lakkireddy@chelsio.com>", "<cover.1539073823.git.rahul.lakkireddy@chelsio.com>" ], "Subject": "[dpdk-dev] [PATCH v3 1/3] ethdev: add flow api actions to modify IP\n\taddresses", "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": "Add actions:\n- SET_IPV4_SRC - set a new IPv4 source address.\n- SET_IPV4_DST - set a new IPv4 destination address.\n- SET_IPV6_SRC - set a new IPv6 source address.\n- SET_IPV6_DST - set a new IPv6 destination address.\n\nOriginal work by Shagun Agrawal\n\nSigned-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>\nAcked-by: Xiaoyu Min <jackmin@mellanox.com>\nAcked-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\nv3:\n- Replaced uint32_t with rte_be32_t to reflect the byte order of\n the new IPv4 addresses to rewrite.\n\nv2:\n- Rebased to tip.\n- Removed adding actions to app/test-pmd/config.c, to sync with\n rte_flow_conv() changes.\n\nv1 changes since RFC v2:\n- Updated comments, help messages, and doc to indicate that IP/TCP/UDP\n of the outermost headers are modified.\n- Updated comments and doc to indicate that a corresponding valid flow\n pattern item must be specified to offload corresponding header rewrite\n action.\n- Updated release notes.\n\n app/test-pmd/cmdline_flow.c | 104 ++++++++++++++++++++\n doc/guides/prog_guide/rte_flow.rst | 72 ++++++++++++++\n doc/guides/rel_notes/release_18_11.rst | 7 ++\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 18 ++++\n lib/librte_ethdev/rte_flow.c | 8 ++\n lib/librte_ethdev/rte_flow.h | 70 +++++++++++++\n 6 files changed, 279 insertions(+)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex f9260600e..1432498a3 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -243,6 +243,14 @@ enum index {\n \tACTION_VXLAN_DECAP,\n \tACTION_NVGRE_ENCAP,\n \tACTION_NVGRE_DECAP,\n+\tACTION_SET_IPV4_SRC,\n+\tACTION_SET_IPV4_SRC_IPV4_SRC,\n+\tACTION_SET_IPV4_DST,\n+\tACTION_SET_IPV4_DST_IPV4_DST,\n+\tACTION_SET_IPV6_SRC,\n+\tACTION_SET_IPV6_SRC_IPV6_SRC,\n+\tACTION_SET_IPV6_DST,\n+\tACTION_SET_IPV6_DST_IPV6_DST,\n };\n \n /** Maximum size for pattern in struct rte_flow_item_raw. */\n@@ -816,6 +824,10 @@ static const enum index next_action[] = {\n \tACTION_VXLAN_DECAP,\n \tACTION_NVGRE_ENCAP,\n \tACTION_NVGRE_DECAP,\n+\tACTION_SET_IPV4_SRC,\n+\tACTION_SET_IPV4_DST,\n+\tACTION_SET_IPV6_SRC,\n+\tACTION_SET_IPV6_DST,\n \tZERO,\n };\n \n@@ -918,6 +930,30 @@ static const enum index action_of_push_mpls[] = {\n \tZERO,\n };\n \n+static const enum index action_set_ipv4_src[] = {\n+\tACTION_SET_IPV4_SRC_IPV4_SRC,\n+\tACTION_NEXT,\n+\tZERO,\n+};\n+\n+static const enum index action_set_ipv4_dst[] = {\n+\tACTION_SET_IPV4_DST_IPV4_DST,\n+\tACTION_NEXT,\n+\tZERO,\n+};\n+\n+static const enum index action_set_ipv6_src[] = {\n+\tACTION_SET_IPV6_SRC_IPV6_SRC,\n+\tACTION_NEXT,\n+\tZERO,\n+};\n+\n+static const enum index action_set_ipv6_dst[] = {\n+\tACTION_SET_IPV6_DST_IPV6_DST,\n+\tACTION_NEXT,\n+\tZERO,\n+};\n+\n static const enum index action_jump[] = {\n \tACTION_JUMP_GROUP,\n \tACTION_NEXT,\n@@ -2470,6 +2506,74 @@ static const struct token token_list[] = {\n \t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n \t\t.call = parse_vc,\n \t},\n+\t[ACTION_SET_IPV4_SRC] = {\n+\t\t.name = \"set_ipv4_src\",\n+\t\t.help = \"Set a new IPv4 source address in the outermost\"\n+\t\t\t\" IPv4 header\",\n+\t\t.priv = PRIV_ACTION(SET_IPV4_SRC,\n+\t\t\tsizeof(struct rte_flow_action_set_ipv4)),\n+\t\t.next = NEXT(action_set_ipv4_src),\n+\t\t.call = parse_vc,\n+\t},\n+\t[ACTION_SET_IPV4_SRC_IPV4_SRC] = {\n+\t\t.name = \"ipv4_addr\",\n+\t\t.help = \"new IPv4 source address to set\",\n+\t\t.next = NEXT(action_set_ipv4_src, NEXT_ENTRY(IPV4_ADDR)),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON\n+\t\t\t(struct rte_flow_action_set_ipv4, ipv4_addr)),\n+\t\t.call = parse_vc_conf,\n+\t},\n+\t[ACTION_SET_IPV4_DST] = {\n+\t\t.name = \"set_ipv4_dst\",\n+\t\t.help = \"Set a new IPv4 destination address in the outermost\"\n+\t\t\t\" IPv4 header\",\n+\t\t.priv = PRIV_ACTION(SET_IPV4_DST,\n+\t\t\tsizeof(struct rte_flow_action_set_ipv4)),\n+\t\t.next = NEXT(action_set_ipv4_dst),\n+\t\t.call = parse_vc,\n+\t},\n+\t[ACTION_SET_IPV4_DST_IPV4_DST] = {\n+\t\t.name = \"ipv4_addr\",\n+\t\t.help = \"new IPv4 destination address to set\",\n+\t\t.next = NEXT(action_set_ipv4_dst, NEXT_ENTRY(IPV4_ADDR)),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON\n+\t\t\t(struct rte_flow_action_set_ipv4, ipv4_addr)),\n+\t\t.call = parse_vc_conf,\n+\t},\n+\t[ACTION_SET_IPV6_SRC] = {\n+\t\t.name = \"set_ipv6_src\",\n+\t\t.help = \"Set a new IPv6 source address in the outermost\"\n+\t\t\t\" IPv6 header\",\n+\t\t.priv = PRIV_ACTION(SET_IPV6_SRC,\n+\t\t\tsizeof(struct rte_flow_action_set_ipv6)),\n+\t\t.next = NEXT(action_set_ipv6_src),\n+\t\t.call = parse_vc,\n+\t},\n+\t[ACTION_SET_IPV6_SRC_IPV6_SRC] = {\n+\t\t.name = \"ipv6_addr\",\n+\t\t.help = \"new IPv6 source address to set\",\n+\t\t.next = NEXT(action_set_ipv6_src, NEXT_ENTRY(IPV6_ADDR)),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON\n+\t\t\t(struct rte_flow_action_set_ipv6, ipv6_addr)),\n+\t\t.call = parse_vc_conf,\n+\t},\n+\t[ACTION_SET_IPV6_DST] = {\n+\t\t.name = \"set_ipv6_dst\",\n+\t\t.help = \"Set a new IPv6 destination address in the outermost\"\n+\t\t\t\" IPv6 header\",\n+\t\t.priv = PRIV_ACTION(SET_IPV6_DST,\n+\t\t\tsizeof(struct rte_flow_action_set_ipv6)),\n+\t\t.next = NEXT(action_set_ipv6_dst),\n+\t\t.call = parse_vc,\n+\t},\n+\t[ACTION_SET_IPV6_DST_IPV6_DST] = {\n+\t\t.name = \"ipv6_addr\",\n+\t\t.help = \"new IPv6 destination address to set\",\n+\t\t.next = NEXT(action_set_ipv6_dst, NEXT_ENTRY(IPV6_ADDR)),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON\n+\t\t\t(struct rte_flow_action_set_ipv6, ipv6_addr)),\n+\t\t.call = parse_vc_conf,\n+\t},\n };\n \n /** Remove and return last entry from argument stack. */\ndiff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst\nindex 1b17f6e01..9272cd710 100644\n--- a/doc/guides/prog_guide/rte_flow.rst\n+++ b/doc/guides/prog_guide/rte_flow.rst\n@@ -2076,6 +2076,78 @@ RTE_FLOW_ERROR_TYPE_ACTION error should be returned.\n \n This action modifies the payload of matched flows.\n \n+Action: ``SET_IPV4_SRC``\n+^^^^^^^^^^^^^^^^^^^^^^^^\n+\n+Set a new IPv4 source address in the outermost IPv4 header.\n+\n+It must be used with a valid RTE_FLOW_ITEM_TYPE_IPV4 flow pattern item.\n+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.\n+\n+.. _table_rte_flow_action_set_ipv4_src:\n+\n+.. table:: SET_IPV4_SRC\n+\n+ +-----------------------------------------+\n+ | Field | Value |\n+ +===============+=========================+\n+ | ``ipv4_addr`` | new IPv4 source address |\n+ +---------------+-------------------------+\n+\n+Action: ``SET_IPV4_DST``\n+^^^^^^^^^^^^^^^^^^^^^^^^\n+\n+Set a new IPv4 destination address in the outermost IPv4 header.\n+\n+It must be used with a valid RTE_FLOW_ITEM_TYPE_IPV4 flow pattern item.\n+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.\n+\n+.. _table_rte_flow_action_set_ipv4_dst:\n+\n+.. table:: SET_IPV4_DST\n+\n+ +---------------+------------------------------+\n+ | Field | Value |\n+ +===============+==============================+\n+ | ``ipv4_addr`` | new IPv4 destination address |\n+ +---------------+------------------------------+\n+\n+Action: ``SET_IPV6_SRC``\n+^^^^^^^^^^^^^^^^^^^^^^^^\n+\n+Set a new IPv6 source address in the outermost IPv6 header.\n+\n+It must be used with a valid RTE_FLOW_ITEM_TYPE_IPV6 flow pattern item.\n+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.\n+\n+.. _table_rte_flow_action_set_ipv6_src:\n+\n+.. table:: SET_IPV6_SRC\n+\n+ +---------------+-------------------------+\n+ | Field | Value |\n+ +===============+=========================+\n+ | ``ipv6_addr`` | new IPv6 source address |\n+ +---------------+-------------------------+\n+\n+Action: ``SET_IPV6_DST``\n+^^^^^^^^^^^^^^^^^^^^^^^^\n+\n+Set a new IPv6 destination address in the outermost IPv6 header.\n+\n+It must be used with a valid RTE_FLOW_ITEM_TYPE_IPV6 flow pattern item.\n+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.\n+\n+.. _table_rte_flow_action_set_ipv6_dst:\n+\n+.. table:: SET_IPV6_DST\n+\n+ +---------------+------------------------------+\n+ | Field | Value |\n+ +===============+==============================+\n+ | ``ipv6_addr`` | new IPv6 destination address |\n+ +---------------+------------------------------+\n+\n Negative types\n ~~~~~~~~~~~~~~\n \ndiff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst\nindex 89ca3317f..12b99de37 100644\n--- a/doc/guides/rel_notes/release_18_11.rst\n+++ b/doc/guides/rel_notes/release_18_11.rst\n@@ -130,6 +130,13 @@ New Features\n this application doesn't need to launch dedicated worker threads for vhost\n enqueue/dequeue operations.\n \n+* **Added new Flow API actions to rewrite fields in packet headers.**\n+\n+ Added new Flow API actions to:\n+\n+ * Modify source and destination IP addresses in the outermost IPv4/IPv6\n+ headers.\n+\n API Changes\n -----------\n \ndiff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\nindex 3a73000a6..97d91f066 100644\n--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n@@ -3704,6 +3704,24 @@ This section lists supported actions and their attributes, if any.\n - ``nvgre_decap``: Performs a decapsulation action by stripping all headers of\n the NVGRE tunnel network overlay from the matched flow.\n \n+- ``set_ipv4_src``: Set a new IPv4 source address in the outermost IPv4 header.\n+\n+ - ``ipv4_addr``: New IPv4 source address.\n+\n+- ``set_ipv4_dst``: Set a new IPv4 destination address in the outermost IPv4\n+ header.\n+\n+ - ``ipv4_addr``: New IPv4 destination address.\n+\n+- ``set_ipv6_src``: Set a new IPv6 source address in the outermost IPv6 header.\n+\n+ - ``ipv6_addr``: New IPv6 source address.\n+\n+- ``set_ipv6_dst``: Set a new IPv6 destination address in the outermost IPv6\n+ header.\n+\n+ - ``ipv6_addr``: New IPv6 destination address.\n+\n Destroying flow rules\n ~~~~~~~~~~~~~~~~~~~~~\n \ndiff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c\nindex 9c56a9734..9440b63a9 100644\n--- a/lib/librte_ethdev/rte_flow.c\n+++ b/lib/librte_ethdev/rte_flow.c\n@@ -123,6 +123,14 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = {\n \tMK_FLOW_ACTION(VXLAN_DECAP, 0),\n \tMK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)),\n \tMK_FLOW_ACTION(NVGRE_DECAP, 0),\n+\tMK_FLOW_ACTION(SET_IPV4_SRC,\n+\t\t sizeof(struct rte_flow_action_set_ipv4)),\n+\tMK_FLOW_ACTION(SET_IPV4_DST,\n+\t\t sizeof(struct rte_flow_action_set_ipv4)),\n+\tMK_FLOW_ACTION(SET_IPV6_SRC,\n+\t\t sizeof(struct rte_flow_action_set_ipv6)),\n+\tMK_FLOW_ACTION(SET_IPV6_DST,\n+\t\t sizeof(struct rte_flow_action_set_ipv6)),\n };\n \n static int\ndiff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h\nindex f062ffead..942165f63 100644\n--- a/lib/librte_ethdev/rte_flow.h\n+++ b/lib/librte_ethdev/rte_flow.h\n@@ -1506,6 +1506,46 @@ enum rte_flow_action_type {\n \t * error.\n \t */\n \tRTE_FLOW_ACTION_TYPE_NVGRE_DECAP,\n+\n+\t/**\n+\t * Modify IPv4 source address in the outermost IPv4 header.\n+\t *\n+\t * If flow pattern does not define a valid RTE_FLOW_ITEM_TYPE_IPV4,\n+\t * then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION error.\n+\t *\n+\t * See struct rte_flow_action_set_ipv4.\n+\t */\n+\tRTE_FLOW_ACTION_TYPE_SET_IPV4_SRC,\n+\n+\t/**\n+\t * Modify IPv4 destination address in the outermost IPv4 header.\n+\t *\n+\t * If flow pattern does not define a valid RTE_FLOW_ITEM_TYPE_IPV4,\n+\t * then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION error.\n+\t *\n+\t * See struct rte_flow_action_set_ipv4.\n+\t */\n+\tRTE_FLOW_ACTION_TYPE_SET_IPV4_DST,\n+\n+\t/**\n+\t * Modify IPv6 source address in the outermost IPv6 header.\n+\t *\n+\t * If flow pattern does not define a valid RTE_FLOW_ITEM_TYPE_IPV6,\n+\t * then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION error.\n+\t *\n+\t * See struct rte_flow_action_set_ipv6.\n+\t */\n+\tRTE_FLOW_ACTION_TYPE_SET_IPV6_SRC,\n+\n+\t/**\n+\t * Modify IPv6 destination address in the outermost IPv6 header.\n+\t *\n+\t * If flow pattern does not define a valid RTE_FLOW_ITEM_TYPE_IPV6,\n+\t * then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION error.\n+\t *\n+\t * See struct rte_flow_action_set_ipv6.\n+\t */\n+\tRTE_FLOW_ACTION_TYPE_SET_IPV6_DST,\n };\n \n /**\n@@ -1869,6 +1909,36 @@ struct rte_flow_action_nvgre_encap {\n \tstruct rte_flow_item *definition;\n };\n \n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this structure may change without prior notice\n+ *\n+ * RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC\n+ * RTE_FLOW_ACTION_TYPE_SET_IPV4_DST\n+ *\n+ * Allows modification of IPv4 source (RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC)\n+ * and destination address (RTE_FLOW_ACTION_TYPE_SET_IPV4_DST) in the\n+ * specified outermost IPv4 header.\n+ */\n+struct rte_flow_action_set_ipv4 {\n+\trte_be32_t ipv4_addr;\n+};\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this structure may change without prior notice\n+ *\n+ * RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC\n+ * RTE_FLOW_ACTION_TYPE_SET_IPV6_DST\n+ *\n+ * Allows modification of IPv6 source (RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC)\n+ * and destination address (RTE_FLOW_ACTION_TYPE_SET_IPV6_DST) in the\n+ * specified outermost IPv6 header.\n+ */\n+struct rte_flow_action_set_ipv6 {\n+\tuint8_t ipv6_addr[16];\n+};\n+\n /*\n * Definition of a single action.\n *\n", "prefixes": [ "v3", "1/3" ] }