Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 095b6cfd authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5e: Add TC vlan match parsing 



Enhance the parsing of offloaded TC rules matches to handle vlans.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b32580d

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -164,6 +164,7 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
	    ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	    ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_PORTS))) {

	      BIT(FLOW_DISSECTOR_KEY_PORTS))) {
@@ -227,6 +228,24 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
				key->src);

				key->src);

	}

	}





	if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_VLAN)) {

		struct flow_dissector_key_vlan *key =

			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_VLAN,

						  f->key);

		struct flow_dissector_key_vlan *mask =

			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_VLAN,

						  f->mask);

		if (mask->vlan_id) {

			MLX5_SET(fte_match_set_lyr_2_4, headers_c, vlan_tag, 1);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, vlan_tag, 1);



			MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_vid, mask->vlan_id);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_vid, key->vlan_id);

		}

	}



	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {

		struct flow_dissector_key_ipv4_addrs *key =

		struct flow_dissector_key_ipv4_addrs *key =

			skb_flow_dissector_target(f->dissector,

			skb_flow_dissector_target(f->dissector,