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

Commit 2009d005 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller
Browse files

net/mlx4_en: Use vlan id instead of vlan index for unregistration 



Use of vlan_index created problems unregistering vlans on guests.

In addition, tools delete vlan by tag, not by index, lets follow that.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acddd5dd

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

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave 
		vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];

		if (NO_INDX != vp_oper->vlan_idx) {

			__mlx4_unregister_vlan(&priv->dev,

					       port, vp_oper->vlan_idx);

					       port, vp_oper->state.default_vlan);

			vp_oper->vlan_idx = NO_INDX;

		}

		if (NO_INDX != vp_oper->mac_idx) {

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

+1 −5
Original line number Diff line number Diff line
@@ -417,7 +417,6 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev, 
	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	int err;

	int idx;



	en_dbg(HW, priv, "Killing VID:%d\n", vid);
@@ -425,10 +424,7 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev, 


	/* Remove VID from port VLAN filter */

	mutex_lock(&mdev->state_lock);

	if (!mlx4_find_cached_vlan(mdev->dev, priv->port, vid, &idx))

		mlx4_unregister_vlan(mdev->dev, priv->port, idx);

	else

		en_dbg(HW, priv, "could not find vid %d in cache\n", vid);

	mlx4_unregister_vlan(mdev->dev, priv->port, vid);



	if (mdev->device_up && priv->port_up) {

		err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ int mlx4_change_port_types(struct mlx4_dev *dev, 


void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table);

void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);

void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index);

void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);

int __mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);



int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port, int pkey_tbl_sz);

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

+15 −12
Original line number Diff line number Diff line
@@ -406,23 +406,26 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index) 
}

EXPORT_SYMBOL_GPL(mlx4_register_vlan);



void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)

void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan)

{

	struct mlx4_vlan_table *table = &mlx4_priv(dev)->port[port].vlan_table;

	int index;



	if (index < MLX4_VLAN_REGULAR) {

		mlx4_warn(dev, "Trying to free special vlan index %d\n", index);

		return;

	mutex_lock(&table->mutex);

	if (mlx4_find_cached_vlan(dev, port, vlan, &index)) {

		mlx4_warn(dev, "vlan 0x%x is not in the vlan table\n", vlan);

		goto out;

	}



	mutex_lock(&table->mutex);

	if (!table->refs[index]) {

		mlx4_warn(dev, "No vlan entry for index %d\n", index);

	if (index < MLX4_VLAN_REGULAR) {

		mlx4_warn(dev, "Trying to free special vlan index %d\n", index);

		goto out;

	}



	if (--table->refs[index]) {

		mlx4_dbg(dev, "Have more references for index %d,"

			 "no need to modify vlan table\n", index);

		mlx4_dbg(dev, "Have %d more references for index %d,"

			 "no need to modify vlan table\n", table->refs[index],

			 index);

		goto out;

	}

	table->entries[index] = 0;
@@ -432,19 +435,19 @@ void __mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index) 
	mutex_unlock(&table->mutex);

}



void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, int index)

void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan)

{

	u64 out_param = 0;



	if (mlx4_is_mfunc(dev)) {

		(void) mlx4_cmd_imm(dev, index, &out_param,

		(void) mlx4_cmd_imm(dev, vlan, &out_param,

				    ((u32) port) << 8 | (u32) RES_VLAN,

				    RES_OP_RESERVE_AND_MAP,

				    MLX4_CMD_FREE_RES, MLX4_CMD_TIME_CLASS_A,

				    MLX4_CMD_WRAPPED);

		return;

	}

	__mlx4_unregister_vlan(dev, port, index);

	__mlx4_unregister_vlan(dev, port, vlan);

}

EXPORT_SYMBOL_GPL(mlx4_unregister_vlan);

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

+1 −1
Original line number Diff line number Diff line
@@ -4085,7 +4085,7 @@ void mlx4_vf_immed_vlan_work_handler(struct work_struct *_work) 
	if (work->flags & MLX4_VF_IMMED_VLAN_FLAG_VLAN && !errors &&

	    NO_INDX != work->orig_vlan_ix)

		__mlx4_unregister_vlan(&work->priv->dev, work->port,

				       work->orig_vlan_ix);

				       work->orig_vlan_id);

out:

	kfree(work);

	return;