net/mlx5e: Get the number of offloaded TC rules from the correct table (01252a27) · Commits · 戴 / test

As we keep the offloaded TC rules for NIC and e-switch in two different places, make sure to return the number of offloaded flows according to the use-case and not blindly from the priv. Fixes: ('net/mlx5e: Use shared table for offloaded TC eswitch flows') Signed-off-by:

Or Gerlitz <ogerlitz@mellanox.com> Reported-by:

Paul Blakey <paulb@mellanox.com> Reviewed-by:

Paul Blakey <paulb@mellanox.com> Signed-off-by:

Saeed Mahameed <saeedm@mellanox.com>

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -2876,3 +2876,10 @@ void mlx5e_tc_esw_cleanup(struct rhashtable *tc_ht)
		{
		rhashtable_free_and_destroy(tc_ht, _mlx5e_tc_del_flow, NULL);
		}

		int mlx5e_tc_num_filters(struct mlx5e_priv *priv)
		{
		struct rhashtable *tc_ht = get_tc_ht(priv);

		return atomic_read(&tc_ht->nelems);
		}

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -68,10 +68,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv,
		struct mlx5e_neigh_hash_entry;
		void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe);

		static inline int mlx5e_tc_num_filters(struct mlx5e_priv *priv)
		{
		return atomic_read(&priv->fs.tc.ht.nelems);
		}
		int mlx5e_tc_num_filters(struct mlx5e_priv *priv);

		#else /* CONFIG_MLX5_ESWITCH */
		static inline int mlx5e_tc_nic_init(struct mlx5e_priv *priv) { return 0; }

Admin message