From patchwork Thu Dec 10 14:01:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Lakkireddy X-Patchwork-Id: 9464 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 145018E72; Thu, 10 Dec 2015 15:01:35 +0100 (CET) Received: from stargate3.asicdesigners.com (stargate.chelsio.com [12.32.117.8]) by dpdk.org (Postfix) with ESMTP id 4B5C48E6C for ; Thu, 10 Dec 2015 15:01:33 +0100 (CET) Received: from localhost (scalar.blr.asicdesigners.com [10.193.185.94]) by stargate3.asicdesigners.com (8.13.8/8.13.8) with ESMTP id tBAE1Uho020691; Thu, 10 Dec 2015 06:01:30 -0800 From: Rahul Lakkireddy To: dev@dpdk.org Date: Thu, 10 Dec 2015 19:31:02 +0530 Message-Id: <1dabf80beb341e03923a535d0fa13f244350af34.1449747042.git.rahul.lakkireddy@chelsio.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: References: In-Reply-To: References: Cc: Felix Marti , Kumar Sanghvi , Nirranjan Kirubaharan Subject: [dpdk-dev] [RFC 1/3] ethdev: add packet filter flow and new behavior switch to fdir X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add a new packet filter flow that allows filtering a packet based on matching ingress port, ethertype, vlan, ip, and tcp/udp fields, i.e. matching based on any or all fields at the same time. Add the ability to provide masks for fields in flow to allow range of values. Add a new vlan flow containing inner and outer vlan to match. Add tos and proto fields that can be matched for ipv4_flow. Add a new behavior switch. Add the ability to provide behavior arguments to allow insert/deletion of matched fields in the flow. Useful when rewriting matched fields with new values. Adds arguments for port, mac, vlan, and nat. Ex: allows to provide new ip and port addresses to rewrite the fields of packets matching a filter rule before NAT'ing. Signed-off-by: Rahul Lakkireddy Signed-off-by: Kumar Sanghvi --- lib/librte_ether/rte_eth_ctrl.h | 112 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 1 deletion(-) diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h index ce224ad..a2e770c 100644 --- a/lib/librte_ether/rte_eth_ctrl.h +++ b/lib/librte_ether/rte_eth_ctrl.h @@ -74,7 +74,11 @@ extern "C" { #define RTE_ETH_FLOW_IPV6_EX 15 #define RTE_ETH_FLOW_IPV6_TCP_EX 16 #define RTE_ETH_FLOW_IPV6_UDP_EX 17 -#define RTE_ETH_FLOW_MAX 18 +#define RTE_ETH_FLOW_PKT_FILTER_IPV4_TCP 18 +#define RTE_ETH_FLOW_PKT_FILTER_IPV4_UDP 19 +#define RTE_ETH_FLOW_PKT_FILTER_IPV6_TCP 20 +#define RTE_ETH_FLOW_PKT_FILTER_IPV6_UDP 21 +#define RTE_ETH_FLOW_MAX 22 /** * Feature filter types @@ -407,6 +411,8 @@ struct rte_eth_l2_flow { struct rte_eth_ipv4_flow { uint32_t src_ip; /**< IPv4 source address to match. */ uint32_t dst_ip; /**< IPv4 destination address to match. */ + uint8_t tos; /**< IPV4 type of service to match. */ + uint8_t proto; /**< IPV4 proto to match. */ }; /** @@ -500,6 +506,43 @@ struct rte_eth_tunnel_flow { }; /** + * A structure used to define the input for vlan flow. + */ +struct rte_eth_vlan_flow { + uint16_t inner_vlan; /**< Inner vlan field to match. */ + uint16_t outer_vlan; /**< Outer vlan field to match. */ +}; + +/** + * A union used to define the input for N-Tuple flow + */ +union rte_eth_ntuple_flow { + struct rte_eth_tcpv4_flow tcp4; + struct rte_eth_udpv4_flow udp4; + struct rte_eth_tcpv6_flow tcp6; + struct rte_eth_udpv6_flow udp6; +}; + +/** + * A structure used to define the input for packet filter. + */ +struct rte_eth_pkt_filter { + uint8_t port_id; /**< Port id to match. */ + struct rte_eth_l2_flow l2_flow; /**< L2 flow fields to match. */ + struct rte_eth_vlan_flow vlan_flow; /**< Vlan flow fields to match. */ + union rte_eth_ntuple_flow ntuple_flow; + /**< N-tuple flow fields to match. */ +}; + +/** + * A structure used to define the input for packet filter flow. + */ +struct rte_eth_pkt_filter_flow { + struct rte_eth_pkt_filter pkt; /**< Packet fields to match. */ + struct rte_eth_pkt_filter mask; /**< Mask for matched fields. */ +}; + +/** * An union contains the inputs for all types of flow */ union rte_eth_fdir_flow { @@ -514,6 +557,7 @@ union rte_eth_fdir_flow { struct rte_eth_ipv6_flow ipv6_flow; struct rte_eth_mac_vlan_flow mac_vlan_flow; struct rte_eth_tunnel_flow tunnel_flow; + struct rte_eth_pkt_filter_flow pkt_filter_flow; }; /** @@ -545,6 +589,7 @@ enum rte_eth_fdir_behavior { RTE_ETH_FDIR_ACCEPT = 0, RTE_ETH_FDIR_REJECT, RTE_ETH_FDIR_PASSTHRU, + RTE_ETH_FDIR_SWITCH, }; /** @@ -559,6 +604,69 @@ enum rte_eth_fdir_status { }; /** + * Behavior sub operations on fields in matched flows. + */ +enum rte_eth_fdir_behavior_sub_op { + RTE_FDIR_BEHAVIOR_SUB_OP_UNKNOWN = 0, + RTE_FDIR_BEHAVIOR_SUB_OP_INSERT, + /**< Add/rewrite fields in matched flows */ + RTE_FDIR_BEHAVIOR_SUB_OP_DELETE, + /**< Delete/reset fields in matched flows */ +}; + +/** + * A structure used to define the input for passing port arguments for + * behavior taken. + */ +struct rte_eth_behavior_arg_port { + enum rte_eth_fdir_behavior_sub_op op; /**< Sub operation to do */ + uint8_t port_id; /**< Physical port to redirect */ +}; + +/** + * A structure used to define the input for passing mac arguments for + * behavior taken. + */ +struct rte_eth_behavior_arg_mac { + enum rte_eth_fdir_behavior_sub_op op; /**< Sub operation to do */ + struct ether_addr src_mac; /**< SRC Ethernet Address to rewirte. */ + struct ether_addr dst_mac; /**< DST Ethernet Address to rewrite. */ +}; + +/** + * A structure used to define the input for passing vlan arguments for + * behavior taken. + */ +struct rte_eth_behavior_arg_vlan { + enum rte_eth_fdir_behavior_sub_op op; /**< Sub operation to do */ + uint16_t vlan_tci; /**< New vlan fields to rewrite matched ones */ +}; + +/** + * A structure used to define the input for passing Network Address + * Translation (NAT) arguments for behavior taken. + */ +struct rte_eth_behavior_arg_nat { + enum rte_eth_fdir_behavior_sub_op op; /**< Sub operation to do */ + union rte_eth_ntuple_flow nat; + /**< New NAT fields to rewrite matched ones */ +}; + +/** + * Extra arguments to pass for a behavior taken. + */ +struct rte_eth_fdir_behavior_arg { + struct rte_eth_behavior_arg_port port_arg; + /**< Extra port arg to pass */ + struct rte_eth_behavior_arg_mac mac_arg; + /**< Extra mac arg to pass */ + struct rte_eth_behavior_arg_vlan vlan_arg; + /**< Extra vlan arg to pass */ + struct rte_eth_behavior_arg_nat nat_arg; + /**< Extra NAT arg to pass */ +}; + +/** * A structure used to define an action when match FDIR packet filter. */ struct rte_eth_fdir_action { @@ -569,6 +677,8 @@ struct rte_eth_fdir_action { /**< If report_status is RTE_ETH_FDIR_REPORT_ID_FLEX_4 or RTE_ETH_FDIR_REPORT_FLEX_8, flex_off specifies where the reported flex bytes start from in flexible payload. */ + struct rte_eth_fdir_behavior_arg behavior_arg; + /**< Extra arguments for behavior taken */ }; /**