Commit e59b4954 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-04-16 (ice)

This series contains updates to ice driver only.

Michal fixes a couple of issues with TC filter parsing; always add match
for src_vsi and remove flag check that could prevent addition of valid
filters.

Marcin adds additional checks for unsupported flower filters.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: Fix checking for unsupported keys on non-tunnel device
  ice: tc: allow zero flags in parsing tc flower
  ice: tc: check src_vsi in case of traffic from VF
====================

Link: https://lore.kernel.org/r/20240416202409.2008383-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents caed8eba 2cca35f5

drivers/net/ethernet/intel/ice/ice_tc_lib.c

+13 −2
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, 
	 * - ICE_TC_FLWR_FIELD_VLAN_TPID (present if specified)

	 * - Tunnel flag (present if tunnel)

	 */

	if (fltr->direction == ICE_ESWITCH_FLTR_EGRESS)

		lkups_cnt++;



	if (flags & ICE_TC_FLWR_FIELD_TENANT_ID)

		lkups_cnt++;
@@ -363,6 +365,11 @@ ice_tc_fill_rules(struct ice_hw *hw, u32 flags, 
	/* Always add direction metadata */

	ice_rule_add_direction_metadata(&list[ICE_TC_METADATA_LKUP_IDX]);



	if (tc_fltr->direction == ICE_ESWITCH_FLTR_EGRESS) {

		ice_rule_add_src_vsi_metadata(&list[i]);

		i++;

	}



	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);
@@ -772,7 +779,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr) 
	int ret;

	int i;



	if (!flags || (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT)) {

	if (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT) {

		NL_SET_ERR_MSG_MOD(fltr->extack, "Unsupported encap field(s)");

		return -EOPNOTSUPP;

	}
@@ -820,6 +827,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr) 


	/* specify the cookie as filter_rule_id */

	rule_info.fltr_rule_id = fltr->cookie;

	rule_info.src_vsi = vsi->idx;



	ret = ice_add_adv_rule(hw, list, lkups_cnt, &rule_info, &rule_added);

	if (ret == -EEXIST) {
@@ -1481,7 +1489,10 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, 
		  (BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_PORTS))) {

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_PORTS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IP) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_OPTS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_CONTROL))) {

		NL_SET_ERR_MSG_MOD(fltr->extack, "Tunnel key used, but device isn't a tunnel");

		return -EOPNOTSUPP;

	} else {