Commit d12e20ac authored by Chris Mi's avatar Chris Mi Committed by Saeed Mahameed
Browse files

net/mlx5e: TC, Remove CONFIG_NET_TC_SKB_EXT dependency when restoring tunnel 



CONFIG_NET_TC_SKB_EXT controls the SKB extension support for
restoring chain ids. SKB extension is not required for tunnel
restoration.

Remove the CONFIG_NET_TC_SKB_EXT dependency as a pre-step for
using the tunnel restore methods for sample offload use cases.

Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent f0da4daa

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

+6 −9
Original line number Original line Diff line number Diff line
@@ -516,7 +516,6 @@ void mlx5e_rep_tc_netdevice_event_unregister(struct mlx5e_rep_priv *rpriv) 
				 mlx5e_rep_indr_block_unbind);

				 mlx5e_rep_indr_block_unbind);

}

}





#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

static bool mlx5e_restore_tunnel(struct mlx5e_priv *priv, struct sk_buff *skb,

static bool mlx5e_restore_tunnel(struct mlx5e_priv *priv, struct sk_buff *skb,

				 struct mlx5e_tc_update_priv *tc_priv,

				 struct mlx5e_tc_update_priv *tc_priv,

				 u32 tunnel_id)

				 u32 tunnel_id)
@@ -615,6 +614,7 @@ static bool mlx5e_restore_skb(struct sk_buff *skb, u32 chain, u32 reg_c1, 
	struct mlx5e_priv *priv = netdev_priv(skb->dev);

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

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

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





#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

	if (chain) {

	if (chain) {

		struct mlx5_rep_uplink_priv *uplink_priv;

		struct mlx5_rep_uplink_priv *uplink_priv;

		struct mlx5e_rep_priv *uplink_rpriv;

		struct mlx5e_rep_priv *uplink_rpriv;
@@ -636,9 +636,10 @@ static bool mlx5e_restore_skb(struct sk_buff *skb, u32 chain, u32 reg_c1, 
					      zone_restore_id))

					      zone_restore_id))

			return false;

			return false;

	}

	}

#endif /* CONFIG_NET_TC_SKB_EXT */



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

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

}

}

#endif /* CONFIG_NET_TC_SKB_EXT */





bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe,

bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe,

			     struct sk_buff *skb,

			     struct sk_buff *skb,
@@ -671,18 +672,14 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
		return false;

		return false;

	}

	}





#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

	if (mapped_obj.type == MLX5_MAPPED_OBJ_CHAIN) {

	if (mapped_obj.type == MLX5_MAPPED_OBJ_CHAIN)

		return mlx5e_restore_skb(skb, mapped_obj.chain, reg_c1, tc_priv);

		return mlx5e_restore_skb(skb, mapped_obj.chain, reg_c1, tc_priv);

#endif /* CONFIG_NET_TC_SKB_EXT */

#if IS_ENABLED(CONFIG_MLX5_TC_SAMPLE)

#if IS_ENABLED(CONFIG_MLX5_TC_SAMPLE)

	if (mapped_obj.type == MLX5_MAPPED_OBJ_SAMPLE) {

	} else if (mapped_obj.type == MLX5_MAPPED_OBJ_SAMPLE) {

		mlx5e_tc_sample_skb(skb, &mapped_obj);

		mlx5e_tc_sample_skb(skb, &mapped_obj);

		return false;

		return false;

	}

#endif /* CONFIG_MLX5_TC_SAMPLE */

#endif /* CONFIG_MLX5_TC_SAMPLE */

	if (mapped_obj.type != MLX5_MAPPED_OBJ_SAMPLE &&

	} else {

	    mapped_obj.type != MLX5_MAPPED_OBJ_CHAIN) {

		netdev_dbg(priv->netdev, "Invalid mapped object type: %d\n", mapped_obj.type);

		netdev_dbg(priv->netdev, "Invalid mapped object type: %d\n", mapped_obj.type);

		return false;

		return false;

	}

	}