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

Commit e6b6a231 authored by Rony Efraim's avatar Rony Efraim Committed by David S. Miller
Browse files

net/mlx4: Add VF MAC spoof checking support 



Add ndo_set_vf_spoofchk support

Signed-off-by: default avatarRony Efraim <ronye@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f7fb021

drivers/net/ethernet/mellanox/mlx4/cmd.c

+40 −0
Original line number Diff line number Diff line
@@ -1514,6 +1514,21 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) 
				 (int)(vp_oper->state.default_vlan),

				 vp_oper->vlan_idx, slave, port);

		}

		if (vp_admin->spoofchk) {

			vp_oper->mac_idx = __mlx4_register_mac(&priv->dev,

							       port,

							       vp_admin->mac);

			if (0 > vp_oper->mac_idx) {

				err = vp_oper->mac_idx;

				vp_oper->mac_idx = NO_INDX;

				mlx4_warn((&priv->dev),

					  "No mac resorces slave %d, port %d\n",

					  slave, port);

				return err;

			}

			mlx4_dbg((&(priv->dev)), "alloc mac %llx idx  %d slave %d port %d\n",

				 vp_oper->state.mac, vp_oper->mac_idx, slave, port);

		}

	}

	return 0;

}
@@ -1530,6 +1545,10 @@ static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave 
					       port, vp_oper->vlan_idx);

			vp_oper->vlan_idx = NO_INDX;

		}

		if (NO_INDX != vp_oper->mac_idx) {

			__mlx4_unregister_mac(&priv->dev, port, vp_oper->mac_idx);

			vp_oper->mac_idx = NO_INDX;

		}

	}

	return;

}
@@ -2111,3 +2130,24 @@ int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos) 
	return 0;

}

EXPORT_SYMBOL_GPL(mlx4_set_vf_vlan);



int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_vport_state *s_info;

	int slave;



	if ((!mlx4_is_master(dev)) ||

	    !(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FSM))

		return -EPROTONOSUPPORT;



	slave = mlx4_get_slave_indx(dev, vf);

	if (slave < 0)

		return -EINVAL;



	s_info = &priv->mfunc.master.vf_admin[slave].vport[port];

	s_info->spoofchk = setting;



	return 0;

}

EXPORT_SYMBOL_GPL(mlx4_set_vf_spoofchk);

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+9 −0
Original line number Diff line number Diff line
@@ -2044,6 +2044,14 @@ static int mlx4_en_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos) 
	return mlx4_set_vf_vlan(mdev->dev, en_priv->port, vf, vlan, qos);

}



static int mlx4_en_set_vf_spoofchk(struct net_device *dev, int vf, bool setting)

{

	struct mlx4_en_priv *en_priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = en_priv->mdev;



	return mlx4_set_vf_spoofchk(mdev->dev, en_priv->port, vf, setting);

}





static const struct net_device_ops mlx4_netdev_ops = {

	.ndo_open		= mlx4_en_open,
@@ -2084,6 +2092,7 @@ static const struct net_device_ops mlx4_netdev_ops_master = { 
	.ndo_vlan_rx_kill_vid	= mlx4_en_vlan_rx_kill_vid,

	.ndo_set_vf_mac		= mlx4_en_set_vf_mac,

	.ndo_set_vf_vlan	= mlx4_en_set_vf_vlan,

	.ndo_set_vf_spoofchk	= mlx4_en_set_vf_spoofchk,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= mlx4_en_netpoll,

#endif

drivers/net/ethernet/mellanox/mlx4/fw.c

+2 −0
Original line number Diff line number Diff line
@@ -659,6 +659,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	MLX4_GET(field32, outbox, QUERY_DEV_CAP_EXT_2_FLAGS_OFFSET);

	if (field32 & (1 << 26))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_VLAN_CONTROL;

	if (field32 & (1 << 20))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_FSM;



	if (dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {

		for (i = 1; i <= dev_cap->num_ports; ++i) {

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+8 −0
Original line number Diff line number Diff line
@@ -383,6 +383,14 @@ static int update_vport_qp_param(struct mlx4_dev *dev, 
			 vp_oper->vlan_idx, (int)(qpc->pri_path.feup),

			 (int)(qpc->pri_path.fl));

	}

	if (vp_oper->state.spoofchk) {

		qpc->pri_path.feup |= 1 << 5; /* set fsm bit */;

		qpc->pri_path.grh_mylmc = (0x80 & qpc->pri_path.grh_mylmc) + vp_oper->mac_idx;

		mlx4_dbg(dev, "spoof qp %d  port %d feup  0x%x, myLmc 0x%x mindx %d\n",

			 be32_to_cpu(qpc->local_qpn) & 0xffffff, port,

			 (int)qpc->pri_path.feup, (int)qpc->pri_path.grh_mylmc,

			 vp_oper->mac_idx);

	}

	return 0;

}

include/linux/mlx4/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbo 
u32 mlx4_comm_get_version(void);

int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac);

int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos);

int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting);





#define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)