Add MPLS training packet and offsets.
Add check if the type is MPLS for ethertype filters.
For example:
flow create 0 ingress pattern eth dst is 00:11:22:33:44:55
type is 0x8847 / end actions queue index 2 / end
This flow will result in all the matched ingress packets be
forwarded to queue 2.
Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
---
drivers/net/ice/base/ice_switch.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
@@ -15,6 +15,7 @@
#define ICE_IPV6_ETHER_ID 0x86DD
#define ICE_TCP_PROTO_ID 0x06
#define ICE_ETH_P_8021Q 0x8100
+#define ICE_MPLS_ETHER_ID 0x8847
/* Dummy ethernet header needed in the ice_aqc_sw_rules_elem
* struct to configure any switch filter rules.
@@ -319,6 +320,25 @@ struct ice_dummy_pkt_offsets {
0x00, 0x00, /* 2 bytes for 4 byte alignment */
};
+/* offset info for MAC + MPLS dummy packet */
+static const struct ice_dummy_pkt_offsets dummy_mpls_packet_offsets[] = {
+ { ICE_MAC_OFOS, 0 },
+ { ICE_ETYPE_OL, 12 },
+ { ICE_PROTOCOL_LAST, 0 },
+};
+
+/* Dummy packet for MAC + MPLS */
+static const u8 dummy_mpls_packet[] = {
+ 0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+
+ 0x88, 0x47, /* ICE_ETYPE_OL 12 */
+ 0x00, 0x00, 0x01, 0x00,
+
+ 0x00, 0x00, /* 2 bytes for 4 byte alignment */
+};
+
/* offset info for MAC + VLAN (C-tag, 802.1Q) + IPv4 + TCP dummy packet */
static const struct ice_dummy_pkt_offsets dummy_vlan_tcp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
@@ -7727,7 +7747,7 @@ bool ice_is_prof_rule(enum ice_sw_tunnel_type type)
const struct ice_dummy_pkt_offsets **offsets)
{
bool tcp = false, udp = false, ipv6 = false, vlan = false;
- bool gre = false;
+ bool gre = false, mpls = false;
u16 i;
for (i = 0; i < lkups_cnt; i++) {
@@ -7763,6 +7783,11 @@ bool ice_is_prof_rule(enum ice_sw_tunnel_type type)
lkups[i].m_u.ipv4_hdr.protocol ==
0xFF)
tcp = true;
+ else if (lkups[i].type == ICE_ETYPE_OL &&
+ lkups[i].h_u.ethertype.ethtype_id ==
+ CPU_TO_BE16(ICE_MPLS_ETHER_ID) &&
+ lkups[i].m_u.ethertype.ethtype_id == 0xFFFF)
+ mpls = true;
}
if ((tun_type == ICE_SW_TUN_AND_NON_TUN_QINQ ||
@@ -8058,6 +8083,10 @@ bool ice_is_prof_rule(enum ice_sw_tunnel_type type)
*pkt = dummy_vlan_tcp_packet;
*pkt_len = sizeof(dummy_vlan_tcp_packet);
*offsets = dummy_vlan_tcp_packet_offsets;
+ } else if (mpls) {
+ *pkt = dummy_mpls_packet;
+ *pkt_len = sizeof(dummy_mpls_packet);
+ *offsets = dummy_mpls_packet_offsets;
} else {
*pkt = dummy_tcp_packet;
*pkt_len = sizeof(dummy_tcp_packet);