Skip to content

L
linux
Commit ecd01b69 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files
Options

ice: define meta data to match in switch 

Add description for each meta data. Redefine tunnel mask to match only
tunneled MAC and tunneled VLAN. It shouldn't try to match other flags
(previously it was 0xff, it is redundant).

VLAN mask was 0xd000, change it to 0xf000. 4 last bits are flags
depending on the same field in packets (VLAN tag). Because of that,
It isn't harmful to match also on ITAG.

Group all MDID and MDID offsets into enums to keep things organized.
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 20d5e0ef
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 16 deletions
drivers/net/ethernet/intel/ice/ice_protocol_type.h
View file @ ecd01b69
......@@ -115,17 +115,7 @@ enum ice_prot_id {
#define ICE_L2TPV3_HW 104
#define ICE_UDP_OF_HW 52 /* UDP Tunnels */
#define ICE_META_DATA_ID_HW 255 /* this is used for tunnel and VLAN type */
#define ICE_MDID_SIZE 2
#define ICE_TUN_FLAG_MDID 21
#define ICE_TUN_FLAG_MDID_OFF (ICE_MDID_SIZE * ICE_TUN_FLAG_MDID)
#define ICE_TUN_FLAG_MASK 0xFF
#define ICE_VLAN_FLAG_MDID 20
#define ICE_VLAN_FLAG_MDID_OFF (ICE_MDID_SIZE * ICE_VLAN_FLAG_MDID)
#define ICE_PKT_FLAGS_0_TO_15_VLAN_FLAGS_MASK 0xD000
#define ICE_TUN_FLAG_FV_IND 2
......@@ -230,6 +220,181 @@ struct ice_nvgre_hdr {
__be32 tni_flow;
};
/* Metadata information
*
* Not all MDIDs can be used by switch block. It depends on package version.
*
* MDID 16 (Rx offset)
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | A | B | Reserved |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* A = Source port where the transaction came from (3b).
*
* B = Destination TC of the packet. The TC is relative to a port (5b).
*
* MDID 17
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | PTYPE | Reserved |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* PTYPE = Encodes the packet type (10b).
*
* MDID 18
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Packet length | R |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* Packet length = Length of the packet in bytes
* (packet always carriers CRC) (14b).
* R = Reserved (2b).
*
* MDID 19
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | Source VSI | Reserved |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* Source VSI = Source VSI of packet loopbacked in switch (for egress) (10b).
*
* MDID 20
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |A|B|C|D|E|F|R|R|G|H|I|J|K|L|M|N|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* A = DSI - set for DSI RX pkts.
* B = ipsec_decrypted - invalid on NIC.
* C = marker - this is a marker packet.
* D = from_network - for TX sets to 0
* for RX:
* * 1 - packet is from external link
* * 0 - packet source is from internal
* E = source_interface_is_rx - reflect the physical interface from where the
* packet was received:
* * 1 - Rx
* * 0 - Tx
* F = from_mng - The bit signals that the packet's origin is the management.
* G = ucast - Outer L2 MAC address is unicast.
* H = mcast - Outer L2 MAC address is multicast.
* I = bcast - Outer L2 MAC address is broadcast.
* J = second_outer_mac_present - 2 outer MAC headers are present in the packet.
* K = STAG or BVLAN - Outer L2 header has STAG (ethernet type 0x88a8) or
* BVLAN (ethernet type 0x88a8).
* L = ITAG - Outer L2 header has ITAG *ethernet type 0x88e7)
* M = EVLAN (0x8100) - Outer L2 header has EVLAN (ethernet type 0x8100)
* N = EVLAN (0x9100) - Outer L2 header has EVLAN (ethernet type 0x9100)
*/
#define ICE_PKT_VLAN_STAG BIT(12)
#define ICE_PKT_VLAN_ITAG BIT(13)
#define ICE_PKT_VLAN_EVLAN (BIT(14) | BIT(15))
#define ICE_PKT_VLAN_MASK (ICE_PKT_VLAN_STAG | ICE_PKT_VLAN_ITAG | \
ICE_PKT_VLAN_EVLAN)
/* MDID 21
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |A|B|C|D|E|F|G|H|I|J|R|R|K|L|M|N|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* A = VLAN (0x8100) - Outer L2 header has VLAN (ethernet type 0x8100)
* B = NSHoE - Outer L2 header has NSH (ethernet type 0x894f)
* C = MPLS (0x8847) - There is at least 1 MPLS tag in the outer header
* (ethernet type 0x8847)
* D = MPLS (0x8848) - There is at least 1 MPLS tag in the outer header
* (ethernet type 0x8848)
* E = multi MPLS - There is more than a single MPLS tag in the outer header
* F = inner MPLS - There is inner MPLS tag in the packet
* G = tunneled MAC - Set if the packet includes a tunneled MAC
* H = tunneled VLAN - Same as VLAN, but for a tunneled header
* I = pkt_is_frag - Packet is fragmented (ipv4 or ipv6)
* J = ipv6_ext - The packet has routing or destination ipv6 extension in inner
* or outer ipv6 headers
* K = RoCE - UDP packet detected as RoCEv2
* L = UDP_XSUM_0 - Set to 1 if L4 checksum is 0 in a UDP packet
* M = ESP - This is a ESP packet
* N = NAT_ESP - This is a ESP packet encapsulated in UDP NAT
*/
#define ICE_PKT_TUNNEL_MAC BIT(6)
#define ICE_PKT_TUNNEL_VLAN BIT(7)
#define ICE_PKT_TUNNEL_MASK (ICE_PKT_TUNNEL_MAC | ICE_PKT_TUNNEL_VLAN)
/* MDID 22
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |A|B|C|D|E|F| G |H|I|J| K |L|M|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* A = fin - fin flag in tcp header
* B = sync - sync flag in tcp header
* C = rst - rst flag in tcp header
* D = psh - psh flag in tcp header
* E = ack - ack flag in tcp header
* F = urg - urg flag in tcp header
* G = tunnel type (3b) - Flags used to decode tunnel type:
* * b000 - not a VXLAN/Geneve/GRE tunnel
* * b001 - VXLAN-GPE
* * b010 - VXLAN (non-GPE)
* * b011 - Geneve
* * b100 - GRE (no key, no xsum)
* * b101 - GREK (key, no xsum)
* * b110 - GREC (no key, xsum)
* * b111 - GREKC (key, xsum)
* H = UDP_GRE - Packet is UDP (VXLAN or VLAN_GPE or Geneve or MPLSoUDP or GRE)
* tunnel
* I = OAM - VXLAN/Geneve/tunneled NSH packet with the OAM bit set
* J = tunneled NSH - Packet has NSHoGRE or NSHoUDP
* K = switch (2b) - Direction on switch
* * b00 - normal
* * b01 - TX force only LAN
* * b10 - TX disable LAN
* * b11 - direct to VSI
* L = swpe - Represents SWPE bit in TX command
* M = sw_cmd - Switch command
*
* MDID 23
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |A|B|C|D| R |E|F|R|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*
* A = MAC error - Produced by MAC according to L2 error conditions
* B = PPRS no offload - FIFO overflow in PPRS or any problematic condition in
* PPRS ANA
* C = abort - Set when malicious packet is detected
* D = partial analysis - ANA's analysing got cut in the middle
* (header > 504B etc.)
* E = FLM - Flow director hit indication
* F = FDLONG - Flow direector long bucket indication
*
*/
#define ICE_MDID_SIZE 2
#define ICE_META_DATA_ID_HW 255
enum ice_hw_metadata_id {
ICE_SOURCE_PORT_MDID = 16,
ICE_PTYPE_MDID = 17,
ICE_PACKET_LENGTH_MDID = 18,
ICE_SOURCE_VSI_MDID = 19,
ICE_PKT_VLAN_MDID = 20,
ICE_PKT_TUNNEL_MDID = 21,
ICE_PKT_TCP_MDID = 22,
ICE_PKT_ERROR_MDID = 23,
};
enum ice_hw_metadata_offset {
ICE_SOURCE_PORT_MDID_OFFSET = ICE_MDID_SIZE * ICE_SOURCE_PORT_MDID,
ICE_PTYPE_MDID_OFFSET = ICE_MDID_SIZE * ICE_PTYPE_MDID,
ICE_PACKET_LENGTH_MDID_OFFSET = ICE_MDID_SIZE * ICE_PACKET_LENGTH_MDID,
ICE_SOURCE_VSI_MDID_OFFSET = ICE_MDID_SIZE * ICE_SOURCE_VSI_MDID,
ICE_PKT_VLAN_MDID_OFFSET = ICE_MDID_SIZE * ICE_PKT_VLAN_MDID,
ICE_PKT_TUNNEL_MDID_OFFSET = ICE_MDID_SIZE * ICE_PKT_TUNNEL_MDID,
ICE_PKT_TCP_MDID_OFFSET = ICE_MDID_SIZE * ICE_PKT_TCP_MDID,
ICE_PKT_ERROR_MDID_OFFSET = ICE_MDID_SIZE * ICE_PKT_ERROR_MDID,
};
struct ice_hw_metadata {
__be16 source_port;
__be16 ptype;
__be16 packet_length;
__be16 source_vsi;
__be16 flags[4];
};
union ice_prot_hdr {
struct ice_ether_hdr eth_hdr;
struct ice_ethtype_hdr ethertype;
......@@ -243,6 +408,7 @@ union ice_prot_hdr {
struct ice_udp_gtp_hdr gtp_hdr;
struct ice_pppoe_hdr pppoe_hdr;
struct ice_l2tpv3_sess_hdr l2tpv3_sess_hdr;
struct ice_hw_metadata metadata;
};
/* This is mapping table entry that maps every word within a given protocol
......
drivers/net/ethernet/intel/ice/ice_switch.c
View file @ ecd01b69
......@@ -5268,7 +5268,7 @@ static bool ice_tun_type_match_word(enum ice_sw_tunnel_type tun_type, u16 *mask)
case ICE_SW_TUN_NVGRE:
case ICE_SW_TUN_GTPU:
case ICE_SW_TUN_GTPC:
*mask = ICE_TUN_FLAG_MASK;
*mask = ICE_PKT_TUNNEL_MASK;
return true;
default:
......@@ -5297,7 +5297,8 @@ ice_add_special_words(struct ice_adv_rule_info *rinfo,
u8 word = lkup_exts->n_val_words++;
lkup_exts->fv_words[word].prot_id = ICE_META_DATA_ID_HW;
lkup_exts->fv_words[word].off = ICE_TUN_FLAG_MDID_OFF;
lkup_exts->fv_words[word].off =
ICE_PKT_TUNNEL_MDID_OFFSET;
lkup_exts->field_mask[word] = mask;
} else {
return -ENOSPC;
......@@ -5309,9 +5310,9 @@ ice_add_special_words(struct ice_adv_rule_info *rinfo,
u8 word = lkup_exts->n_val_words++;
lkup_exts->fv_words[word].prot_id = ICE_META_DATA_ID_HW;
lkup_exts->fv_words[word].off = ICE_VLAN_FLAG_MDID_OFF;
lkup_exts->field_mask[word] =
ICE_PKT_FLAGS_0_TO_15_VLAN_FLAGS_MASK;
lkup_exts->fv_words[word].off =
ICE_PKT_VLAN_MDID_OFFSET;
lkup_exts->field_mask[word] = ICE_PKT_VLAN_MASK;
} else {
return -ENOSPC;
}
......
drivers/net/ethernet/intel/ice/ice_vlan_mode.c
View file @ ecd01b69
......@@ -219,7 +219,7 @@ static struct ice_update_recipe_lkup_idx_params ice_dvm_dflt_recipes[] = {
.rid = ICE_SW_LKUP_VLAN,
.fv_idx = ICE_PKT_FLAGS_0_TO_15_FV_IDX,
.ignore_valid = false,
.mask = ICE_PKT_FLAGS_0_TO_15_VLAN_FLAGS_MASK,
.mask = ICE_PKT_VLAN_MASK,
.mask_valid = true,
.lkup_idx = ICE_SW_LKUP_VLAN_PKT_FLAGS_LKUP_IDX,
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7