i40e: synchronize nvmupdate command and adminq subtask
Subsystems (2)
PATCH 4/11 i40e: synchronize nvmupdate command and adminq subtask
From: Sudheer Mogilappagari <[email protected]>
During NVM update, state machine gets into unrecoverable state because i40e_clean_adminq_subtask can get scheduled after the admin queue command but before other state variables are updated. This causes incorrect input to i40e_nvmupd_check_wait_event and state transitions don't happen.
This issue existed before but surfaced after commit 373149fc99a0 ("i40e: Decrease the scope of rtnl lock")
This fix adds locking around admin queue command and update of state variables so that adminq_subtask will have accurate information whenever it gets scheduled.
--- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_nvm.c +13 -1
@@ -753,6 +753,15 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw, hw->nvmupd_state =I40E_NVMUPD_STATE_INIT ; } +/* Acquire lock to prevent race condition where adminq_task +* can execute after i40e_nvmupd_nvm_read/write but before state +* variables (nvm_wait_opcode, nvm_release_on_done) are updated. +* +* During NVMUpdate, it is observed that lock could be held for +* ~5ms for most commands. However lock is held for ~60ms for +* NVMUPD_CSUM_LCB command. +*/ +mutex_lock (&hw->aq.arq_mutex);switch (hw->nvmupd_state) {case I40E_NVMUPD_STATE_INIT : status =i40e_nvmupd_state_init (hw, cmd, bytes, perrno);
@@ -773,7 +782,8 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,*/ if (cmd->offset ==0xffff ) {i40e_nvmupd_check_wait_event (hw, hw->nvm_wait_opcode); -return 0 ; + status =0 ; + goto exit; } status =I40E_ERR_NOT_READY ;
@@ -788,6 +798,8 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw, *perrno = -ESRCH ;break ; } +exit: +mutex_unlock (&hw->aq.arq_mutex);return status; }
Signature · 1 line
2.9.4
PATCH 4/11 i40e: synchronize nvmupdate command and adminq subtask
Quoted 2 lines · Alice Michael
From: Sudheer Mogilappagari <[email protected]>
[...]
Quoted 12 lines
drivers/net/ethernet/intel/i40e/i40e_nvm.c +2
-1@@ -773,7 +782,8 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,*/ if (cmd->offset ==0xffff ) {i40e_nvmupd_check_wait_event (hw, hw->nvm_wait_opcode); -return 0 ; + status =0 ; + goto exit; } status =I40E_ERR_NOT_READY ;
drivers/net/ethernet/intel/i40e/i40e_nvm.c i40e_status i40e_nvmupd_command(struct i40e_hw *hw, · line 805
Quoted 8 lines
drivers/net/ethernet/intel/i40e/i40e_nvm.c +2
-0@@ -788,6 +798,8 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw, *perrno = -ESRCH ;break ; } +exit: +mutex_unlock (&hw->aq.arq_mutex);return status; }
Thanks, that's better.
sln