From patchwork Mon Jun 17 06:12:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dekel Peled X-Patchwork-Id: 54835 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 337711BDE8; Mon, 17 Jun 2019 08:13:01 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id CF35B1BDE8 for ; Mon, 17 Jun 2019 08:12:59 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from dekelp@mellanox.com) with ESMTPS (AES256-SHA encrypted); 17 Jun 2019 09:12:58 +0300 Received: from mtl-vdi-280.wap.labs.mlnx. (mtl-vdi-280.wap.labs.mlnx [10.128.130.87]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x5H6CtwL030824; Mon, 17 Jun 2019 09:12:58 +0300 From: Dekel Peled To: adrien.mazarguil@6wind.com, wenzhuo.lu@intel.com, jingjing.wu@intel.com, bernard.iremonger@intel.com, yskoh@mellanox.com, shahafs@mellanox.com, arybchenko@solarflare.com Cc: dev@dpdk.org, orika@mellanox.com Date: Mon, 17 Jun 2019 09:12:29 +0300 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v6 1/3] ethdev: add actions to modify TCP header fields 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 actions: - INC_TCP_SEQ - Increase sequence number in the outermost TCP header. - DEC_TCP_SEQ - Decrease sequence number in the outermost TCP header. - INC_TCP_ACK - Increase acknowledgment number in the outermost TCP header. - DEC_TCP_ACK - Decrease acknowledgment number in the outermost TCP header. Original work by Xiaoyu Min. Add struct rte_flow_integer_action, containing a union of integers of all types and sizes, up to 32 bit. Intended for use by actions that require a single integer value, instead of using an action-specific structure for each of these actions. Signed-off-by: Dekel Peled --- doc/guides/prog_guide/rte_flow.rst | 68 ++++++++++++++++++++++++++++++++++++++ lib/librte_ethdev/rte_flow.c | 4 +++ lib/librte_ethdev/rte_flow.h | 64 +++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index a34d012..eeb9ddc 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2345,6 +2345,74 @@ Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned. | ``mac_addr`` | MAC address | +--------------+---------------+ +Action: ``INC_TCP_SEQ`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Increase sequence number in the outermost TCP header. + +Using this action on non-matching traffic will result in undefined behavior. + +.. _table_rte_flow_action_inc_tcp_seq: + +.. table:: INC_TCP_SEQ + + +----------+------------------------------------------+ + | Field | Value | + +==========+==========================================+ + | ``be32`` | Value to increase TCP sequence number by | + +----------+------------------------------------------+ + +Action: ``DEC_TCP_SEQ`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Decrease sequence number in the outermost TCP header. + +Using this action on non-matching traffic will result in undefined behavior. + +.. _table_rte_flow_action_dec_tcp_seq: + +.. table:: DEC_TCP_SEQ + + +----------+------------------------------------------+ + | Field | Value | + +==========+==========================================+ + | ``be32`` | Value to decrease TCP sequence number by | + +----------+------------------------------------------+ + +Action: ``INC_TCP_ACK`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Increase acknowledgment number in the outermost TCP header. + +Using this action on non-matching traffic will result in undefined behavior. + +.. _table_rte_flow_action_inc_tcp_ack: + +.. table:: INC_TCP_ACK + + +----------+------------------------------------------------+ + | Field | Value | + +==========+================================================+ + | ``be32`` | Value to increase TCP acknowledgment number by | + +----------+------------------------------------------------+ + +Action: ``DEC_TCP_ACK`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Decrease acknowledgment number in the outermost TCP header. + +Using this action on non-matching traffic will result in undefined behavior. + +.. _table_rte_flow_action_dec_tcp_ack: + +.. table:: DEC_TCP_ACK + + +----------+------------------------------------------------+ + | Field | Value | + +==========+================================================+ + | ``be32`` | Value to decrease TCP acknowledgment number by | + +----------+------------------------------------------------+ + Negative types ~~~~~~~~~~~~~~ diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 3277be1..d666d06 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -143,6 +143,10 @@ struct rte_flow_desc_data { MK_FLOW_ACTION(SET_TTL, sizeof(struct rte_flow_action_set_ttl)), MK_FLOW_ACTION(SET_MAC_SRC, sizeof(struct rte_flow_action_set_mac)), MK_FLOW_ACTION(SET_MAC_DST, sizeof(struct rte_flow_action_set_mac)), + MK_FLOW_ACTION(INC_TCP_SEQ, sizeof(struct rte_flow_integer_action)), + MK_FLOW_ACTION(DEC_TCP_SEQ, sizeof(struct rte_flow_integer_action)), + MK_FLOW_ACTION(INC_TCP_ACK, sizeof(struct rte_flow_integer_action)), + MK_FLOW_ACTION(DEC_TCP_ACK, sizeof(struct rte_flow_integer_action)), }; static int diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index f3a8fb1..5dbd6cf 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -1650,6 +1650,46 @@ enum rte_flow_action_type { * See struct rte_flow_action_set_mac. */ RTE_FLOW_ACTION_TYPE_SET_MAC_DST, + + /** + * Increase sequence number in the outermost TCP header. + * + * Using this action on non-matching traffic will result in + * undefined behavior. + * + * See struct rte_flow_integer_action. + */ + RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ, + + /** + * Decrease sequence number in the outermost TCP header. + * + * Using this action on non-matching traffic will result in + * undefined behavior. + * + * See struct rte_flow_integer_action. + */ + RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ, + + /** + * Increase acknowledgment number in the outermost TCP header. + * + * Using this action on non-matching traffic will result in + * undefined behavior. + * + * See struct rte_flow_integer_action. + */ + RTE_FLOW_ACTION_TYPE_INC_TCP_ACK, + + /** + * Decrease acknowledgment number in the outermost TCP header. + * + * Using this action on non-matching traffic will result in + * undefined behavior. + * + * See struct rte_flow_integer_action. + */ + RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK, }; /** @@ -2131,6 +2171,30 @@ struct rte_flow_action_set_mac { uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; }; +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * General structure, containing a union of integers of all types + * and sizes, up to 32 bit. + * Intended for use by actions that require a single integer value, + * instead of using an action-specific structure for each of these actions. + */ +struct rte_flow_integer_action { + union rte_flow_integer { + rte_be32_t be32; + rte_le32_t le32; + uint32_t u32; + int32_t i32; + rte_be16_t be16; + rte_le16_t le16; + uint16_t u16; + int16_t i16; + uint8_t u8; + int8_t i8; + } rte_flow_int; +}; + /* * Definition of a single action. *