ice: Direction metadata in tc filter
Subsystems (3)
cover ice: Direction metadata in tc filter
Add matching on direction metadata when adding a filter via tc. Also rename related enum values for readability.
Marcin Szycik (2):
ice: Add direction metadata
ice: Rename enum ice_pkt_flags values
.../ethernet/intel/ice/ice_protocol_type.h | 9 ++--- drivers/net/ethernet/intel/ice/ice_switch.c | 11 ++++-- drivers/net/ethernet/intel/ice/ice_switch.h | 1 + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 34 +++++++++---------- 4 files changed, 32 insertions(+), 23 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 ice: Add direction metadata
Currently it is possible to create a filter which breaks TX traffic, e.g.:
tc filter add dev $PF1 ingress protocol ip prio 1 flower ip_proto udp dst_port $PORT action mirred egress redirect dev $VF1_PR
This adds a rule which might match both TX and RX traffic, and in TX path the PF will actually receive the traffic, which breaks communication.
To fix this, add a match on direction metadata flag when adding a tc rule.
Because of the way metadata is currently handled, a duplicate lookup word would appear if VLAN metadata is also added. The lookup would still work correctly, but one word would be wasted. To prevent it, lookup 0 now always contains all metadata. When any metadata needs to be added, it is added to lookup 0 and lookup count is not incremented. This way, two flags residing in the same word will take up one word, instead of two.
Note: the drop action is also affected, i.e. it will now only work in one direction.
--- .../ethernet/intel/ice/ice_protocol_type.h | 1 + drivers/net/ethernet/intel/ice/ice_switch.c | 11 ++++-- drivers/net/ethernet/intel/ice/ice_switch.h | 1 + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 34 +++++++++---------- 4 files changed, 28 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/ice/ice_protocol_type.h +1 -0
@@ -298,6 +298,7 @@ struct ice_nvgre_hdr {* 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_FROM_NETWORK BIT(3)#define ICE_PKT_VLAN_STAG BIT(12)#define ICE_PKT_VLAN_ITAG BIT(13)#define ICE_PKT_VLAN_EVLAN (BIT(14) | BIT(15))
drivers/net/ethernet/intel/ice/ice_switch.c +9 -2
@@ -6143,14 +6143,21 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,void ice_rule_add_tunnel_metadata (struct ice_adv_lkup_elem *lkup) { lkup->type =ICE_HW_METADATA ; - lkup->m_u.metadata.flags[ICE_PKT_FLAGS_TUNNEL ] = + lkup->m_u.metadata.flags[ICE_PKT_FLAGS_TUNNEL ] |=cpu_to_be16 (ICE_PKT_TUNNEL_MASK ); } +void ice_rule_add_direction_metadata (struct ice_adv_lkup_elem *lkup) +{ + lkup->type =ICE_HW_METADATA ; + lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN ] |= +cpu_to_be16 (ICE_PKT_FROM_NETWORK ); +} +void ice_rule_add_vlan_metadata (struct ice_adv_lkup_elem *lkup) { lkup->type =ICE_HW_METADATA ; - lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN ] = + lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN ] |=cpu_to_be16 (ICE_PKT_VLAN_MASK ); }
drivers/net/ethernet/intel/ice/ice_switch.h +1 -0
@@ -361,6 +361,7 @@ int ice_share_res(struct ice_hw *hw, u16 type, u8 shared, u16 res_id);/* Switch/bridge related commands */ void ice_rule_add_tunnel_metadata (struct ice_adv_lkup_elem *lkup); +void ice_rule_add_direction_metadata (struct ice_adv_lkup_elem *lkup);void ice_rule_add_vlan_metadata (struct ice_adv_lkup_elem *lkup);void ice_rule_add_src_vsi_metadata (struct ice_adv_lkup_elem *lkup);int
drivers/net/ethernet/intel/ice/ice_tc_lib.c +17 -17
@@ -7,6 +7,8 @@#include "ice_lib.h" #include "ice_protocol_type.h" +#define ICE_TC_METADATA_LKUP_IDX 0 +/** * ice_tc_count_lkups - determine lookup count for switch filter * @flags: TC-flower flags
@@ -19,7 +21,13 @@ static int ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, struct ice_tc_flower_fltr *fltr) { - int lkups_cnt = 0; + int lkups_cnt = 1; /* 0th lookup is metadata */ + +/* Always add metadata as the 0th lookup. Included elements: +* - Direction flag (always present) +* - ICE_TC_FLWR_FIELD_VLAN_TPID (present if specified) +* - Tunnel flag (present if tunnel) +*/ if (flags &ICE_TC_FLWR_FIELD_TENANT_ID ) lkups_cnt++;
@@ -57,10 +65,6 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers,if (flags & (ICE_TC_FLWR_FIELD_VLAN |ICE_TC_FLWR_FIELD_VLAN_PRIO )) lkups_cnt++; -/* is VLAN TPID specified */ -if (flags &ICE_TC_FLWR_FIELD_VLAN_TPID ) - lkups_cnt++; -/* is CVLAN specified? */ if (flags & (ICE_TC_FLWR_FIELD_CVLAN |ICE_TC_FLWR_FIELD_CVLAN_PRIO )) lkups_cnt++;
@@ -87,10 +91,6 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, ICE_TC_FLWR_FIELD_SRC_L4_PORT)) lkups_cnt++; -/* matching for tunneled packets in metadata */ -if (fltr->tunnel_type !=TNL_LAST ) - lkups_cnt++; -return lkups_cnt; }
@@ -183,10 +183,9 @@ static u16 ice_check_supported_vlan_tpid(u16 vlan_tpid)static int ice_tc_fill_tunnel_outer (u32 flags,struct ice_tc_flower_fltr *fltr, -struct ice_adv_lkup_elem *list) +struct ice_adv_lkup_elem *list,int i) {struct ice_tc_flower_lyr_2_4_hdrs *hdr = &fltr->outer_headers; -int i =0 ;if (flags &ICE_TC_FLWR_FIELD_TENANT_ID ) {u32 tenant_id;
@@ -351,8 +350,7 @@ ice_tc_fill_tunnel_outer(u32 flags, struct ice_tc_flower_fltr *fltr, }/* always fill matching on tunneled packets in metadata */ -ice_rule_add_tunnel_metadata (&list[i]); - i++; +ice_rule_add_tunnel_metadata (&list[ICE_TC_METADATA_LKUP_IDX ]);return i; }
@@ -380,13 +378,16 @@ ice_tc_fill_rules(struct ice_hw *hw, u32 flags,struct ice_tc_flower_lyr_2_4_hdrs *headers = &tc_fltr->outer_headers;bool inner = false;u16 vlan_tpid =0 ; -int i =0 ; +int i =1 ;/* 0th lookup is metadata */ rule_info->vlan_type = vlan_tpid; +/* Always add direction metadata */ +ice_rule_add_direction_metadata (&list[ICE_TC_METADATA_LKUP_IDX ]); + rule_info->tun_type =ice_sw_type_from_tunnel (tc_fltr->tunnel_type);if (tc_fltr->tunnel_type !=TNL_LAST ) { - i =ice_tc_fill_tunnel_outer (flags, tc_fltr, list); + i =ice_tc_fill_tunnel_outer (flags, tc_fltr, list, i);/* PFCP is considered non-tunneled - don't swap headers. */ if (tc_fltr->tunnel_type !=TNL_PFCP ) {
@@ -456,8 +457,7 @@ ice_tc_fill_rules(struct ice_hw *hw, u32 flags, rule_info->vlan_type =ice_check_supported_vlan_tpid (vlan_tpid); -ice_rule_add_vlan_metadata (&list[i]); - i++; +ice_rule_add_vlan_metadata (&list[ICE_TC_METADATA_LKUP_IDX ]); }if (flags & (ICE_TC_FLWR_FIELD_CVLAN |ICE_TC_FLWR_FIELD_CVLAN_PRIO )) {
Signature · 1 line
2.31.1
Re: [PATCH iwl-next 1/2] ice: Add direction metadata
Quoted 17 lines · Marcin Szycik
Currently it is possible to create a filter which breaks TX traffic, e.g.:
tc filter add dev $PF1 ingress protocol ip prio 1 flower
ip_protoudpdst_port$PORT action mirred egress redirect dev $VF1_PRThis adds a rule which might match both TX and RX traffic, and in TX path the PF will actually receive the traffic, which breaks communication.
To fix this, add a match on direction metadata flag when adding a tc rule.
Because of the way metadata is currently handled, a duplicate lookup word would appear if VLAN metadata is also added. The lookup would still work correctly, but one word would be wasted. To prevent it, lookup 0 now always contains all metadata. When any metadata needs to be added, it is added to lookup 0 and lookup count is not incremented. This way, two flags residing in the same word will take up one word, instead of two.
Quoted 4 lines
Note: the drop action is also affected, i.e. it will now only work in one direction.
Signed-off-by Marcin Szycik <[email protected]>
RE: [Intel-wired-lan] [PATCH iwl-next 1/2] ice: Add direction metadata
In reply to Marcin SzycikQuoted 28 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Marcin Szycik
Sent: Thursday, June 22, 2023 7:05 PM
To: [email protected]
Cc: [email protected]
Subject: [Intel-wired-lan] [PATCH iwl-next 1/2] ice: Add direction metadataCurrently it is possible to create a filter which breaks TX traffic, e.g.:
tc filter add dev $PF1 ingress protocol ip prio 1 flower
ip_protoudpdst_port$PORT action mirred egress redirect dev $VF1_PRThis adds a rule which might match both TX and RX traffic, and in TX path the PF will actually receive the traffic, which breaks communication.
To fix this, add a match on direction metadata flag when adding a tc rule.
Because of the way metadata is currently handled, a duplicate lookup word would appear if VLAN metadata is also added. The lookup would still work correctly, but one word would be wasted. To prevent it, lookup 0 now always contains all metadata. When any metadata needs to be added, it is added to lookup 0 and lookup count is not incremented. This way, two flags residing in the same word will take up one word, instead of two.
Note: the drop action is also affected, i.e. it will now only work in one direction.
Quoted 8 lines
Signed-off-by Marcin Szycik <[email protected]>--- .../ethernet/intel/ice/ice_protocol_type.h | 1 + drivers/net/ethernet/intel/ice/ice_switch.c | 11 ++++-- drivers/net/ethernet/intel/ice/ice_switch.h | 1 + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 34 +++++++++---------- 4 files changed, 28 insertions(+), 19 deletions(-)
PATCH 2/2 ice: Rename enum ice_pkt_flags values
In reply to Marcin Szycikenum ice_pkt_flags contains values such as ICE_PKT_FLAGS_VLAN and ICE_PKT_FLAGS_TUNNEL, but actually the flags words which they refer to contain a range of unrelated values - e.g. word 0 (ICE_PKT_FLAGS_VLAN) contains fields such as from_network and ucast, which have nothing to do with VLAN. Rename each enum value to ICE_PKT_FLAGS_MDID<number>, so it's clear in which flags word does some value reside.
--- drivers/net/ethernet/intel/ice/ice_protocol_type.h | 8 ++++---- drivers/net/ethernet/intel/ice/ice_switch.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ice/ice_protocol_type.h +4 -4
@@ -404,10 +404,10 @@ enum ice_hw_metadata_offset { };enum ice_pkt_flags { -ICE_PKT_FLAGS_VLAN =0 , -ICE_PKT_FLAGS_TUNNEL =1 , -ICE_PKT_FLAGS_TCP =2 , -ICE_PKT_FLAGS_ERROR =3 , +ICE_PKT_FLAGS_MDID20 =0 , +ICE_PKT_FLAGS_MDID21 =1 , +ICE_PKT_FLAGS_MDID22 =2 , +ICE_PKT_FLAGS_MDID23 =3 , };struct ice_hw_metadata {
drivers/net/ethernet/intel/ice/ice_switch.c +3 -3
@@ -6143,21 +6143,21 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,void ice_rule_add_tunnel_metadata (struct ice_adv_lkup_elem *lkup) { lkup->type =ICE_HW_METADATA ; - lkup->m_u.metadata.flags[ICE_PKT_FLAGS_TUNNEL ] |= + lkup->m_u.metadata.flags[ICE_PKT_FLAGS_MDID21 ] |=cpu_to_be16 (ICE_PKT_TUNNEL_MASK ); }void ice_rule_add_direction_metadata (struct ice_adv_lkup_elem *lkup) { lkup->type =ICE_HW_METADATA ; - lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN ] |= + lkup->m_u.metadata.flags[ICE_PKT_FLAGS_MDID20 ] |=cpu_to_be16 (ICE_PKT_FROM_NETWORK ); }void ice_rule_add_vlan_metadata (struct ice_adv_lkup_elem *lkup) { lkup->type =ICE_HW_METADATA ; - lkup->m_u.metadata.flags[ICE_PKT_FLAGS_VLAN ] |= + lkup->m_u.metadata.flags[ICE_PKT_FLAGS_MDID20 ] |=cpu_to_be16 (ICE_PKT_VLAN_MASK ); }
Signature · 1 line
2.31.1
Re: [PATCH iwl-next 2/2] ice: Rename enum ice_pkt_flags values
Quoted 8 lines · Marcin Szycik
enum
ice_pkt_flagscontains values such asICE_PKT_FLAGS_VLANandICE_PKT_FLAGS_TUNNEL, but actually the flags words which they refer to contain a range of unrelated values - e.g. word 0 (ICE_PKT_FLAGS_VLAN) contains fields such asfrom_networkand ucast, which have nothing to do with VLAN. Rename each enum value to ICE_PKT_FLAGS_MDID<number>, so it's clear in which flags word does some value reside.Signed-off-by Marcin Szycik <[email protected]>
RE: [Intel-wired-lan] [PATCH iwl-next 2/2] ice: Rename enum ice_pkt_flags values
In reply to Marcin SzycikQuoted 16 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Marcin Szycik
Sent: Thursday, June 22, 2023 7:05 PM
To: [email protected]
Cc: [email protected]
Subject: [Intel-wired-lan] [PATCH iwl-next 2/2] ice: Rename enumice_pkt_flagsvaluesenum
ice_pkt_flagscontains values such asICE_PKT_FLAGS_VLANandICE_PKT_FLAGS_TUNNEL, but actually the flags words which they refer to contain a range of unrelated values - e.g. word 0 (ICE_PKT_FLAGS_VLAN) contains fields such asfrom_networkand ucast, which have nothing to do with VLAN. Rename each enum value to ICE_PKT_FLAGS_MDID<number>, so it's clear in which flags word does some value reside.
Quoted 6 lines
Signed-off-by Marcin Szycik <[email protected]>--- drivers/net/ethernet/intel/ice/ice_protocol_type.h | 8 ++++---- drivers/net/ethernet/intel/ice/ice_switch.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan