Commit 03a283cd authored by Paul Blakey's avatar Paul Blakey Committed by Jakub Kicinski
Browse files

net/mlx5: Kconfig: Make tc offload depend on tc skb extension 



Tc skb extension is a basic requirement for using tc
offload to support correct restoration on action miss.

Depend on it.

Signed-off-by: default avatarPaul Blakey <paulb@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 606c7c43

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ config MLX5_BRIDGE 


config MLX5_CLS_ACT

	bool "MLX5 TC classifier action support"

	depends on MLX5_ESWITCH && NET_CLS_ACT

	depends on MLX5_ESWITCH && NET_CLS_ACT && NET_TC_SKB_EXT

	default y

	help

	  mlx5 ConnectX offloads support for TC classifier action (NET_CLS_ACT),
@@ -100,7 +100,7 @@ config MLX5_CLS_ACT 


config MLX5_TC_CT

	bool "MLX5 TC connection tracking offload support"

	depends on MLX5_CLS_ACT && NF_FLOW_TABLE && NET_ACT_CT && NET_TC_SKB_EXT

	depends on MLX5_CLS_ACT && NF_FLOW_TABLE && NET_ACT_CT

	default y

	help

	  Say Y here if you want to support offloading connection tracking rules

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+0 −2
Original line number Diff line number Diff line
@@ -762,7 +762,6 @@ static bool mlx5e_restore_skb_chain(struct sk_buff *skb, u32 chain, u32 reg_c1, 
	struct mlx5e_priv *priv = netdev_priv(skb->dev);

	u32 tunnel_id = (reg_c1 >> ESW_TUN_OFFSET) & TUNNEL_ID_MASK;



#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

	if (chain) {

		struct mlx5_rep_uplink_priv *uplink_priv;

		struct mlx5e_rep_priv *uplink_rpriv;
@@ -784,7 +783,6 @@ static bool mlx5e_restore_skb_chain(struct sk_buff *skb, u32 chain, u32 reg_c1, 
					      zone_restore_id))

			return false;

	}

#endif /* CONFIG_NET_TC_SKB_EXT */



	return mlx5e_restore_tunnel(priv, skb, tc_priv, tunnel_id);

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

+0 −7
Original line number Diff line number Diff line
@@ -2078,13 +2078,6 @@ mlx5_tc_ct_init_check_support(struct mlx5e_priv *priv, 
	const char *err_msg = NULL;

	int err = 0;



#if !IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

	/* cannot restore chain ID on HW miss */



	err_msg = "tc skb extension missing";

	err = -EOPNOTSUPP;

	goto out_err;

#endif

	if (IS_ERR_OR_NULL(post_act)) {

		/* Ignore_flow_level support isn't supported by default for VFs and so post_act

		 * won't be supported. Skip showing error msg.

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

+0 −2
Original line number Diff line number Diff line
@@ -5607,7 +5607,6 @@ int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, 
bool mlx5e_tc_update_skb(struct mlx5_cqe64 *cqe,

			 struct sk_buff *skb)

{

#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

	u32 chain = 0, chain_tag, reg_b, zone_restore_id;

	struct mlx5e_priv *priv = netdev_priv(skb->dev);

	struct mlx5_mapped_obj mapped_obj;
@@ -5645,7 +5644,6 @@ bool mlx5e_tc_update_skb(struct mlx5_cqe64 *cqe, 
		netdev_dbg(priv->netdev, "Invalid mapped object type: %d\n", mapped_obj.type);

		return false;

	}

#endif /* CONFIG_NET_TC_SKB_EXT */



	return true;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ struct mlx5e_tc_table *mlx5e_tc_table_alloc(void); 
void mlx5e_tc_table_free(struct mlx5e_tc_table *tc);

static inline bool mlx5e_cqe_regb_chain(struct mlx5_cqe64 *cqe)

{

#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

	u32 chain, reg_b;



	reg_b = be32_to_cpu(cqe->ft_metadata);
@@ -379,7 +378,6 @@ static inline bool mlx5e_cqe_regb_chain(struct mlx5_cqe64 *cqe) 
	chain = reg_b & MLX5E_TC_TABLE_CHAIN_TAG_MASK;

	if (chain)

		return true;

#endif



	return false;

}