ice: Avoid nested RTNL locking in ice_dis_vsi (d09e2693) · Commits · 戴 / test

ice_dis_vsi() performs an rtnl_lock() if it detects a netdev that is running on the VSI. In cases where the RTNL lock has already been acquired, a deadlock results. Add a boolean to pass to ice_dis_vsi to tell it if the RTNL lock is already held. Signed-off-by:

Dave Ertman <david.m.ertman@intel.com> Signed-off-by:

Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by:

Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/ethernet/intel/ice/ice_main.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -3137,8 +3137,9 @@ static void ice_vsi_release_all(struct ice_pf *pf)
		/**
		* ice_dis_vsi - pause a VSI
		* @vsi: the VSI being paused
		* @locked: is the rtnl_lock already held
		*/
		static void ice_dis_vsi(struct ice_vsi *vsi)
		static void ice_dis_vsi(struct ice_vsi *vsi, bool locked)
		{
		if (test_bit(__ICE_DOWN, vsi->state))
		return;
		@@ -3147,9 +3148,13 @@ static void ice_dis_vsi(struct ice_vsi *vsi)

		if (vsi->type == ICE_VSI_PF && vsi->netdev) {
		if (netif_running(vsi->netdev)) {
		if (!locked) {
		rtnl_lock();
		vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
		rtnl_unlock();
		} else {
		vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
		}
		} else {
		ice_vsi_close(vsi);
		}
		@@ -3188,7 +3193,7 @@ static void ice_pf_dis_all_vsi(struct ice_pf *pf)

		ice_for_each_vsi(pf, v)
		if (pf->vsi[v])
		ice_dis_vsi(pf->vsi[v]);
		ice_dis_vsi(pf->vsi[v], false);
		}

		/**

Admin message