From patchwork Mon Apr 16 06:10:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 38170 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C356B1B1EE; Mon, 16 Apr 2018 08:10:43 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id C064E1B1DC for ; Mon, 16 Apr 2018 08:10:39 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Apr 2018 23:10:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,458,1517904000"; d="scan'208";a="33655056" Received: from dpdk51.sh.intel.com ([10.67.110.184]) by orsmga007.jf.intel.com with ESMTP; 15 Apr 2018 23:10:37 -0700 From: Qi Zhang To: adrien.mazarguil@6wind.com Cc: dev@dpdk.org, declan.doherty@intel.com, sugesh.chandran@intel.com, michael.j.glynn@intel.com, yu.y.liu@intel.com, konstantin.ananyev@intel.com, bruce.richardson@intel.com, Qi Zhang Date: Mon, 16 Apr 2018 14:10:41 +0800 Message-Id: <20180416061042.785-4-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180416061042.785-1-qi.z.zhang@intel.com> References: <1522279780-34842-1-git-send-email-qi.z.zhang@intel.com> <20180416061042.785-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH v3 3/4] ethdev: add TTL change actions in flow API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add couple OpenFlow frienldy TTL change actions. RTE_FLOW_ACTION_MLPS_TTL_DEC - decrement MPLS TTL. RTE_FLOW_ACTION_IP_TTL_DEC - decrement IP TTL. RTE_FLOW_ACTION_TTL_COPY_OUT - copy TTL outwards. RTE_FLOW_ACTION_TTL_COPY_IN - copy TTL inwards. Signed-off-by: Qi Zhang --- app/test-pmd/cmdline_flow.c | 64 +++++++++++++++++++++++ doc/guides/prog_guide/rte_flow.rst | 80 +++++++++++++++++++++++++++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 12 +++++ lib/librte_ether/rte_flow.h | 77 +++++++++++++++++++++++++++ 4 files changed, 233 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 7950b1b8d..417cbecc9 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -195,6 +195,12 @@ enum index { ACTION_VF_ID, ACTION_METER, ACTION_METER_ID, + ACTION_MPLS_TTL_DEC, + ACTION_MPLS_TTL_DEC_LVL, + ACTION_IP_TTL_DEC, + ACTION_IP_TTL_DEC_LVL, + ACTION_TTL_COPY_OUT, + ACTION_TTL_COPY_IN, }; /** Size of pattern[] field in struct rte_flow_item_raw. */ @@ -668,6 +674,10 @@ static const enum index next_action[] = { ACTION_PF, ACTION_VF, ACTION_METER, + ACTION_MPLS_TTL_DEC, + ACTION_IP_TTL_DEC, + ACTION_TTL_COPY_OUT, + ACTION_TTL_COPY_IN, ZERO, }; @@ -708,6 +718,16 @@ static const enum index action_meter[] = { ZERO, }; +static const enum index action_mpls_ttl_dec[] = { + ACTION_MPLS_TTL_DEC_LVL, + ZERO, +}; + +static const enum index action_ip_ttl_dec[] = { + ACTION_IP_TTL_DEC_LVL, + ZERO, +}; + static int parse_init(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -1857,6 +1877,50 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter, mtr_id)), .call = parse_vc_conf, }, + [ACTION_MPLS_TTL_DEC] = { + .name = "mpls_ttl_dec", + .help = "decrement MPLS TTL", + .priv = PRIV_ACTION(MPLS_TTL_DEC, + sizeof(struct rte_flow_action_mpls_ttl_dec)), + .next = NEXT(action_mpls_ttl_dec), + .call = parse_vc, + }, + [ACTION_MPLS_TTL_DEC_LVL] = { + .name = "level", + .help = "level of MPLS header", + .next = NEXT(action_mpls_ttl_dec, NEXT_ENTRY(UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)), + .call = parse_vc, + }, + [ACTION_IP_TTL_DEC] = { + .name = "ip_ttl_dec", + .help = "decrement IPv4 TTL or IPv6 Hop Limit", + .priv = PRIV_ACTION(MPLS_TTL_DEC, + sizeof(struct rte_flow_action_ip_ttl_dec)), + .next = NEXT(action_ip_ttl_dec), + .call = parse_vc, + }, + [ACTION_IP_TTL_DEC_LVL] = { + .name = "level", + .help = "level of IPv4 or IPv6 header", + .next = NEXT(action_ip_ttl_dec, NEXT_ENTRY(UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)), + .call = parse_vc, + }, + [ACTION_TTL_COPY_OUT] = { + .name = "ttl_copy_out", + .help = "copy TTL outwards", + .priv = PRIV_ACTION(DROP, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, + [ACTION_TTL_COPY_IN] = { + .name = "ttl_copy_in", + .help = "copy TTL inwards", + .priv = PRIV_ACTION(DROP, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, }; /** Remove and return last entry from argument stack. */ diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 68deb9812..65f2d4a16 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1604,6 +1604,86 @@ contain respective protocol layer. | ``mask`` | Bit-mask applied to new_val | +---------------+-------------------------------------------------------------------+ +Action: ``MPLS_TTL_DEC`` +^^^^^^^^^^^^^^^^^^^^^^^^ + +Decrement MPLS TTL, only applies to packets that contain specific MPLS +headers. + +.. _table_rte_flow_action_mpls_ttl_dec: + +.. table:: MPLS_TTL_DEC + + +---------------+---------------------------------------------+ + | Field | Value | + +===============+=============================================+ + | ``dir_level`` | Specify the level of MPLS header. | + | | direction (1b) | + | | 0: match start from outermost. | + | | 1: match start from innermost. | + | | level: (31b) | + | | 0: outermost or innermost MPLS header | + | | 1: next to outmost or innermost MPLS header | + | | 2: and so on ... | + +---------------+---------------------------------------------+ + +Action: ``IP_TTL_DEC`` +^^^^^^^^^^^^^^^^^^^^^^ + +Decrement IPv4 TTL or IPv6 hop limit field and update the IP checksum, +only applies to packets that contain specific MPLS headers. + +.. _table_rte_flow_action_ip_ttl_dec: + +.. table:: IP_TTL_DEC + + +---------------+----------------------------------------------------------+ + | Field | Value | + +===============+==========================================================+ + | ``dir_level`` | Specify the level of IPv4 or IPv6 header. | + | | direction (1b) | + | | 0: match start from outermost. | + | | 1: match start from innermost. | + | | level: (31b) | + | | 0: outermost or innermost Ipv4 or IPv6 header | + | | 1: next to outmost or innermost MPLS IPv4 or IPv6 header | + | | 2: and so on ... | + +---------------+----------------------------------------------------------+ + +Action: ``TTL_COPY_OUT`` +^^^^^^^^^^^^^^^^^^^^^^^^ + +Copy the TTL from next-to-outermost to outermost header with TTL, copy can +be IP to IP, MPLS to MPLS or IP to MPLS, only applies packets that contain +required MPLS or IP headers. + +.. _table_rte_flow_action_ttl_copy_out: + +.. table:: TTL_COPY_OUT + + +---------------+ + | Field | + +===============+ + | no properties | + +---------------+ + +Action: ``TTL_COPY_IN`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Copy the TTL from outermost to next-to-outermost header with TTL, copy can +be IP to IP, MPLS to MPLS or MPLS to IP, only applies packets that contain +required MPLS or IP headers. + +.. _table_rte_flow_action_ttl_copy_in: + +.. table:: TTL_COPY_IN + + +---------------+ + | Field | + +===============+ + | no properties | + +---------------+ + Negative types ~~~~~~~~~~~~~~ diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 12d78f10b..d2fe6637b 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3449,6 +3449,18 @@ This section lists supported actions and their attributes, if any. - ``original {boolean}``: use original VF ID if possible. - ``id {unsigned}``: VF ID to redirect packets to. +- ``mpls_ttl_dec``: decrement MPLS TTL. + + - ``level``: level of MPLS header. + +- ``ip_ttl_dec``: decrement IPv4 TTL or IPv6 Hot Limit. + + - ``level``: level of IPv4 or IPv6 header. + +- ``ttl_copy_out``: copy TTL outwards. + +- ``ttl_copy_in``: copy TTL inwards. + Destroying flow rules ~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index 2dc95b6b8..ab181cd83 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -1254,6 +1254,37 @@ enum rte_flow_action_type { * See struct rte_flow_action_field_set. */ RTE_FLOW_ACTION_TYPE_FIELD_SET, + + /** + * Decrement MPLS TTL, only applies to packets that contain specific + * MPLS header. + * + * See struct rte_flow_action_mpls_ttl_dec. + */ + RTE_FLOW_ACTION_TYPE_MPLS_TTL_DEC, + + /** + * Decrement IPv4 TTL or IPv6 Hop limit field and update the IP + * checksum, only applies to packets that contain specific IPv4 + * or IPv6 header. + * + * See struct rte_flow_action_ip_ttl_dec. + */ + RTE_FLOW_ACTION_TYPE_IP_TTL_DEC, + + /** + * Copy the TTL from next-to-outermost to outermost header with TTL, + * copy can be IP to IP, MPLS to MPLS or IP to MPLS, only applies + * packets that contain required protocol headers. + */ + RTE_FLOW_ACTION_TYPE_TTL_COPY_OUT, + + /** + * Copy the TTL from outermost to next-to-outermost header with TTL, + * copy can be IP to IP, MPLS to MPLS or MPLS to IP, only applies + * packets that contain required protocol headers. + */ + RTE_FLOW_ACTION_TYPE_TTL_COPY_IN, }; /** @@ -1424,6 +1455,52 @@ struct rte_flow_action_field_set { }; /** + * RTE_FLOW_ACTION_TYPE_MPLS_TTL_DEC + * + * Decrement MPLS TTL, only applies to packets that contain specific + * MPLS header. + */ +struct rte_flow_action_mpls_ttl_dec { + /** + * Specify the level of MPLS header. + * + * direction (1b) + * 0: match start from outermost. + * 1: match start from innermost. + * + * level (31b) + * 0: outermost|innermost MPLS header. + * 1: next to outermost|innermost MPLS header. + * 2: and so on ... + */ + uint32_t dir_level; + +}; + +/** + * RTE_FLOW_ACTION_TYPE_IP_TTL_DEC + * + * Decrement IPv4 TTL or IPv6 hop limit field and update the IP + * checksum, only applies to packets that contain specific IPv4 + * or IPv6 header. + */ +struct rte_flow_action_ip_ttl_dec { + /** + * Specify the level of IPv4 or IPv6 header. + * + * direction (1b) + * 0: match start from outermost. + * 1: match start from innermost. + * + * level (31b) + * 0: outermost|innermost IPv4 or IPv6 header. + * 1: next to outermost|innermost IPv4 or IPv6 header. + * 2: and so on ... + */ + uint32_t dir_level; +}; + +/** * Definition of a single action. * * A list of actions is terminated by a END action.