* [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf()
@ 2024-04-08 23:03 Jacob Keller
2024-04-09 7:09 ` Mateusz Polchlopek
2024-04-11 12:28 ` Przemek Kitszel
0 siblings, 2 replies; 4+ messages in thread
From: Jacob Keller @ 2024-04-08 23:03 UTC (permalink / raw)
To: Intel Wired LAN, Anthony Nguyen; +Cc: Jacob Keller, Dave Ertman
9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over
aggregate"), the ice driver has acquired the LAG mutex in ice_reset_vf().
The commit placed this lock acquisition just prior to the acquisition of
the VF configuration lock.
If ice_reset_vf() acquires the configuration lock via the ICE_VF_RESET_LOCK
flag, this could deadlock with ice_vc_cfg_qs_msg() because it always
acquires the locks in the order of the VF configuration lock and then the
LAG mutex.
Lockdep reports this violation almost immediately on creating and then
removing 2 VF:
======================================================
WARNING: possible circular locking dependency detected
6.8.0-rc6 #54 Tainted: G W O
------------------------------------------------------
kworker/60:3/6771 is trying to acquire lock:
ff40d43e099380a0 (&vf->cfg_lock){+.+.}-{3:3}, at: ice_reset_vf+0x22f/0x4d0 [ice]
but task is already holding lock:
ff40d43ea1961210 (&pf->lag_mutex){+.+.}-{3:3}, at: ice_reset_vf+0xb7/0x4d0 [ice]
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&pf->lag_mutex){+.+.}-{3:3}:
__lock_acquire+0x4f8/0xb40
lock_acquire+0xd4/0x2d0
__mutex_lock+0x9b/0xbf0
ice_vc_cfg_qs_msg+0x45/0x690 [ice]
ice_vc_process_vf_msg+0x4f5/0x870 [ice]
__ice_clean_ctrlq+0x2b5/0x600 [ice]
ice_service_task+0x2c9/0x480 [ice]
process_one_work+0x1e9/0x4d0
worker_thread+0x1e1/0x3d0
kthread+0x104/0x140
ret_from_fork+0x31/0x50
ret_from_fork_asm+0x1b/0x30
-> #0 (&vf->cfg_lock){+.+.}-{3:3}:
check_prev_add+0xe2/0xc50
validate_chain+0x558/0x800
__lock_acquire+0x4f8/0xb40
lock_acquire+0xd4/0x2d0
__mutex_lock+0x9b/0xbf0
ice_reset_vf+0x22f/0x4d0 [ice]
ice_process_vflr_event+0x98/0xd0 [ice]
ice_service_task+0x1cc/0x480 [ice]
process_one_work+0x1e9/0x4d0
worker_thread+0x1e1/0x3d0
kthread+0x104/0x140
ret_from_fork+0x31/0x50
ret_from_fork_asm+0x1b/0x30
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&pf->lag_mutex);
lock(&vf->cfg_lock);
lock(&pf->lag_mutex);
lock(&vf->cfg_lock);
*** DEADLOCK ***
4 locks held by kworker/60:3/6771:
#0: ff40d43e05428b38 ((wq_completion)ice){+.+.}-{0:0}, at: process_one_work+0x176/0x4d0
#1: ff50d06e05197e58 ((work_completion)(&pf->serv_task)){+.+.}-{0:0}, at: process_one_work+0x176/0x4d0
#2: ff40d43ea1960e50 (&pf->vfs.table_lock){+.+.}-{3:3}, at: ice_process_vflr_event+0x48/0xd0 [ice]
#3: ff40d43ea1961210 (&pf->lag_mutex){+.+.}-{3:3}, at: ice_reset_vf+0xb7/0x4d0 [ice]
stack backtrace:
CPU: 60 PID: 6771 Comm: kworker/60:3 Tainted: G W O 6.8.0-rc6 #54
Hardware name:
Workqueue: ice ice_service_task [ice]
Call Trace:
<TASK>
dump_stack_lvl+0x4a/0x80
check_noncircular+0x12d/0x150
check_prev_add+0xe2/0xc50
? save_trace+0x59/0x230
? add_chain_cache+0x109/0x450
validate_chain+0x558/0x800
__lock_acquire+0x4f8/0xb40
? lockdep_hardirqs_on+0x7d/0x100
lock_acquire+0xd4/0x2d0
? ice_reset_vf+0x22f/0x4d0 [ice]
? lock_is_held_type+0xc7/0x120
__mutex_lock+0x9b/0xbf0
? ice_reset_vf+0x22f/0x4d0 [ice]
? ice_reset_vf+0x22f/0x4d0 [ice]
? rcu_is_watching+0x11/0x50
? ice_reset_vf+0x22f/0x4d0 [ice]
ice_reset_vf+0x22f/0x4d0 [ice]
? process_one_work+0x176/0x4d0
ice_process_vflr_event+0x98/0xd0 [ice]
ice_service_task+0x1cc/0x480 [ice]
process_one_work+0x1e9/0x4d0
worker_thread+0x1e1/0x3d0
? __pfx_worker_thread+0x10/0x10
kthread+0x104/0x140
? __pfx_kthread+0x10/0x10
ret_from_fork+0x31/0x50
? __pfx_kthread+0x10/0x10
ret_from_fork_asm+0x1b/0x30
</TASK>
To avoid deadlock, we must acquire the LAG mutex only after acquiring the
VF configuration lock. Fix the ice_reset_vf() to acquire the LAG mutex only
after we either acquire or check that the VF configuration lock is held.
Fixes: 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over aggregate")
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Dave Ertman <david.m.ertman@intel.com>
---
drivers/net/ethernet/intel/ice/ice_vf_lib.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
index 21d26e19338a..d10a4be965b5 100644
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
@@ -856,6 +856,11 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
return 0;
}
+ if (flags & ICE_VF_RESET_LOCK)
+ mutex_lock(&vf->cfg_lock);
+ else
+ lockdep_assert_held(&vf->cfg_lock);
+
lag = pf->lag;
mutex_lock(&pf->lag_mutex);
if (lag && lag->bonded && lag->primary) {
@@ -867,11 +872,6 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
act_prt = ICE_LAG_INVALID_PORT;
}
- if (flags & ICE_VF_RESET_LOCK)
- mutex_lock(&vf->cfg_lock);
- else
- lockdep_assert_held(&vf->cfg_lock);
-
if (ice_is_vf_disabled(vf)) {
vsi = ice_get_vf_vsi(vf);
if (!vsi) {
@@ -956,14 +956,14 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
ice_mbx_clear_malvf(&vf->mbx_info);
out_unlock:
- if (flags & ICE_VF_RESET_LOCK)
- mutex_unlock(&vf->cfg_lock);
-
if (lag && lag->bonded && lag->primary &&
act_prt != ICE_LAG_INVALID_PORT)
ice_lag_move_vf_nodes_cfg(lag, pri_prt, act_prt);
mutex_unlock(&pf->lag_mutex);
+ if (flags & ICE_VF_RESET_LOCK)
+ mutex_unlock(&vf->cfg_lock);
+
return err;
}
base-commit: 3ca3256cde596573d060eda8c477996435c6d63f
--
2.44.0.53.g0f9d4d28b7e6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf()
2024-04-08 23:03 [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf() Jacob Keller
@ 2024-04-09 7:09 ` Mateusz Polchlopek
2024-04-11 12:28 ` Przemek Kitszel
1 sibling, 0 replies; 4+ messages in thread
From: Mateusz Polchlopek @ 2024-04-09 7:09 UTC (permalink / raw)
To: intel-wired-lan
On 4/9/2024 1:03 AM, Jacob Keller wrote:
> 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over
> aggregate"), the ice driver has acquired the LAG mutex in ice_reset_vf().
> The commit placed this lock acquisition just prior to the acquisition of
> the VF configuration lock.
>
> If ice_reset_vf() acquires the configuration lock via the ICE_VF_RESET_LOCK
> flag, this could deadlock with ice_vc_cfg_qs_msg() because it always
> acquires the locks in the order of the VF configuration lock and then the
> LAG mutex.
>
> Lockdep reports this violation almost immediately on creating and then
> removing 2 VF:
>
> ======================================================
> WARNING: possible circular locking dependency detected
> 6.8.0-rc6 #54 Tainted: G W O
> ------------------------------------------------------
> kworker/60:3/6771 is trying to acquire lock:
> ff40d43e099380a0 (&vf->cfg_lock){+.+.}-{3:3}, at: ice_reset_vf+0x22f/0x4d0 [ice]
>
> but task is already holding lock:
> ff40d43ea1961210 (&pf->lag_mutex){+.+.}-{3:3}, at: ice_reset_vf+0xb7/0x4d0 [ice]
>
> which lock already depends on the new lock.
>
> the existing dependency chain (in reverse order) is:
>
> -> #1 (&pf->lag_mutex){+.+.}-{3:3}:
> __lock_acquire+0x4f8/0xb40
> lock_acquire+0xd4/0x2d0
> __mutex_lock+0x9b/0xbf0
> ice_vc_cfg_qs_msg+0x45/0x690 [ice]
> ice_vc_process_vf_msg+0x4f5/0x870 [ice]
> __ice_clean_ctrlq+0x2b5/0x600 [ice]
> ice_service_task+0x2c9/0x480 [ice]
> process_one_work+0x1e9/0x4d0
> worker_thread+0x1e1/0x3d0
> kthread+0x104/0x140
> ret_from_fork+0x31/0x50
> ret_from_fork_asm+0x1b/0x30
>
> -> #0 (&vf->cfg_lock){+.+.}-{3:3}:
> check_prev_add+0xe2/0xc50
> validate_chain+0x558/0x800
> __lock_acquire+0x4f8/0xb40
> lock_acquire+0xd4/0x2d0
> __mutex_lock+0x9b/0xbf0
> ice_reset_vf+0x22f/0x4d0 [ice]
> ice_process_vflr_event+0x98/0xd0 [ice]
> ice_service_task+0x1cc/0x480 [ice]
> process_one_work+0x1e9/0x4d0
> worker_thread+0x1e1/0x3d0
> kthread+0x104/0x140
> ret_from_fork+0x31/0x50
> ret_from_fork_asm+0x1b/0x30
>
> other info that might help us debug this:
> Possible unsafe locking scenario:
> CPU0 CPU1
> ---- ----
> lock(&pf->lag_mutex);
> lock(&vf->cfg_lock);
> lock(&pf->lag_mutex);
> lock(&vf->cfg_lock);
>
> *** DEADLOCK ***
> 4 locks held by kworker/60:3/6771:
> #0: ff40d43e05428b38 ((wq_completion)ice){+.+.}-{0:0}, at: process_one_work+0x176/0x4d0
> #1: ff50d06e05197e58 ((work_completion)(&pf->serv_task)){+.+.}-{0:0}, at: process_one_work+0x176/0x4d0
> #2: ff40d43ea1960e50 (&pf->vfs.table_lock){+.+.}-{3:3}, at: ice_process_vflr_event+0x48/0xd0 [ice]
> #3: ff40d43ea1961210 (&pf->lag_mutex){+.+.}-{3:3}, at: ice_reset_vf+0xb7/0x4d0 [ice]
>
> stack backtrace:
> CPU: 60 PID: 6771 Comm: kworker/60:3 Tainted: G W O 6.8.0-rc6 #54
> Hardware name:
> Workqueue: ice ice_service_task [ice]
> Call Trace:
> <TASK>
> dump_stack_lvl+0x4a/0x80
> check_noncircular+0x12d/0x150
> check_prev_add+0xe2/0xc50
> ? save_trace+0x59/0x230
> ? add_chain_cache+0x109/0x450
> validate_chain+0x558/0x800
> __lock_acquire+0x4f8/0xb40
> ? lockdep_hardirqs_on+0x7d/0x100
> lock_acquire+0xd4/0x2d0
> ? ice_reset_vf+0x22f/0x4d0 [ice]
> ? lock_is_held_type+0xc7/0x120
> __mutex_lock+0x9b/0xbf0
> ? ice_reset_vf+0x22f/0x4d0 [ice]
> ? ice_reset_vf+0x22f/0x4d0 [ice]
> ? rcu_is_watching+0x11/0x50
> ? ice_reset_vf+0x22f/0x4d0 [ice]
> ice_reset_vf+0x22f/0x4d0 [ice]
> ? process_one_work+0x176/0x4d0
> ice_process_vflr_event+0x98/0xd0 [ice]
> ice_service_task+0x1cc/0x480 [ice]
> process_one_work+0x1e9/0x4d0
> worker_thread+0x1e1/0x3d0
> ? __pfx_worker_thread+0x10/0x10
> kthread+0x104/0x140
> ? __pfx_kthread+0x10/0x10
> ret_from_fork+0x31/0x50
> ? __pfx_kthread+0x10/0x10
> ret_from_fork_asm+0x1b/0x30
> </TASK>
>
> To avoid deadlock, we must acquire the LAG mutex only after acquiring the
> VF configuration lock. Fix the ice_reset_vf() to acquire the LAG mutex only
> after we either acquire or check that the VF configuration lock is held.
>
> Fixes: 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over aggregate")
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> Reviewed-by: Dave Ertman <david.m.ertman@intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_vf_lib.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> index 21d26e19338a..d10a4be965b5 100644
> --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> @@ -856,6 +856,11 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> return 0;
> }
>
> + if (flags & ICE_VF_RESET_LOCK)
> + mutex_lock(&vf->cfg_lock);
> + else
> + lockdep_assert_held(&vf->cfg_lock);
> +
> lag = pf->lag;
> mutex_lock(&pf->lag_mutex);
> if (lag && lag->bonded && lag->primary) {
> @@ -867,11 +872,6 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> act_prt = ICE_LAG_INVALID_PORT;
> }
>
> - if (flags & ICE_VF_RESET_LOCK)
> - mutex_lock(&vf->cfg_lock);
> - else
> - lockdep_assert_held(&vf->cfg_lock);
> -
> if (ice_is_vf_disabled(vf)) {
> vsi = ice_get_vf_vsi(vf);
> if (!vsi) {
> @@ -956,14 +956,14 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> ice_mbx_clear_malvf(&vf->mbx_info);
>
> out_unlock:
> - if (flags & ICE_VF_RESET_LOCK)
> - mutex_unlock(&vf->cfg_lock);
> -
> if (lag && lag->bonded && lag->primary &&
> act_prt != ICE_LAG_INVALID_PORT)
> ice_lag_move_vf_nodes_cfg(lag, pri_prt, act_prt);
> mutex_unlock(&pf->lag_mutex);
>
> + if (flags & ICE_VF_RESET_LOCK)
> + mutex_unlock(&vf->cfg_lock);
> +
> return err;
> }
>
>
> base-commit: 3ca3256cde596573d060eda8c477996435c6d63f
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf()
2024-04-08 23:03 [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf() Jacob Keller
2024-04-09 7:09 ` Mateusz Polchlopek
@ 2024-04-11 12:28 ` Przemek Kitszel
2024-04-18 12:24 ` Romanowski, Rafal
1 sibling, 1 reply; 4+ messages in thread
From: Przemek Kitszel @ 2024-04-11 12:28 UTC (permalink / raw)
To: Jacob Keller, Intel Wired LAN, Anthony Nguyen; +Cc: Dave Ertman
On 4/9/24 01:03, Jacob Keller wrote:
> 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over
> aggregate"), the ice driver has acquired the LAG mutex in ice_reset_vf().
> The commit placed this lock acquisition just prior to the acquisition of
> the VF configuration lock.
>
> If ice_reset_vf() acquires the configuration lock via the ICE_VF_RESET_LOCK
> flag, this could deadlock with ice_vc_cfg_qs_msg() because it always
> acquires the locks in the order of the VF configuration lock and then the
> LAG mutex.
>
> Lockdep reports this violation almost immediately on creating and then
> removing 2 VF:
>
[...]
> To avoid deadlock, we must acquire the LAG mutex only after acquiring the
> VF configuration lock. Fix the ice_reset_vf() to acquire the LAG mutex only
> after we either acquire or check that the VF configuration lock is held.
>
> Fixes: 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over aggregate")
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> Reviewed-by: Dave Ertman <david.m.ertman@intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_vf_lib.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> index 21d26e19338a..d10a4be965b5 100644
> --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> @@ -856,6 +856,11 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> return 0;
> }
>
> + if (flags & ICE_VF_RESET_LOCK)
> + mutex_lock(&vf->cfg_lock);
> + else
> + lockdep_assert_held(&vf->cfg_lock);
> +
> lag = pf->lag;
> mutex_lock(&pf->lag_mutex);
> if (lag && lag->bonded && lag->primary) {
> @@ -867,11 +872,6 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> act_prt = ICE_LAG_INVALID_PORT;
> }
>
> - if (flags & ICE_VF_RESET_LOCK)
> - mutex_lock(&vf->cfg_lock);
> - else
> - lockdep_assert_held(&vf->cfg_lock);
> -
> if (ice_is_vf_disabled(vf)) {
> vsi = ice_get_vf_vsi(vf);
> if (!vsi) {
> @@ -956,14 +956,14 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> ice_mbx_clear_malvf(&vf->mbx_info);
>
> out_unlock:
> - if (flags & ICE_VF_RESET_LOCK)
> - mutex_unlock(&vf->cfg_lock);
> -
> if (lag && lag->bonded && lag->primary &&
> act_prt != ICE_LAG_INVALID_PORT)
> ice_lag_move_vf_nodes_cfg(lag, pri_prt, act_prt);
> mutex_unlock(&pf->lag_mutex);
>
> + if (flags & ICE_VF_RESET_LOCK)
> + mutex_unlock(&vf->cfg_lock);
> +
> return err;
> }
>
>
> base-commit: 3ca3256cde596573d060eda8c477996435c6d63f
Thanks,
Tested-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf()
2024-04-11 12:28 ` Przemek Kitszel
@ 2024-04-18 12:24 ` Romanowski, Rafal
0 siblings, 0 replies; 4+ messages in thread
From: Romanowski, Rafal @ 2024-04-18 12:24 UTC (permalink / raw)
To: Kitszel, Przemyslaw, Keller, Jacob E, Intel Wired LAN,
Nguyen, Anthony L
Cc: Ertman, David M
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Przemek Kitszel
> Sent: Thursday, April 11, 2024 2:29 PM
> To: Keller, Jacob E <jacob.e.keller@intel.com>; Intel Wired LAN <intel-wired-
> lan@lists.osuosl.org>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>
> Cc: Ertman, David M <david.m.ertman@intel.com>
> Subject: Re: [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock
> dependency in ice_reset_vf()
>
> On 4/9/24 01:03, Jacob Keller wrote:
> > 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a failed over
> > aggregate"), the ice driver has acquired the LAG mutex in ice_reset_vf().
> > The commit placed this lock acquisition just prior to the acquisition
> > of the VF configuration lock.
> >
> > If ice_reset_vf() acquires the configuration lock via the
> > ICE_VF_RESET_LOCK flag, this could deadlock with ice_vc_cfg_qs_msg()
> > because it always acquires the locks in the order of the VF
> > configuration lock and then the LAG mutex.
> >
> > Lockdep reports this violation almost immediately on creating and then
> > removing 2 VF:
> >
>
> [...]
>
> > To avoid deadlock, we must acquire the LAG mutex only after acquiring
> > the VF configuration lock. Fix the ice_reset_vf() to acquire the LAG
> > mutex only after we either acquire or check that the VF configuration lock is
> held.
> >
> > Fixes: 9f74a3dfcf83 ("ice: Fix VF Reset paths when interface in a
> > failed over aggregate")
> > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> > Reviewed-by: Dave Ertman <david.m.ertman@intel.com>
> > ---
> > drivers/net/ethernet/intel/ice/ice_vf_lib.c | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> > b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> > index 21d26e19338a..d10a4be965b5 100644
> > --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> > +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
> > @@ -856,6 +856,11 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> > return 0;
> > }
> >
> > + if (flags & ICE_VF_RESET_LOCK)
> > + mutex_lock(&vf->cfg_lock);
> > + else
> > + lockdep_assert_held(&vf->cfg_lock);
> > +
> > lag = pf->lag;
> > mutex_lock(&pf->lag_mutex);
> > if (lag && lag->bonded && lag->primary) { @@ -867,11 +872,6 @@ int
> > ice_reset_vf(struct ice_vf *vf, u32 flags)
> > act_prt = ICE_LAG_INVALID_PORT;
> > }
> >
> > - if (flags & ICE_VF_RESET_LOCK)
> > - mutex_lock(&vf->cfg_lock);
> > - else
> > - lockdep_assert_held(&vf->cfg_lock);
> > -
> > if (ice_is_vf_disabled(vf)) {
> > vsi = ice_get_vf_vsi(vf);
> > if (!vsi) {
> > @@ -956,14 +956,14 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)
> > ice_mbx_clear_malvf(&vf->mbx_info);
> >
> > out_unlock:
> > - if (flags & ICE_VF_RESET_LOCK)
> > - mutex_unlock(&vf->cfg_lock);
> > -
> > if (lag && lag->bonded && lag->primary &&
> > act_prt != ICE_LAG_INVALID_PORT)
> > ice_lag_move_vf_nodes_cfg(lag, pri_prt, act_prt);
> > mutex_unlock(&pf->lag_mutex);
> >
> > + if (flags & ICE_VF_RESET_LOCK)
> > + mutex_unlock(&vf->cfg_lock);
> > +
> > return err;
> > }
> >
> >
> > base-commit: 3ca3256cde596573d060eda8c477996435c6d63f
>
> Thanks,
> Tested-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-18 12:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-08 23:03 [Intel-wired-lan] [PATCH iwl-net] ice: fix LAG and VF lock dependency in ice_reset_vf() Jacob Keller
2024-04-09 7:09 ` Mateusz Polchlopek
2024-04-11 12:28 ` Przemek Kitszel
2024-04-18 12:24 ` Romanowski, Rafal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox