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

Commit a8d70a05 authored by Eli Cohen's avatar Eli Cohen Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Disallow vlan/spoofcheck setup if not being esw manager 



In smartnic env, if the host (PF) driver is not an e-switch manager, we
are not allowed to apply eswitch ports setups such as vlan (VST),
spoof-checks, min/max rate or state.

Make sure we are eswitch manager when coming to issue these callbacks
and err otherwise.

Also fix the definition of ESW_ALLOWED to rely on eswitch_manager
capability and on the vport_group_manger.

Operations on the VF nic vport context, such as setting a mac or reading
the vport counters are allowed to the PF in this scheme.

The modify nic vport guid code was modified to omit checking the
nic_vport_node_guid_modify eswitch capability.
The reason for doing so is that modifying node guid requires vport group
manager capability, and there's no need to check further capabilities.

1. set_vf_vlan     - disallowed
2. set_vf_spoofchk - disallowed
3. set_vf_mac      - allowed
4. get_vf_config   - allowed
5. set_vf_trust    - disallowed
6. set_vf_rate     - disallowed
7. get_vf_stat     - allowed
8. set_vf_link_state - disallowed

Fixes: f942380c ('net/mlx5: E-Switch, Vport ingress/egress ACLs rules for spoofchk')
Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Tested-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
parent aff2252a

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

+5 −7
Original line number Original line Diff line number Diff line
@@ -1594,17 +1594,15 @@ static void esw_disable_vport(struct mlx5_eswitch *esw, int vport_num) 
}

}





/* Public E-Switch API */

/* Public E-Switch API */

#define ESW_ALLOWED(esw) ((esw) && MLX5_VPORT_MANAGER((esw)->dev))

#define ESW_ALLOWED(esw) ((esw) && MLX5_ESWITCH_MANAGER((esw)->dev))







int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)

int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)

{

{

	int err;

	int err;

	int i, enabled_events;

	int i, enabled_events;





	if (!ESW_ALLOWED(esw))

	if (!ESW_ALLOWED(esw) ||

		return 0;



	if (!MLX5_ESWITCH_MANAGER(esw->dev) ||

	    !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {

	    !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {

		esw_warn(esw->dev, "E-Switch FDB is not supported, aborting ...\n");

		esw_warn(esw->dev, "E-Switch FDB is not supported, aborting ...\n");

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;
@@ -1806,7 +1804,7 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw, 
	u64 node_guid;

	u64 node_guid;

	int err = 0;

	int err = 0;





	if (!ESW_ALLOWED(esw))

	if (!MLX5_CAP_GEN(esw->dev, vport_group_manager))

		return -EPERM;

		return -EPERM;

	if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac))

	if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac))

		return -EINVAL;

		return -EINVAL;
@@ -1883,7 +1881,7 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, 
{

{

	struct mlx5_vport *evport;

	struct mlx5_vport *evport;





	if (!ESW_ALLOWED(esw))

	if (!MLX5_CAP_GEN(esw->dev, vport_group_manager))

		return -EPERM;

		return -EPERM;

	if (!LEGAL_VPORT(esw, vport))

	if (!LEGAL_VPORT(esw, vport))

		return -EINVAL;

		return -EINVAL;

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -549,8 +549,6 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev, 
		return -EINVAL;

		return -EINVAL;

	if (!MLX5_CAP_GEN(mdev, vport_group_manager))

	if (!MLX5_CAP_GEN(mdev, vport_group_manager))

		return -EACCES;

		return -EACCES;

	if (!MLX5_CAP_ESW(mdev, nic_vport_node_guid_modify))

		return -EOPNOTSUPP;





	in = kvzalloc(inlen, GFP_KERNEL);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

	if (!in)