From patchwork Thu Sep 29 09:22:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 117106 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E814CA00C4; Thu, 29 Sep 2022 11:23:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 149AF41140; Thu, 29 Sep 2022 11:23:28 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id DA86E4113C for ; Thu, 29 Sep 2022 11:23:25 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 115) id 549C183; Thu, 29 Sep 2022 12:23:25 +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 D29E166; Thu, 29 Sep 2022 12:23:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru D29E166 Authentication-Results: shelob.oktetlabs.ru/D29E166; 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 1/4] ethdev: remove deprecated flow action to set MPLS TTL Date: Thu, 29 Sep 2022 12:22:53 +0300 Message-Id: <20220929092256.3901308-2-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 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 The action is supported by no drivers. The patch breaks ABI. Signed-off-by: Andrew Rybchenko Acked-by: Ajit Khaparde --- app/test-pmd/cmdline_flow.c | 27 ------------------- doc/guides/prog_guide/rte_flow.rst | 17 ------------ doc/guides/rel_notes/deprecation.rst | 2 +- doc/guides/rel_notes/release_22_11.rst | 4 +++ drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c | 4 --- lib/ethdev/rte_flow.c | 2 -- lib/ethdev/rte_flow.h | 24 ----------------- 7 files changed, 5 insertions(+), 75 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 91c6950b60..bdbfe79c5e 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -515,8 +515,6 @@ enum index { ACTION_METER_COLOR_MODE, ACTION_METER_INIT_COLOR, ACTION_METER_STATE, - ACTION_OF_SET_MPLS_TTL, - ACTION_OF_SET_MPLS_TTL_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, ACTION_OF_SET_NW_TTL_NW_TTL, @@ -1837,7 +1835,6 @@ static const enum index next_action[] = { ACTION_METER, ACTION_METER_COLOR, ACTION_METER_MARK, - ACTION_OF_SET_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, ACTION_OF_DEC_NW_TTL, @@ -1956,12 +1953,6 @@ static const enum index action_meter_mark[] = { ZERO, }; -static const enum index action_of_set_mpls_ttl[] = { - ACTION_OF_SET_MPLS_TTL_MPLS_TTL, - ACTION_NEXT, - ZERO, -}; - static const enum index action_of_set_nw_ttl[] = { ACTION_OF_SET_NW_TTL_NW_TTL, ACTION_NEXT, @@ -5469,24 +5460,6 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter_mark, state)), .call = parse_vc_conf, }, - [ACTION_OF_SET_MPLS_TTL] = { - .name = "of_set_mpls_ttl", - .help = "OpenFlow's OFPAT_SET_MPLS_TTL", - .priv = PRIV_ACTION - (OF_SET_MPLS_TTL, - sizeof(struct rte_flow_action_of_set_mpls_ttl)), - .next = NEXT(action_of_set_mpls_ttl), - .call = parse_vc, - }, - [ACTION_OF_SET_MPLS_TTL_MPLS_TTL] = { - .name = "mpls_ttl", - .help = "MPLS TTL", - .next = NEXT(action_of_set_mpls_ttl, - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_of_set_mpls_ttl, - mpls_ttl)), - .call = parse_vc_conf, - }, [ACTION_OF_DEC_MPLS_TTL] = { .name = "of_dec_mpls_ttl", .help = "OpenFlow's OFPAT_DEC_MPLS_TTL", diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index cb102633c2..81a0701a70 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2123,23 +2123,6 @@ fields in the pattern items. | 1 | END | +-------+----------+ -Action: ``OF_SET_MPLS_TTL`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^ -This action is deprecated. Consider `Action: MODIFY_FIELD`_. - -Implements ``OFPAT_SET_MPLS_TTL`` ("MPLS TTL") as defined by the `OpenFlow -Switch Specification`_. - -.. _table_rte_flow_action_of_set_mpls_ttl: - -.. table:: OF_SET_MPLS_TTL - - +--------------+----------+ - | Field | Value | - +==============+==========+ - | ``mpls_ttl`` | MPLS TTL | - +--------------+----------+ - Action: ``OF_DEC_MPLS_TTL`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^ This action is deprecated. Consider `Action: MODIFY_FIELD`_. diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index b718784ad1..9da1ac7ea4 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -105,7 +105,7 @@ 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_SET_MPLS_TTL``, ``OF_DEC_MPLS_TTL``, ``OF_SET_NW_TTL``, +* ethdev: Actions ``OF_DEC_MPLS_TTL``, ``OF_SET_NW_TTL``, ``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. diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 6d3b43aed2..794f6322dc 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -109,6 +109,10 @@ Removed Items * ethdev: removed ``RTE_FLOW_ACTION_TYPE_PHY_PORT``; use ``RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT``. +* ethdev: removed ``OF_SET_MPLS_TTL`` which is not actually supported by + any PMD. + ``MODIFY_FIELD`` action should be used to do packet edits via RTE flow API. + API Changes ----------- 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 042425ff5c..0528606e63 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c @@ -73,10 +73,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_SET_MPLS_TTL] = { - .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, - .proto_act_func = NULL - }, [RTE_FLOW_ACTION_TYPE_OF_DEC_MPLS_TTL] = { .act_type = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED, .proto_act_func = NULL diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index fd802f87a2..ca7634bbe9 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -192,8 +192,6 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { MK_FLOW_ACTION(PORT_ID, sizeof(struct rte_flow_action_port_id)), MK_FLOW_ACTION(METER, sizeof(struct rte_flow_action_meter)), MK_FLOW_ACTION(SECURITY, sizeof(struct rte_flow_action_security)), - MK_FLOW_ACTION(OF_SET_MPLS_TTL, - sizeof(struct rte_flow_action_of_set_mpls_ttl)), MK_FLOW_ACTION(OF_DEC_MPLS_TTL, 0), MK_FLOW_ACTION(OF_SET_NW_TTL, sizeof(struct rte_flow_action_of_set_nw_ttl)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 4598ccceaf..f49d138fe9 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -2275,17 +2275,6 @@ enum rte_flow_action_type { */ RTE_FLOW_ACTION_TYPE_SECURITY, - /** - * @deprecated - * @see RTE_FLOW_ACTION_TYPE_MODIFY_FIELD - * - * Implements OFPAT_SET_MPLS_TTL ("MPLS TTL") as defined by the - * OpenFlow Switch Specification. - * - * See struct rte_flow_action_of_set_mpls_ttl. - */ - RTE_FLOW_ACTION_TYPE_OF_SET_MPLS_TTL, - /** * @deprecated * @see RTE_FLOW_ACTION_TYPE_MODIFY_FIELD @@ -3043,19 +3032,6 @@ struct rte_flow_action_security { void *security_session; /**< Pointer to security session structure. */ }; -/** - * @deprecated - * @see RTE_FLOW_ACTION_TYPE_MODIFY_FIELD - * - * RTE_FLOW_ACTION_TYPE_OF_SET_MPLS_TTL - * - * Implements OFPAT_SET_MPLS_TTL ("MPLS TTL") as defined by the OpenFlow - * Switch Specification. - */ -struct rte_flow_action_of_set_mpls_ttl { - uint8_t mpls_ttl; /**< MPLS TTL. */ -}; - /** * @deprecated * @see RTE_FLOW_ACTION_TYPE_MODIFY_FIELD