Commit be714bc6 authored by Chris Mi's avatar Chris Mi Committed by Zhang Changzhong
Browse files

net/mlx5: E-switch, Introduce flag to indicate if fdb table is created 

mainline inclusion
from mainline-v6.0-rc1
commit fbd43b72
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAU9OW
CVE: CVE-2024-46857

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbd43b7259bc699e540ef8e7eb81631d57618a2e



--------------------------------

Introduce flag to indicate if fdb table is created as a pre-step
to prepare for removing dependency between sriov and eswitch mode
in the downstream patches.

Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
[ commit 19e9bfa0 ("net/mlx5: Bridge, add offload infrastructure")
not merged ]
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parent 17befaf8

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

+3 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,8 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs) 
	if (err)

		goto abort;



	esw->fdb_table.flags |= MLX5_ESW_FDB_CREATED;



	mlx5_eswitch_event_handlers_register(esw);



	esw_info(esw->dev, "Enable: mode(%s), nvfs(%d), active vports(%d)\n",
@@ -1695,6 +1697,7 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf) 


	mlx5_eswitch_event_handlers_unregister(esw);



	esw->fdb_table.flags &= ~MLX5_ESW_FDB_CREATED;

	if (esw->mode == MLX5_ESWITCH_LEGACY)

		esw_legacy_disable(esw);

	else if (esw->mode == MLX5_ESWITCH_OFFLOADS)

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

+9 −0
Original line number Diff line number Diff line
@@ -241,6 +241,10 @@ enum { 
	MLX5_ESWITCH_REG_C1_LOOPBACK_ENABLED = BIT(1),

};



enum {

	MLX5_ESW_FDB_CREATED = BIT(0),

};



struct mlx5_eswitch {

	struct mlx5_core_dev    *dev;

	struct mlx5_nb          nb;
@@ -556,6 +560,11 @@ mlx5_esw_devlink_port_index_to_vport_num(unsigned int dl_port_index) 
	return dl_port_index & 0xffff;

}



static inline bool mlx5_esw_is_fdb_created(struct mlx5_eswitch *esw)

{

	return esw->fdb_table.flags & MLX5_ESW_FDB_CREATED;

}



/* TODO: This mlx5e_tc function shouldn't be called by eswitch */

void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw);