Commit 93415e45 authored by Vlad Buslov's avatar Vlad Buslov Committed by Saeed Mahameed
Browse files

net/mlx5e: Extract code that queues neigh update work into function 



As a preparation for following refactoring that removes rtnl lock
dependency from neigh hash entry handlers, extract code that enqueues neigh
update work into standalone function. This commit doesn't change
functionality.

Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Reviewed-by: default avatarJianbo Liu <jianbol@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2b9b5e74

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

+23 −15
Original line number Diff line number Diff line
@@ -821,6 +821,28 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb, 
	return NOTIFY_OK;

}



static void

mlx5e_rep_queue_neigh_update_work(struct mlx5e_priv *priv,

				  struct mlx5e_neigh_hash_entry *nhe,

				  struct neighbour *n)

{

	/* Take a reference to ensure the neighbour and mlx5 encap

	 * entry won't be destructed until we drop the reference in

	 * delayed work.

	 */

	neigh_hold(n);



	/* This assignment is valid as long as the the neigh reference

	 * is taken

	 */

	nhe->n = n;



	if (!queue_work(priv->wq, &nhe->neigh_update_work)) {

		mlx5e_rep_neigh_entry_release(nhe);

		neigh_release(n);

	}

}



static struct mlx5e_neigh_hash_entry *

mlx5e_rep_neigh_entry_lookup(struct mlx5e_priv *priv,

			     struct mlx5e_neigh *m_neigh);
@@ -864,22 +886,8 @@ static int mlx5e_rep_netevent_event(struct notifier_block *nb, 
			return NOTIFY_DONE;

		}



		/* This assignment is valid as long as the the neigh reference

		 * is taken

		 */

		nhe->n = n;



		/* Take a reference to ensure the neighbour and mlx5 encap

		 * entry won't be destructed until we drop the reference in

		 * delayed work.

		 */

		neigh_hold(n);

		mlx5e_rep_neigh_entry_hold(nhe);



		if (!queue_work(priv->wq, &nhe->neigh_update_work)) {

			mlx5e_rep_neigh_entry_release(nhe);

			neigh_release(n);

		}

		mlx5e_rep_queue_neigh_update_work(priv, nhe, n);

		spin_unlock_bh(&neigh_update->encap_lock);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE