From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CA948A00C4; Thu, 29 Sep 2022 11:23:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB1FE4282F; Thu, 29 Sep 2022 11:23:33 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 328D04280D for ; Thu, 29 Sep 2022 11:23:30 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id 012D469; Thu, 29 Sep 2022 12:23:29 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.6 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id 99BEC69; Thu, 29 Sep 2022 12:23:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 99BEC69 Authentication-Results: shelob.oktetlabs.ru/99BEC69; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Ori Kam , Aman Singh , Yuying Zhang , Ray Kinsella , Ajit Khaparde , Somnath Kotur , Thomas Monjalon , Ferruh Yigit Cc: dev@dpdk.org Subject: [PATCH 4/4] ethdev: remove deprecated flow actions to copy TTL Date: Thu, 29 Sep 2022 12:22:56 +0300 Message-Id: <20220929092256.3901308-5-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220929092256.3901308-1-andrew.rybchenko@oktetlabs.ru> References: <20220929092256.3901308-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org These actions are supported by no drivers. The patch breaks ABI. Signed-off-by: Andrew Rybchenko --- app/test-pmd/cmdline_flow.c | 18 ---------- doc/guides/prog_guide/rte_flow.rst | 35 ------------------- doc/guides/rel_notes/deprecation.rst | 4 --- doc/guides/rel_notes/release_22_11.rst | 5 +-- drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c | 8 ----- lib/ethdev/rte_flow.c | 2 -- lib/ethdev/rte_flow.h | 24 ------------- 7 files changed, 3 insertions(+), 93 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 180fe36e25..eb7b4853a5 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -516,8 +516,6 @@ enum index { ACTION_METER_INIT_COLOR, ACTION_METER_STATE, ACTION_OF_DEC_NW_TTL, - ACTION_OF_COPY_TTL_OUT, - ACTION_OF_COPY_TTL_IN, ACTION_OF_POP_VLAN, ACTION_OF_PUSH_VLAN, ACTION_OF_PUSH_VLAN_ETHERTYPE, @@ -1833,8 +1831,6 @@ static const enum index next_action[] = { ACTION_METER_COLOR, ACTION_METER_MARK, ACTION_OF_DEC_NW_TTL, - ACTION_OF_COPY_TTL_OUT, - ACTION_OF_COPY_TTL_IN, ACTION_OF_POP_VLAN, ACTION_OF_PUSH_VLAN, ACTION_OF_SET_VLAN_VID, @@ -5456,20 +5452,6 @@ static const struct token token_list[] = { .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), .call = parse_vc, }, - [ACTION_OF_COPY_TTL_OUT] = { - .name = "of_copy_ttl_out", - .help = "OpenFlow's OFPAT_COPY_TTL_OUT", - .priv = PRIV_ACTION(OF_COPY_TTL_OUT, 0), - .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), - .call = parse_vc, - }, - [ACTION_OF_COPY_TTL_IN] = { - .name = "of_copy_ttl_in", - .help = "OpenFlow's OFPAT_COPY_TTL_IN", - .priv = PRIV_ACTION(OF_COPY_TTL_IN, 0), - .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), - .call = parse_vc, - }, [ACTION_OF_POP_VLAN] = { .name = "of_pop_vlan", .help = "OpenFlow's OFPAT_POP_VLAN", diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 69a0fac619..bdd07a2062 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2140,41 +2140,6 @@ Implements ``OFPAT_DEC_NW_TTL`` ("decrement IP TTL") as defined by the | no properties | +---------------+ -Action: ``OF_COPY_TTL_OUT`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^ -This action is deprecated. Consider `Action: MODIFY_FIELD`_. - -Implements ``OFPAT_COPY_TTL_OUT`` ("copy TTL "outwards" -- from -next-to-outermost to outermost") as defined by the `OpenFlow Switch -Specification`_. - -.. _table_rte_flow_action_of_copy_ttl_out: - -.. table:: OF_COPY_TTL_OUT - - +---------------+ - | Field | - +===============+ - | no properties | - +---------------+ - -Action: ``OF_COPY_TTL_IN`` -^^^^^^^^^^^^^^^^^^^^^^^^^^ -This action is deprecated. Consider `Action: MODIFY_FIELD`_. - -Implements ``OFPAT_COPY_TTL_IN`` ("copy TTL "inwards" -- from outermost to -next-to-outermost") as defined by the `OpenFlow Switch Specification`_. - -.. _table_rte_flow_action_of_copy_ttl_in: - -.. table:: OF_COPY_TTL_IN - - +---------------+ - | Field | - +===============+ - | no properties | - +---------------+ - Action: ``OF_POP_VLAN`` ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 83654b8c1a..8c40048471 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -105,10 +105,6 @@ Deprecation Notices is deprecated as ambiguous with respect to the embedded switch. The use of these attributes will become invalid starting from DPDK 22.11. -* ethdev: Actions - ``OF_COPY_TTL_OUT``, ``OF_COPY_TTL_IN`` are deprecated as not supported by - any PMD, so they will be removed in DPDK 22.11. - * ethdev: Actions ``OF_DEC_NW_TTL``, ``SET_IPV4_SRC``, ``SET_IPV4_DST``, ``SET_IPV6_SRC``, ``SET_IPV6_DST``, ``SET_TP_SRC``, ``SET_TP_DST``, ``DEC_TTL``, ``SET_TTL``, ``SET_MAC_SRC``, ``SET_MAC_DST``, ``INC_TCP_SEQ``, diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 0473fbe9a2..c1caf8df40 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -109,8 +109,9 @@ Removed Items * ethdev: removed ``RTE_FLOW_ACTION_TYPE_PHY_PORT``; use ``RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT``. -* ethdev: removed ``OF_SET_MPLS_TTL``, ``OF_DEC_MPLS_TTL`` and - ``OF_SET_NW_TTL`` which are not actually supported by any PMD. +* ethdev: removed ``OF_SET_MPLS_TTL``, ``OF_DEC_MPLS_TTL``, + ``OF_SET_NW_TTL``, ``OF_COPY_TTL_OUT`` and ``OF_COPY_TTL_IN`` + which are not actually supported by any PMD. ``MODIFY_FIELD`` action should be used to do packet edits via RTE flow API. diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c index 3730029f2f..9cf1ebfe1d 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c @@ -77,14 +77,6 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = { .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, .proto_act_func = NULL }, - [RTE_FLOW_ACTION_TYPE_OF_COPY_TTL_OUT] = { - .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, - .proto_act_func = NULL - }, - [RTE_FLOW_ACTION_TYPE_OF_COPY_TTL_IN] = { - .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, - .proto_act_func = NULL - }, [RTE_FLOW_ACTION_TYPE_OF_POP_VLAN] = { .act_type = BNXT_ULP_ACT_TYPE_SUPPORTED, .proto_act_func = ulp_rte_of_pop_vlan_act_handler diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index dc54f5197e..a8b712acf5 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -193,8 +193,6 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { MK_FLOW_ACTION(METER, sizeof(struct rte_flow_action_meter)), MK_FLOW_ACTION(SECURITY, sizeof(struct rte_flow_action_security)), MK_FLOW_ACTION(OF_DEC_NW_TTL, 0), - MK_FLOW_ACTION(OF_COPY_TTL_OUT, 0), - MK_FLOW_ACTION(OF_COPY_TTL_IN, 0), MK_FLOW_ACTION(OF_POP_VLAN, 0), MK_FLOW_ACTION(OF_PUSH_VLAN, sizeof(struct rte_flow_action_of_push_vlan)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index f1ed44a01a..a59e815a51 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -2286,30 +2286,6 @@ enum rte_flow_action_type { */ RTE_FLOW_ACTION_TYPE_OF_DEC_NW_TTL, - /** - * @deprecated - * @see RTE_FLOW_ACTION_TYPE_MODIFY_FIELD - * - * Implements OFPAT_COPY_TTL_OUT ("copy TTL "outwards" -- from - * next-to-outermost to outermost") as defined by the OpenFlow - * Switch Specification. - * - * No associated configuration structure. - */ - RTE_FLOW_ACTION_TYPE_OF_COPY_TTL_OUT, - - /** - * @deprecated - * @see RTE_FLOW_ACTION_TYPE_MODIFY_FIELD - * - * Implements OFPAT_COPY_TTL_IN ("copy TTL "inwards" -- from - * outermost to next-to-outermost") as defined by the OpenFlow - * Switch Specification. - * - * No associated configuration structure. - */ - RTE_FLOW_ACTION_TYPE_OF_COPY_TTL_IN, - /** * Implements OFPAT_POP_VLAN ("pop the outer VLAN tag") as defined * by the OpenFlow Switch Specification. -- 2.30.2