ice: Add support for tunnel offloads
Subsystems (2)
Tony Nguyen
maintainerPATCH v2 4/15 ice: Add support for tunnel offloads
Create a boost TCAM entry for each tunnel port in order to get a tunnel PTYPE. Update netdev feature flags and implement the appropriate logic to get and set values for hardware offloads.
---
v2:
- Add reference counting for same port additions
- Removed parameter 'index' from ice_tunnel_port_in_use()
- Change message level for exceeding max tunnel ports and tunnel not found to info
- Redo description for ice_create_tunnel()
- Removed unneccesary casts
--- drivers/net/ethernet/intel/ice/ice.h | 4 + drivers/net/ethernet/intel/ice/ice_common.c | 2 + .../net/ethernet/intel/ice/ice_flex_pipe.c | 530 +++++++++++++++++- .../net/ethernet/intel/ice/ice_flex_pipe.h | 5 + .../net/ethernet/intel/ice/ice_flex_type.h | 33 ++ drivers/net/ethernet/intel/ice/ice_flow.c | 36 +- drivers/net/ethernet/intel/ice/ice_flow.h | 3 + .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 25 + drivers/net/ethernet/intel/ice/ice_main.c | 94 +++- .../ethernet/intel/ice/ice_protocol_type.h | 1 + drivers/net/ethernet/intel/ice/ice_txrx.c | 126 ++++- drivers/net/ethernet/intel/ice/ice_txrx.h | 3 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 21 +- drivers/net/ethernet/intel/ice/ice_type.h | 4 + 14 files changed, 873 insertions(+), 14 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +4 -0
@@ -36,6 +36,10 @@#include <linux/avf/virtchnl.h> #include <net/ipv6.h> #include <net/xdp_sock.h> +#include <net/geneve.h> +#include <net/gre.h> +#include <net/udp_tunnel.h> +#include <net/vxlan.h> #include "ice_devids.h" #include "ice_type.h" #include "ice_txrx.h"
drivers/net/ethernet/intel/ice/ice_common.c +2 -0
@@ -769,6 +769,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw) status =ice_init_hw_tbls (hw);if (status) goto err_unroll_fltr_mgmt_struct; +mutex_init (&hw->tnl_lock);return 0 ; err_unroll_fltr_mgmt_struct:
@@ -798,6 +799,7 @@ void ice_deinit_hw(struct ice_hw *hw)ice_sched_clear_agg (hw);ice_free_seg (hw);ice_free_hw_tbls (hw); +mutex_destroy (&hw->tnl_lock);if (hw->port_info) {devm_kfree (ice_hw_to_dev (hw), hw->port_info);
drivers/net/ethernet/intel/ice/ice_flex_pipe.c +529 -1
554 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_flex_pipe.h +5 -0
@@ -18,6 +18,11 @@#define ICE_PKG_CNT 4 +enum ice_status +ice_create_tunnel (struct ice_hw *hw,enum ice_tunnel_type type,u16 port); +enum ice_status ice_destroy_tunnel (struct ice_hw *hw,u16 port,bool all); +bool ice_tunnel_port_in_use (struct ice_hw *hw,u16 port,u16 *index); +enum ice_status ice_add_prof (struct ice_hw *hw,enum ice_block blk,u64 id,u8 ptypes[],struct ice_fv_word *es);
drivers/net/ethernet/intel/ice/ice_flex_type.h +33 -0
@@ -149,6 +149,7 @@ struct ice_buf_hdr {#define ICE_SID_CDID_REDIR_RSS 48#define ICE_SID_RXPARSER_BOOST_TCAM 56 +#define ICE_SID_TXPARSER_BOOST_TCAM 66#define ICE_SID_XLT0_PE 80#define ICE_SID_XLT_KEY_BUILDER_PE 81
@@ -291,6 +292,38 @@ struct ice_pkg_enum {void *(*handler)(u32 sect_type,void *section,u32 index,u32 *offset); }; +/* Tunnel enabling */ + +enum ice_tunnel_type { +TNL_VXLAN =0 , +TNL_GENEVE , +TNL_LAST =0xFF , +TNL_ALL =0xFF , +}; + +struct ice_tunnel_type_scan { +enum ice_tunnel_type type; +const char *label_prefix; +}; + +struct ice_tunnel_entry { +enum ice_tunnel_type type; +u16 boost_addr; +u16 port; +u16 ref; +struct ice_boost_tcam_entry *boost_entry; +u8 valid; +u8 in_use; +u8 marked; +}; + +#define ICE_TUNNEL_MAX_ENTRIES 16 + +struct ice_tunnel_table { +struct ice_tunnel_entry tbl[ICE_TUNNEL_MAX_ENTRIES ]; +u16 count; +}; +struct ice_pkg_es {__le16 count;__le16 offset;
drivers/net/ethernet/intel/ice/ice_flow.c +35 -1
@@ -42,7 +42,10 @@ struct ice_flow_field_info ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {ICE_FLOW_FLD_INFO (ICE_FLOW_SEG_HDR_SCTP ,0 ,sizeof (__be16)),/* ICE_FLOW_FIELD_IDX_SCTP_DST_PORT */ ICE_FLOW_FLD_INFO (ICE_FLOW_SEG_HDR_SCTP ,2 ,sizeof (__be16)), - +/* GRE */ +/* ICE_FLOW_FIELD_IDX_GRE_KEYID */ +ICE_FLOW_FLD_INFO (ICE_FLOW_SEG_HDR_GRE ,12 , + sizeof_field(struct gre_full_hdr, key)), };/* Bitmaps indicating relevant packet types for a particular protocol header
@@ -134,6 +137,18 @@ static const u32 ice_ptypes_sctp_il[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; +/* Packet types for packets with an Outermost/First GRE header */ +static const u32 ice_ptypes_gre_of[] = { +0x00000000 ,0xBFBF7800 ,0x000001DF ,0xFEFDE000 , +0x0000017E ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 , +}; +/* Manage parameters and info. used during the creation of a flow profile */ struct ice_flow_prof_params {enum ice_block blk;
@@ -225,6 +240,12 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params) src = (const unsigned long *)ice_ptypes_sctp_il;bitmap_and (params->ptypes, params->ptypes, src,ICE_FLOW_PTYPE_MAX ); + }else if (hdrs &ICE_FLOW_SEG_HDR_GRE ) { +if (!i) { + src = (const unsigned long *)ice_ptypes_gre_of; +bitmap_and (params->ptypes, params->ptypes, + src,ICE_FLOW_PTYPE_MAX ); + } } }
@@ -275,6 +296,9 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,case ICE_FLOW_FIELD_IDX_SCTP_DST_PORT : prot_id =ICE_PROT_SCTP_IL ;break ; +case ICE_FLOW_FIELD_IDX_GRE_KEYID : + prot_id =ICE_PROT_GRE_OF ; +break ;default :return ICE_ERR_NOT_IMPL ; }
@@ -945,6 +969,7 @@ ice_add_rss_list(struct ice_hw *hw, u16 vsi_handle, struct ice_flow_prof *prof)#define ICE_FLOW_PROF_ENCAP_M (BIT_ULL(ICE_FLOW_PROF_ENCAP_S))#define ICE_RSS_OUTER_HEADERS 1 +#define ICE_RSS_INNER_HEADERS 2/* Flow profile ID format: * [0:31] - Packet match fields
@@ -1085,6 +1110,9 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,mutex_lock (&hw->rss_locks); status =ice_add_rss_cfg_sync (hw, vsi_handle, hashed_flds, addl_hdrs,ICE_RSS_OUTER_HEADERS ); +if (!status) + status =ice_add_rss_cfg_sync (hw, vsi_handle, hashed_flds, + addl_hdrs,ICE_RSS_INNER_HEADERS );mutex_unlock (&hw->rss_locks);return status;
@@ -1238,6 +1266,12 @@ enum ice_status ice_replay_rss_cfg(struct ice_hw *hw, u16 vsi_handle) ICE_RSS_OUTER_HEADERS);if (status)break ; + status =ice_add_rss_cfg_sync (hw, vsi_handle, + r->hashed_flds, + r->packet_hdr, +ICE_RSS_INNER_HEADERS ); +if (status) +break ; } }mutex_unlock (&hw->rss_locks);
drivers/net/ethernet/intel/ice/ice_flow.h +3 -0
@@ -43,6 +43,7 @@ enum ice_flow_seg_hdr {ICE_FLOW_SEG_HDR_TCP =0x00000040 ,ICE_FLOW_SEG_HDR_UDP =0x00000080 ,ICE_FLOW_SEG_HDR_SCTP =0x00000100 , + ICE_FLOW_SEG_HDR_GRE = 0x00000200, }; enum ice_flow_field {
@@ -58,6 +59,8 @@ enum ice_flow_field {ICE_FLOW_FIELD_IDX_UDP_DST_PORT ,ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT ,ICE_FLOW_FIELD_IDX_SCTP_DST_PORT , +/* GRE */ +ICE_FLOW_FIELD_IDX_GRE_KEYID ,/* The total number of enums must not exceed 64 */ ICE_FLOW_FIELD_IDX_MAX };
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h +25 -0
@@ -262,6 +262,12 @@ enum ice_rx_flex_desc_status_error_0_bits { ICE_RX_FLEX_DESC_STATUS0_LAST /* this entry must be last!!! */ }; +enum ice_rx_flex_desc_status_error_1_bits { +/* Note: These are predefined bit offsets */ +ICE_RX_FLEX_DESC_STATUS1_NAT_S =4 , +ICE_RX_FLEX_DESC_STATUS1_LAST /* this entry must be last!!! */ +}; +#define ICE_RXQ_CTX_SIZE_DWORDS 8#define ICE_RXQ_CTX_SZ (ICE_RXQ_CTX_SIZE_DWORDS * sizeof(u32))#define ICE_TX_CMPLTNQ_CTX_SIZE_DWORDS 22
@@ -413,6 +419,25 @@ enum ice_tx_ctx_desc_cmd_bits { ICE_TX_CTX_DESC_RESERVED = 0x40 }; +enum ice_tx_ctx_desc_eipt_offload { +ICE_TX_CTX_EIPT_NONE =0x0 , +ICE_TX_CTX_EIPT_IPV6 =0x1 , +ICE_TX_CTX_EIPT_IPV4_NO_CSUM =0x2 , +ICE_TX_CTX_EIPT_IPV4 =0x3 +}; + +#define ICE_TXD_CTX_QW0_EIPLEN_S 2 + +#define ICE_TXD_CTX_QW0_L4TUNT_S 9 + +#define ICE_TXD_CTX_UDP_TUNNELING BIT_ULL(ICE_TXD_CTX_QW0_L4TUNT_S) +#define ICE_TXD_CTX_GRE_TUNNELING (0x2ULL << ICE_TXD_CTX_QW0_L4TUNT_S) + +#define ICE_TXD_CTX_QW0_NATLEN_S 12 + +#define ICE_TXD_CTX_QW0_L4T_CS_S 23 +#define ICE_TXD_CTX_QW0_L4T_CS_M BIT_ULL(ICE_TXD_CTX_QW0_L4T_CS_S) +#define ICE_LAN_TXQ_MAX_QGRPS 127#define ICE_LAN_TXQ_MAX_QDIS 1023
drivers/net/ethernet/intel/ice/ice_main.c +89 -5
139 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_protocol_type.h +1 -0
@@ -18,6 +18,7 @@ enum ice_prot_id {ICE_PROT_IPV6_IL =41 ,ICE_PROT_TCP_IL =49 ,ICE_PROT_UDP_IL_OR_S =53 , +ICE_PROT_GRE_OF =64 ,ICE_PROT_SCTP_IL =96 ,ICE_PROT_META_ID =255 ,/* when offset == metadata */ ICE_PROT_INVALID =255 /* when offset == ICE_FV_OFFSET_INVAL */
drivers/net/ethernet/intel/ice/ice_txrx.c +121 -5
146 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_txrx.h +3 -0
@@ -113,6 +113,9 @@ static inline int ice_skb_pad(void)#define ICE_TX_FLAGS_TSO BIT(0)#define ICE_TX_FLAGS_HW_VLAN BIT(1)#define ICE_TX_FLAGS_SW_VLAN BIT(2) +#define ICE_TX_FLAGS_IPV4 BIT(5) +#define ICE_TX_FLAGS_IPV6 BIT(6) +#define ICE_TX_FLAGS_TUNNEL BIT(7)#define ICE_TX_FLAGS_VLAN_M 0xffff0000#define ICE_TX_FLAGS_VLAN_PR_M 0xe0000000#define ICE_TX_FLAGS_VLAN_PR_S 29
drivers/net/ethernet/intel/ice/ice_txrx_lib.c +19 -2
@@ -84,12 +84,17 @@ ice_rx_csum(struct ice_ring *ring, struct sk_buff *skb, union ice_32b_rx_flex_desc *rx_desc, u8 ptype) {struct ice_rx_ptype_decoded decoded; -u32 rx_error, rx_status; +u16 rx_error, rx_status; +u16 rx_stat_err1;bool ipv4, ipv6; rx_status =le16_to_cpu (rx_desc->wb.status_error0); - rx_error = rx_status; + rx_error = rx_status & (BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_IPE_S ) | +BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_L4E_S ) | +BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_EIPE_S ) | +BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S )); + rx_stat_err1 =le16_to_cpu (rx_desc->wb.status_error1); decoded =ice_decode_rx_desc_ptype (ptype);/* Start with CHECKSUM_NONE and by default csum_level = 0 */
@@ -125,6 +130,18 @@ ice_rx_csum(struct ice_ring *ring, struct sk_buff *skb,if (rx_error &BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_L4E_S )) goto checksum_fail; +/* check for outer UDP checksum error in tunneled packets */ +if ((rx_stat_err1 &BIT (ICE_RX_FLEX_DESC_STATUS1_NAT_S )) && + (rx_error &BIT (ICE_RX_FLEX_DESC_STATUS0_XSUM_EUDPE_S ))) + goto checksum_fail; + +/* If there is an outer header present that might contain a checksum +* we need to bump the checksum level by 1 to reflect the fact that +* we are indicating we validated the inner checksum. +*/ +if (decoded.tunnel_type >=ICE_RX_PTYPE_TUNNEL_IP_GRENAT ) + skb->csum_level =1 ; +/* Only report checksum unnecessary for TCP, UDP, or SCTP */ switch (decoded.inner_prot) {case ICE_RX_PTYPE_INNER_PROT_TCP :
drivers/net/ethernet/intel/ice/ice_type.h +4 -0
@@ -559,6 +559,10 @@ struct ice_hw {u8 *pkg_copy;u32 pkg_size; +/* tunneling info */ +struct mutex tnl_lock; +struct ice_tunnel_table tnl; +/* HW block tables */ struct ice_blk_info blk[ICE_BLK_COUNT ];struct mutex fl_profs_locks[ICE_BLK_COUNT ];/* lock fltr profiles */
Signature · 1 line
2.20.1
Bowers
PATCH v2 4/15 ice: Add support for tunnel offloads
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Tony Nguyen
Sent: Thursday, March 19, 2020 1:17 PM
To: [email protected]
Subject: [Intel-wired-lan] [PATCH S40 v2 4/15] ice: Add support for tunnel offloads
Create a boost TCAM entry for each tunnel port in order to get a tunnel PTYPE. Update netdev feature flags and implement the appropriate logic to get and set values for hardware offloads.
---
v2:
- Add reference counting for same port additions
- Removed parameter 'index' from ice_tunnel_port_in_use()
- Change message level for exceeding max tunnel ports and tunnel not found to info
- Redo description for ice_create_tunnel()
- Removed unneccesary casts
--- drivers/net/ethernet/intel/ice/ice.h | 4 + drivers/net/ethernet/intel/ice/ice_common.c | 2 + .../net/ethernet/intel/ice/ice_flex_pipe.c | 530 +++++++++++++++++- .../net/ethernet/intel/ice/ice_flex_pipe.h | 5 + .../net/ethernet/intel/ice/ice_flex_type.h | 33 ++ drivers/net/ethernet/intel/ice/ice_flow.c | 36 +- drivers/net/ethernet/intel/ice/ice_flow.h | 3 + .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 25 + drivers/net/ethernet/intel/ice/ice_main.c | 94 +++- .../ethernet/intel/ice/ice_protocol_type.h | 1 + drivers/net/ethernet/intel/ice/ice_txrx.c | 126 ++++- drivers/net/ethernet/intel/ice/ice_txrx.h | 3 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 21 +- drivers/net/ethernet/intel/ice/ice_type.h | 4 + 14 files changed, 873 insertions(+), 14 deletions(-)