From patchwork Thu Apr 15 16:41:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 91598 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 69D7DA0C3F; Thu, 15 Apr 2021 18:41:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5166816236D; Thu, 15 Apr 2021 18:41:30 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by mails.dpdk.org (Postfix) with ESMTP id D1479162369 for ; Thu, 15 Apr 2021 18:41:28 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from bingz@nvidia.com) with SMTP; 15 Apr 2021 19:41:24 +0300 Received: from nvidia.com (mtbc-r640-01.mtbc.labs.mlnx [10.75.70.6]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 13FGfJUG024146; Thu, 15 Apr 2021 19:41:22 +0300 From: Bing Zhao To: orika@nvidia.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru Cc: dev@dpdk.org, ajit.khaparde@broadcom.com Date: Fri, 16 Apr 2021 00:41:16 +0800 Message-Id: <1618504877-95597-2-git-send-email-bingz@nvidia.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1618504877-95597-1-git-send-email-bingz@nvidia.com> References: <1618062393-205611-1-git-send-email-bingz@nvidia.com> <1618504877-95597-1-git-send-email-bingz@nvidia.com> Subject: [dpdk-dev] [PATCH v2 1/2] ethdev: introduce conntrack flow action and item 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 Sender: "dev" This commit introduced the conntrack action and item. Usually the HW offloading is stateless. For some stateful offloading like a TCP connection, HW module will help provide the ability of a full offloading w/o SW participation after the connection was established. The basic usage is that in the first flow the application should add the conntrack action and in the following flow(s) the application should use the conntrack item to match on the result. A TCP connection has two directions traffic. To set a conntrack action context correctly, information from packets of both directions are required. The conntrack action should be created on one port and supply the peer port as a parameter to the action. After context creating, it could only be used between the ports (dual-port mode) or a single port. The application should modify the action via the API "action_handle_update" only when before using it to create a flow with opposite direction. This will help the driver to recognize the direction of the flow to be created, especially in single port mode. The traffic from both directions will go through the same port if the application works as an "forwarding engine" but not a end point. There is no need to call the update interface if the subsequent flows have nothing to be changed. Query will be supported via action_ctx_query interface, about the current packets information and connection status. Tha fields query capabilities depends on the HW. For the packets received during the conntrack setup, it is suggested to re-inject the packets in order to take full advantage of the conntrack. Only the valid packets should pass the conntrack, packets with invalid TCP information, like out of window, or with invalid header, like malformed, should not pass. Naming and definition: https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/netfilter/nf_conntrack_tcp.h https://elixir.bootlin.com/linux/latest/source/net/netfilter/nf_conntrack_proto_tcp.c Other reference: https://www.usenix.org/legacy/events/sec01/invitedtalks/rooij.pdf Signed-off-by: Bing Zhao --- lib/librte_ethdev/rte_flow.c | 2 + lib/librte_ethdev/rte_flow.h | 195 +++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 27a161559d..0af601d508 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -98,6 +98,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(PFCP, sizeof(struct rte_flow_item_pfcp)), MK_FLOW_ITEM(ECPRI, sizeof(struct rte_flow_item_ecpri)), MK_FLOW_ITEM(GENEVE_OPT, sizeof(struct rte_flow_item_geneve_opt)), + MK_FLOW_ITEM(CONNTRACK, sizeof(uint32_t)), }; /** Generate flow_action[] entry. */ @@ -186,6 +187,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { * indirect action handle. */ MK_FLOW_ACTION(INDIRECT, 0), + MK_FLOW_ACTION(CONNTRACK, sizeof(struct rte_flow_action_conntrack)), }; int diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index 91ae25b1da..024d1a2026 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -551,6 +551,15 @@ enum rte_flow_item_type { * See struct rte_flow_item_geneve_opt */ RTE_FLOW_ITEM_TYPE_GENEVE_OPT, + + /** + * [META] + * + * Matches conntrack state. + * + * See struct rte_flow_item_conntrack. + */ + RTE_FLOW_ITEM_TYPE_CONNTRACK, }; /** @@ -1685,6 +1694,51 @@ rte_flow_item_geneve_opt_mask = { }; #endif +/** + * The packet is with valid state after conntrack checking. + */ +#define RTE_FLOW_CONNTRACK_FLAG_PKT_STATE_VALID (1 << 0) +/** + * The state of the connection was changed. + */ +#define RTE_FLOW_CONNTRACK_FLAG_PKT_STATE_CHANGED (1 << 1) +/** + * Error is detected on this packet for this connection and + * an invalid state is set. + */ +#define RTE_FLOW_CONNTRACK_FLAG_PKT_STATE_INVAL (1 << 2) +/** + * The HW connection tracking module is disabled. + * It can be due to application command or an invalid state. + */ +#define RTE_FLOW_CONNTRACK_FLAG_HW_DISABLED (1 << 3) +/** + * The packet contains some bad field(s) and cannot continue + * with the conntrack module checking. + */ +#define RTE_FLOW_CONNTRACK_FLAG_PKT_BAD (1 << 4) + +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * RTE_FLOW_ITEM_TYPE_CONNTRACK + * + * Matches the state of a packet after it passed the connection tracking + * examination. The state is a bit mask of one RTE_FLOW_CONNTRACK_FLAG* + * or a reasonable combination of these bits. + */ +struct rte_flow_item_conntrack { + uint32_t flags; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_CONNTRACK. */ +#ifndef __cplusplus +static const struct rte_flow_item_conntrack rte_flow_item_conntrack_mask = { + .flags = 0xffffffff, +}; +#endif + /** * Matching pattern item definition. * @@ -2277,6 +2331,17 @@ enum rte_flow_action_type { * same port or across different ports. */ RTE_FLOW_ACTION_TYPE_INDIRECT, + + /** + * [META] + * + * Enable tracking a TCP connection state. + * + * Send packet to HW connection tracking module for examination. + * + * See struct rte_flow_action_conntrack. + */ + RTE_FLOW_ACTION_TYPE_CONNTRACK, }; /** @@ -2875,6 +2940,136 @@ struct rte_flow_action_set_dscp { */ struct rte_flow_action_handle; +/** + * The state of a TCP connection. + */ +enum rte_flow_conntrack_state { + /**< SYN-ACK packet was seen. */ + RTE_FLOW_CONNTRACK_STATE_SYN_RECV, + /**< 3-way handshark was done. */ + RTE_FLOW_CONNTRACK_STATE_ESTABLISHED, + /**< First FIN packet was received to close the connection. */ + RTE_FLOW_CONNTRACK_STATE_FIN_WAIT, + /**< First FIN was ACKed. */ + RTE_FLOW_CONNTRACK_STATE_CLOSE_WAIT, + /**< Second FIN was received, waiting for the last ACK. */ + RTE_FLOW_CONNTRACK_STATE_LAST_ACK, + /**< Second FIN was ACKed, connection was closed. */ + RTE_FLOW_CONNTRACK_STATE_TIME_WAIT, +}; + +/** + * The last passed TCP packet flags of a connection. + */ +enum rte_flow_conntrack_tcp_last_index { + RTE_FLOW_CONNTRACK_FLAG_NONE = 0, /**< No Flag. */ + RTE_FLOW_CONNTRACK_FLAG_SYN = (1 << 0), /**< With SYN flag. */ + RTE_FLOW_CONNTRACK_FLAG_SYNACK = (1 << 1), /**< With SYN+ACK flag. */ + RTE_FLOW_CONNTRACK_FLAG_FIN = (1 << 2), /**< With FIN flag. */ + RTE_FLOW_CONNTRACK_FLAG_ACK = (1 << 3), /**< With ACK flag. */ + RTE_FLOW_CONNTRACK_FLAG_RST = (1 << 4), /**< With RST flag. */ +}; + +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * Configuration parameters for each direction of a TCP connection. + */ +struct rte_flow_tcp_dir_param { + uint32_t scale:4; /**< TCP window scaling factor, 0xF to disable. */ + uint32_t close_initiated:1; /**< The FIN was sent by this direction. */ + /**< An ACK packet has been received by this side. */ + uint32_t last_ack_seen:1; + /**< If set, indicates that there is unacked data of the connection. */ + uint32_t data_unacked:1; + /**< Maximal value of sequence + payload length over sent + * packets (next ACK from the opposite direction). + */ + uint32_t sent_end; + /**< Maximal value of (ACK + window size) over received packet + length + * over sent packet (maximal sequence could be sent). + */ + uint32_t reply_end; + /**< Maximal value of actual window size over sent packets. */ + uint32_t max_win; + /**< Maximal value of ACK over sent packets. */ + uint32_t max_ack; +}; + +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * RTE_FLOW_ACTION_TYPE_CONNTRACK + * + * Configuration and initial state for the connection tracking module. + * This structure could be used for both setting and query. + */ +struct rte_flow_action_conntrack { + uint16_t peer_port; /**< The peer port number, can be the same port. */ + /**< Direction of this connection when creating a flow, the value only + * affects the subsequent flows creation. + */ + uint32_t is_original_dir:1; + /**< Enable / disable the conntrack HW module. When disabled, the + * result will always be RTE_FLOW_CONNTRACK_FLAG_DISABLED. + * In this state the HW will act as passthrough. + * It only affects this conntrack object in the HW without any effect + * to the other objects. + */ + uint32_t enable:1; + /**< At least one ack was seen, after the connection was established. */ + uint32_t live_connection:1; + /**< Enable selective ACK on this connection. */ + uint32_t selective_ack:1; + /**< A challenge ack has passed. */ + uint32_t challenge_ack_passed:1; + /**< 1: The last packet is seen that comes from the original direction. + * 0: From the reply direction. + */ + uint32_t last_direction:1; + /**< No TCP check will be done except the state change. */ + uint32_t liberal_mode:1; + /**< The current state of the connection. */ + enum rte_flow_conntrack_state state; + /**< Scaling factor for maximal allowed ACK window. */ + uint8_t max_ack_window; + /**< Maximal allowed number of retransmission times. */ + uint8_t retransmission_limit; + /**< TCP parameters of the original direction. */ + struct rte_flow_tcp_dir_param original_dir; + /**< TCP parameters of the reply direction. */ + struct rte_flow_tcp_dir_param reply_dir; + /**< The window value of the last packet passed this conntrack. */ + uint16_t last_window; + enum rte_flow_conntrack_tcp_last_index last_index; + /**< The sequence of the last packet passed this conntrack. */ + uint32_t last_seq; + /**< The acknowledgement of the last packet passed this conntrack. */ + uint32_t last_ack; + /**< The total value ACK + payload length of the last packet passed + * this conntrack. + */ + uint32_t last_end; +}; + +/** + * RTE_FLOW_ACTION_TYPE_CONNTRACK + * + * Wrapper structure for the context update interface. + * Ports cannot support updating, and the only valid solution is to + * destroy the old context and create a new one instead. + */ +struct rte_flow_modify_conntrack { + /**< New connection tracking parameters to be updated. */ + struct rte_flow_action_conntrack new_ct; + uint32_t direction:1; /**< The direction field will be updated. */ + /**< All the other fields except direction will be updated. */ + uint32_t state:1; + uint32_t reserved:30; /**< Reserved bits for the future usage. */ +}; + /** * Field IDs for MODIFY_FIELD action. */ From patchwork Thu Apr 15 16:41:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 91599 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 072BCA0C3F; Thu, 15 Apr 2021 18:41:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 952681623EA; Thu, 15 Apr 2021 18:41:31 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by mails.dpdk.org (Postfix) with ESMTP id DB9B516236A for ; Thu, 15 Apr 2021 18:41:28 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from bingz@nvidia.com) with SMTP; 15 Apr 2021 19:41:26 +0300 Received: from nvidia.com (mtbc-r640-01.mtbc.labs.mlnx [10.75.70.6]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 13FGfJUH024146; Thu, 15 Apr 2021 19:41:25 +0300 From: Bing Zhao To: orika@nvidia.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru Cc: dev@dpdk.org, ajit.khaparde@broadcom.com Date: Fri, 16 Apr 2021 00:41:17 +0800 Message-Id: <1618504877-95597-3-git-send-email-bingz@nvidia.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1618504877-95597-1-git-send-email-bingz@nvidia.com> References: <1618062393-205611-1-git-send-email-bingz@nvidia.com> <1618504877-95597-1-git-send-email-bingz@nvidia.com> Subject: [dpdk-dev] [PATCH v2 2/2] app/testpmd: add CLI for conntrack 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 Sender: "dev" The command line for testing connection tracking is added. To create a conntrack object, 3 parts are needed. set conntrack com peer ... set conntrack orig scale ... set conntrack rply scale ... This will create a full conntrack action structure for the indirect action. After the indirect action handle of "conntrack" created, it could be used in the flow creation. Before updating, the same structure is also needed together with the update command "conntrack_update" to update the "dir" or "ctx". After the flow with conntrack action created, the packet should jump to the next flow for the result checking with conntrack item. The state is defined with bits and a valid combination could be supported. Signed-off-by: Bing Zhao --- app/test-pmd/cmdline.c | 354 ++++++++++++++++++++++++++++++++++++ app/test-pmd/cmdline_flow.c | 92 ++++++++++ app/test-pmd/config.c | 65 ++++++- app/test-pmd/testpmd.h | 2 + 4 files changed, 512 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index c28a3d2e5d..58ab7191d6 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -13618,6 +13618,358 @@ cmdline_parse_inst_t cmd_set_mplsoudp_decap_with_vlan = { }, }; +/** Set connection tracking object common details */ +struct cmd_set_conntrack_common_result { + cmdline_fixed_string_t set; + cmdline_fixed_string_t conntrack; + cmdline_fixed_string_t common; + cmdline_fixed_string_t peer; + cmdline_fixed_string_t is_orig; + cmdline_fixed_string_t enable; + cmdline_fixed_string_t live; + cmdline_fixed_string_t sack; + cmdline_fixed_string_t cack; + cmdline_fixed_string_t last_dir; + cmdline_fixed_string_t liberal; + cmdline_fixed_string_t state; + cmdline_fixed_string_t max_ack_win; + cmdline_fixed_string_t retrans; + cmdline_fixed_string_t last_win; + cmdline_fixed_string_t last_seq; + cmdline_fixed_string_t last_ack; + cmdline_fixed_string_t last_end; + cmdline_fixed_string_t last_index; + uint8_t stat; + uint8_t factor; + uint16_t peer_port; + uint32_t is_original; + uint32_t en; + uint32_t is_live; + uint32_t s_ack; + uint32_t c_ack; + uint32_t ld; + uint32_t lb; + uint8_t re_num; + uint8_t li; + uint16_t lw; + uint32_t ls; + uint32_t la; + uint32_t le; +}; + +cmdline_parse_token_string_t cmd_set_conntrack_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + set, "set"); +cmdline_parse_token_string_t cmd_set_conntrack_conntrack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + conntrack, "conntrack"); +cmdline_parse_token_string_t cmd_set_conntrack_conntrack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + common, "com"); +cmdline_parse_token_string_t cmd_set_conntrack_common_peer = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + peer, "peer"); +cmdline_parse_token_num_t cmd_set_conntrack_common_peer_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + peer_port, RTE_UINT16); +cmdline_parse_token_string_t cmd_set_conntrack_common_is_orig = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + is_orig, "is_orig"); +cmdline_parse_token_num_t cmd_set_conntrack_common_is_orig_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + is_original, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_enable = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + enable, "enable"); +cmdline_parse_token_num_t cmd_set_conntrack_common_enable_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + en, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_live = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + live, "live"); +cmdline_parse_token_num_t cmd_set_conntrack_common_live_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + is_live, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_sack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + sack, "sack"); +cmdline_parse_token_num_t cmd_set_conntrack_common_sack_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + s_ack, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_cack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + cack, "cack"); +cmdline_parse_token_num_t cmd_set_conntrack_common_cack_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + c_ack, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_last_dir = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + last_dir, "last_dir"); +cmdline_parse_token_num_t cmd_set_conntrack_common_last_dir_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + ld, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_liberal = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + liberal, "liberal"); +cmdline_parse_token_num_t cmd_set_conntrack_common_liberal_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + lb, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_state = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + state, "state"); +cmdline_parse_token_num_t cmd_set_conntrack_common_state_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + stat, RTE_UINT8); +cmdline_parse_token_string_t cmd_set_conntrack_common_max_ackwin = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + max_ack_win, "max_ack_win"); +cmdline_parse_token_num_t cmd_set_conntrack_common_max_ackwin_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + factor, RTE_UINT8); +cmdline_parse_token_string_t cmd_set_conntrack_common_retrans = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + retrans, "r_lim"); +cmdline_parse_token_num_t cmd_set_conntrack_common_retrans_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + re_num, RTE_UINT8); +cmdline_parse_token_string_t cmd_set_conntrack_common_last_win = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + last_win, "last_win"); +cmdline_parse_token_num_t cmd_set_conntrack_common_last_win_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + lw, RTE_UINT16); +cmdline_parse_token_string_t cmd_set_conntrack_common_last_seq = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + last_seq, "last_seq"); +cmdline_parse_token_num_t cmd_set_conntrack_common_last_seq_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + ls, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_last_ack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + last_ack, "last_ack"); +cmdline_parse_token_num_t cmd_set_conntrack_common_last_ack_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + la, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_last_end = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + last_end, "last_end"); +cmdline_parse_token_num_t cmd_set_conntrack_common_last_end_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + le, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_common_last_index = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_common_result, + last_index, "last_index"); +cmdline_parse_token_num_t cmd_set_conntrack_common_last_index_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_common_result, + li, RTE_UINT8); + +static void cmd_set_conntrack_common_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_set_conntrack_common_result *res = parsed_result; + + /* No need to swap to big endian. */ + conntrack_context.peer_port = res->peer_port; + conntrack_context.is_original_dir = res->is_original; + conntrack_context.enable = res->en; + conntrack_context.live_connection = res->is_live; + conntrack_context.selective_ack = res->s_ack; + conntrack_context.challenge_ack_passed = res->c_ack; + conntrack_context.last_direction = res->ld; + conntrack_context.liberal_mode = res->lb; + conntrack_context.state = (enum rte_flow_conntrack_state)res->stat; + conntrack_context.max_ack_window = res->factor; + conntrack_context.retransmission_limit = res->re_num; + conntrack_context.last_window = res->lw; + conntrack_context.last_index = + (enum rte_flow_conntrack_tcp_last_index)res->li; + conntrack_context.last_seq = res->ls; + conntrack_context.last_ack = res->la; + conntrack_context.last_end = res->le; +} + +cmdline_parse_inst_t cmd_set_conntrack_common = { + .f = cmd_set_conntrack_common_parsed, + .data = NULL, + .help_str = "set conntrack com peer is_orig enable " + " live sack cack last_dir " + " liberal state max_ack_win r_lim " + " last_win last_seq last_ack last_end " + " last_index ", + .tokens = { + (void *)&cmd_set_conntrack_set, + (void *)&cmd_set_conntrack_conntrack, + (void *)&cmd_set_conntrack_common_peer, + (void *)&cmd_set_conntrack_common_peer_value, + (void *)&cmd_set_conntrack_common_is_orig, + (void *)&cmd_set_conntrack_common_is_orig_value, + (void *)&cmd_set_conntrack_common_enable, + (void *)&cmd_set_conntrack_common_enable_value, + (void *)&cmd_set_conntrack_common_live, + (void *)&cmd_set_conntrack_common_live_value, + (void *)&cmd_set_conntrack_common_sack, + (void *)&cmd_set_conntrack_common_sack_value, + (void *)&cmd_set_conntrack_common_cack, + (void *)&cmd_set_conntrack_common_cack_value, + (void *)&cmd_set_conntrack_common_last_dir, + (void *)&cmd_set_conntrack_common_last_dir_value, + (void *)&cmd_set_conntrack_common_liberal, + (void *)&cmd_set_conntrack_common_liberal_value, + (void *)&cmd_set_conntrack_common_state, + (void *)&cmd_set_conntrack_common_state_value, + (void *)&cmd_set_conntrack_common_max_ackwin, + (void *)&cmd_set_conntrack_common_max_ackwin_value, + (void *)&cmd_set_conntrack_common_retrans, + (void *)&cmd_set_conntrack_common_retrans_value, + (void *)&cmd_set_conntrack_common_last_win, + (void *)&cmd_set_conntrack_common_last_win_value, + (void *)&cmd_set_conntrack_common_last_seq, + (void *)&cmd_set_conntrack_common_last_seq_value, + (void *)&cmd_set_conntrack_common_last_ack, + (void *)&cmd_set_conntrack_common_last_ack_value, + (void *)&cmd_set_conntrack_common_last_end, + (void *)&cmd_set_conntrack_common_last_end_value, + (void *)&cmd_set_conntrack_common_last_index, + (void *)&cmd_set_conntrack_common_last_index_value, + NULL, + }, +}; + +/** Set connection tracking object both directions' details */ +struct cmd_set_conntrack_dir_result { + cmdline_fixed_string_t set; + cmdline_fixed_string_t conntrack; + cmdline_fixed_string_t dir; + cmdline_fixed_string_t scale; + cmdline_fixed_string_t fin; + cmdline_fixed_string_t ack_seen; + cmdline_fixed_string_t unack; + cmdline_fixed_string_t sent_end; + cmdline_fixed_string_t reply_end; + cmdline_fixed_string_t max_win; + cmdline_fixed_string_t max_ack; + uint32_t factor; + uint32_t f; + uint32_t as; + uint32_t un; + uint32_t se; + uint32_t re; + uint32_t mw; + uint32_t ma; +}; + +cmdline_parse_token_string_t cmd_set_conntrack_dir_set = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + set, "set"); +cmdline_parse_token_string_t cmd_set_conntrack_dir_conntrack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + conntrack, "conntrack"); +cmdline_parse_token_string_t cmd_set_conntrack_dir_dir = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + dir, "orig#rply"); +cmdline_parse_token_string_t cmd_set_conntrack_dir_scale = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + scale, "scale"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_scale_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + factor, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_fin = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + fin, "fin"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_fin_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + f, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_ack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + ack_seen, "acked"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_ack_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + as, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_unack_data = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + unack, "unack_data"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_unack_data_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + un, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_sent_end = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + sent_end, "sent_end"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_sent_end_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + se, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_reply_end = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + reply_end, "reply_end"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_reply_end_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + re, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_max_win = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + max_win, "max_win"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_max_win_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + mw, RTE_UINT32); +cmdline_parse_token_string_t cmd_set_conntrack_dir_max_ack = + TOKEN_STRING_INITIALIZER(struct cmd_set_conntrack_dir_result, + max_ack, "max_ack"); +cmdline_parse_token_num_t cmd_set_conntrack_dir_max_ack_value = + TOKEN_NUM_INITIALIZER(struct cmd_set_conntrack_dir_result, + ma, RTE_UINT32); + +static void cmd_set_conntrack_dir_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_set_conntrack_dir_result *res = parsed_result; + struct rte_flow_tcp_dir_param *dir = NULL; + + if (strcmp(res->dir, "orig") == 0) + dir = &conntrack_context.original_dir; + else if (strcmp(res->dir, "rply") == 0) + dir = &conntrack_context.reply_dir; + else + return; + dir->scale = res->factor; + dir->close_initiated = res->f; + dir->last_ack_seen = res->as; + dir->data_unacked = res->un; + dir->sent_end = res->se; + dir->reply_end = res->re; + dir->max_ack = res->ma; + dir->max_win = res->mw; +} + +cmdline_parse_inst_t cmd_set_conntrack_dir = { + .f = cmd_set_conntrack_dir_parsed, + .data = NULL, + .help_str = "set conntrack orig|rply scale fin " + " acked unack_data sent_end " + " reply_end max_win max_ack ", + .tokens = { + (void *)&cmd_set_conntrack_set, + (void *)&cmd_set_conntrack_conntrack, + (void *)&cmd_set_conntrack_dir_dir, + (void *)&cmd_set_conntrack_dir_scale, + (void *)&cmd_set_conntrack_dir_scale_value, + (void *)&cmd_set_conntrack_dir_fin, + (void *)&cmd_set_conntrack_dir_fin_value, + (void *)&cmd_set_conntrack_dir_ack, + (void *)&cmd_set_conntrack_dir_ack_value, + (void *)&cmd_set_conntrack_dir_unack_data, + (void *)&cmd_set_conntrack_dir_unack_data_value, + (void *)&cmd_set_conntrack_dir_sent_end, + (void *)&cmd_set_conntrack_dir_sent_end_value, + (void *)&cmd_set_conntrack_dir_reply_end, + (void *)&cmd_set_conntrack_dir_reply_end_value, + (void *)&cmd_set_conntrack_dir_max_win, + (void *)&cmd_set_conntrack_dir_max_win_value, + (void *)&cmd_set_conntrack_dir_max_ack, + (void *)&cmd_set_conntrack_dir_max_ack_value, + NULL, + }, +}; + /* Strict link priority scheduling mode setting */ static void cmd_strict_link_prio_parsed( @@ -17117,6 +17469,8 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_mplsoudp_encap_with_vlan, (cmdline_parse_inst_t *)&cmd_set_mplsoudp_decap, (cmdline_parse_inst_t *)&cmd_set_mplsoudp_decap_with_vlan, + (cmdline_parse_inst_t *)&cmd_set_conntrack_common, + (cmdline_parse_inst_t *)&cmd_set_conntrack_dir, (cmdline_parse_inst_t *)&cmd_ddp_add, (cmdline_parse_inst_t *)&cmd_ddp_del, (cmdline_parse_inst_t *)&cmd_ddp_get_list, diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index d83dec942a..fc5e31be5e 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -289,6 +289,7 @@ enum index { ITEM_GENEVE_OPT_TYPE, ITEM_GENEVE_OPT_LENGTH, ITEM_GENEVE_OPT_DATA, + ITEM_CONNTRACK, /* Validate/create actions. */ ACTIONS, @@ -427,6 +428,10 @@ enum index { ACTION_MODIFY_FIELD_SRC_OFFSET, ACTION_MODIFY_FIELD_SRC_VALUE, ACTION_MODIFY_FIELD_WIDTH, + ACTION_CONNTRACK, + ACTION_CONNTRACK_UPDATE, + ACTION_CONNTRACK_UPDATE_DIR, + ACTION_CONNTRACK_UPDATE_CTX, }; /** Maximum size for pattern in struct rte_flow_item_raw. */ @@ -565,6 +570,8 @@ struct mplsoudp_encap_conf mplsoudp_encap_conf; struct mplsoudp_decap_conf mplsoudp_decap_conf; +struct rte_flow_action_conntrack conntrack_context; + #define ACTION_SAMPLE_ACTIONS_NUM 10 #define RAW_SAMPLE_CONFS_MAX_NUM 8 /** Storage for struct rte_flow_action_sample including external data. */ @@ -956,6 +963,7 @@ static const enum index next_item[] = { ITEM_PFCP, ITEM_ECPRI, ITEM_GENEVE_OPT, + ITEM_CONNTRACK, END_SET, ZERO, }; @@ -1370,6 +1378,8 @@ static const enum index next_action[] = { ACTION_SAMPLE, ACTION_INDIRECT, ACTION_MODIFY_FIELD, + ACTION_CONNTRACK, + ACTION_CONNTRACK_UPDATE, ZERO, }; @@ -1638,6 +1648,13 @@ static const enum index action_modify_field_src[] = { ZERO, }; +static const enum index action_update_conntrack[] = { + ACTION_CONNTRACK_UPDATE_DIR, + ACTION_CONNTRACK_UPDATE_CTX, + ACTION_NEXT, + ZERO, +}; + static int parse_set_raw_encap_decap(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -1728,6 +1745,10 @@ static int parse_vc_modify_field_id(struct context *ctx, const struct token *token, const char *str, unsigned int len, void *buf, unsigned int size); +static int +parse_vc_action_conntrack_update(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); static int parse_destroy(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -3373,6 +3394,13 @@ static const struct token token_list[] = { (sizeof(struct rte_flow_item_geneve_opt), ITEM_GENEVE_OPT_DATA_SIZE)), }, + [ITEM_CONNTRACK] = { + .name = "conntrack", + .help = "conntrack state", + .next = NEXT(NEXT_ENTRY(ITEM_NEXT), NEXT_ENTRY(UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_conntrack, flags)), + }, /* Validate/create actions. */ [ACTIONS] = { .name = "actions", @@ -4471,6 +4499,34 @@ static const struct token token_list[] = { .call = parse_vc_action_sample_index, .comp = comp_set_sample_index, }, + [ACTION_CONNTRACK] = { + .name = "conntrack", + .help = "create a conntrack object", + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .priv = PRIV_ACTION(CONNTRACK, + sizeof(struct rte_flow_action_conntrack)), + .call = parse_vc, + }, + [ACTION_CONNTRACK_UPDATE] = { + .name = "conntrack_update", + .help = "update a conntrack object", + .next = NEXT(action_update_conntrack), + .priv = PRIV_ACTION(CONNTRACK, + sizeof(struct rte_flow_modify_conntrack)), + .call = parse_vc, + }, + [ACTION_CONNTRACK_UPDATE_DIR] = { + .name = "dir", + .help = "update a conntrack object direction", + .next = NEXT(action_update_conntrack), + .call = parse_vc_action_conntrack_update, + }, + [ACTION_CONNTRACK_UPDATE_CTX] = { + .name = "ctx", + .help = "update a conntrack object context", + .next = NEXT(action_update_conntrack), + .call = parse_vc_action_conntrack_update, + }, /* Indirect action destroy arguments. */ [INDIRECT_ACTION_DESTROY_ID] = { .name = "action_id", @@ -6277,6 +6333,42 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token, return len; } +/** Parse the conntrack update, not a rte_flow_action. */ +static int +parse_vc_action_conntrack_update(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + struct buffer *out = buf; + struct rte_flow_modify_conntrack *ct_modify = NULL; + + (void)size; + if (ctx->curr != ACTION_CONNTRACK_UPDATE_CTX && + ctx->curr != ACTION_CONNTRACK_UPDATE_DIR) + return -1; + /* Token name must match. */ + if (parse_default(ctx, token, str, len, NULL, 0) < 0) + return -1; + ct_modify = (struct rte_flow_modify_conntrack *)out->args.vc.data; + /* Nothing else to do if there is no buffer. */ + if (!out) + return len; + if (ctx->curr == ACTION_CONNTRACK_UPDATE_DIR) { + ct_modify->new_ct.is_original_dir = + conntrack_context.is_original_dir; + ct_modify->direction = 1; + } else { + uint32_t old_dir; + + old_dir = ct_modify->new_ct.is_original_dir; + memcpy(&ct_modify->new_ct, &conntrack_context, + sizeof(conntrack_context)); + ct_modify->new_ct.is_original_dir = old_dir; + ct_modify->state = 1; + } + return len; +} + /** Parse tokens for destroy command. */ static int parse_destroy(struct context *ctx, const struct token *token, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 1eec0612a4..06143a7501 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1483,6 +1483,11 @@ port_action_handle_create(portid_t port_id, uint32_t id, pia->age_type = ACTION_AGE_CONTEXT_TYPE_INDIRECT_ACTION; age->context = &pia->age_type; + } else if (action->type == RTE_FLOW_ACTION_TYPE_CONNTRACK) { + struct rte_flow_action_conntrack *ct = + (struct rte_flow_action_conntrack *)(uintptr_t)(action->conf); + + memcpy(ct, &conntrack_context, sizeof(*ct)); } /* Poisoning to make sure PMDs update it in case of error. */ memset(&error, 0x22, sizeof(error)); @@ -1564,11 +1569,24 @@ port_action_handle_update(portid_t port_id, uint32_t id, { struct rte_flow_error error; struct rte_flow_action_handle *action_handle; + struct port_indirect_action *pia; + const void *update; action_handle = port_action_handle_get_by_id(port_id, id); if (!action_handle) return -EINVAL; - if (rte_flow_action_handle_update(port_id, action_handle, action, + pia = action_get_by_id(port_id, id); + if (!pia) + return -EINVAL; + switch (pia->type) { + case RTE_FLOW_ACTION_TYPE_CONNTRACK: + update = action->conf; + break; + default: + update = action; + break; + } + if (rte_flow_action_handle_update(port_id, action_handle, update, &error)) { return port_flow_complain(&error); } @@ -1621,6 +1639,51 @@ port_action_handle_query(portid_t port_id, uint32_t id) } data = NULL; break; + case RTE_FLOW_ACTION_TYPE_CONNTRACK: + if (!ret) { + struct rte_flow_action_conntrack *ct = data; + + printf("Conntrack Context:\n" + " Peer: %u, Flow dir: %s, Enable: %u\n" + " Live: %u, SACK: %u, CACK: %u\n" + " Packet dir: %s, Liberal: %u, State: %u\n" + " Factor: %u, Retrans: %u, TCP flags: %u\n" + " Last Seq: %u, Last ACK: %u\n" + " Last Win: %u, Last End: %u\n", + ct->peer_port, + ct->is_original_dir ? "Original" : "Reply", + ct->enable, ct->live_connection, + ct->selective_ack, ct->challenge_ack_passed, + ct->last_direction ? "Original" : "Reply", + ct->liberal_mode, ct->state, + ct->max_ack_window, ct->retransmission_limit, + ct->last_index, ct->last_seq, ct->last_ack, + ct->last_window, ct->last_end); + printf(" Original Dir:\n" + " scale: %u, fin: %u, ack seen: %u\n" + " unacked data: %u\n Sent end: %u," + " Reply end: %u, Max win: %u, Max ACK: %u\n", + ct->original_dir.scale, + ct->original_dir.close_initiated, + ct->original_dir.last_ack_seen, + ct->original_dir.data_unacked, + ct->original_dir.sent_end, + ct->original_dir.reply_end, + ct->original_dir.max_win, + ct->original_dir.max_ack); + printf(" Reply Dir:\n" + " scale: %u, fin: %u, ack seen: %u\n" + " unacked data: %u\n Sent end: %u," + " Reply end: %u, Max win: %u, Max ACK: %u\n", + ct->reply_dir.scale, + ct->reply_dir.close_initiated, + ct->reply_dir.last_ack_seen, + ct->reply_dir.data_unacked, + ct->reply_dir.sent_end, ct->reply_dir.reply_end, + ct->reply_dir.max_win, ct->reply_dir.max_ack); + } + data = NULL; + break; default: printf("Indirect action %u (type: %d) on port %u doesn't" " support query\n", id, pia->type, port_id); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index d1eaaadb17..d7528f9cb5 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -630,6 +630,8 @@ extern struct mplsoudp_decap_conf mplsoudp_decap_conf; extern enum rte_eth_rx_mq_mode rx_mq_mode; +extern struct rte_flow_action_conntrack conntrack_context; + static inline unsigned int lcore_num(void) {