{"id":806311,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806311/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170828001603.75876-2-jeffrey.t.kirsher@intel.com>","date":"2017-08-28T00:15:49","name":"[net-next,01/15] i40e: Update state variable for adminq subtask","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e322f904c220b8fb65f02d40a56baf5694ec8ad4","submitter":{"id":473,"url":"http://patchwork.ozlabs.org/api/1.0/people/473/?format=json","name":"Kirsher, Jeffrey T","email":"jeffrey.t.kirsher@intel.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170828001603.75876-2-jeffrey.t.kirsher@intel.com/mbox/","series":[{"id":52,"url":"http://patchwork.ozlabs.org/api/1.0/series/52/?format=json","date":"2017-08-28T00:15:49","name":"40GbE Intel Wired LAN Driver Updates 2017-08-27","version":1,"mbox":"http://patchwork.ozlabs.org/series/52/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806311/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgXPN6ntBz9s8J\n\tfor ;\n\tMon, 28 Aug 2017 10:16:24 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751677AbdH1AQT (ORCPT );\n\tSun, 27 Aug 2017 20:16:19 -0400","from mga14.intel.com ([192.55.52.115]:55214 \"EHLO mga14.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751613AbdH1AQS (ORCPT );\n\tSun, 27 Aug 2017 20:16:18 -0400","from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Aug 2017 17:16:17 -0700","from davidpwo-mobl1.amr.corp.intel.com (HELO\n\tjtkirshe-DESK.amr.corp.intel.com.com) ([10.254.22.134])\n\tby fmsmga004.fm.intel.com with ESMTP; 27 Aug 2017 17:16:17 -0700"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.41,439,1498546800\"; d=\"scan'208\";a=\"304981052\"","From":"Jeff Kirsher ","To":"davem@davemloft.net","Cc":"Sudheer Mogilappagari ,\n\tnetdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,\n\tjogreene@redhat.com, Jeff Kirsher ","Subject":"[net-next 01/15] i40e: Update state variable for adminq subtask","Date":"Sun, 27 Aug 2017 17:15:49 -0700","Message-Id":"<20170828001603.75876-2-jeffrey.t.kirsher@intel.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170828001603.75876-1-jeffrey.t.kirsher@intel.com>","References":"<20170828001603.75876-1-jeffrey.t.kirsher@intel.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Sudheer Mogilappagari \n\nDuring NVM update, state machine gets into unrecoverable state because\ni40e_clean_adminq_subtask can get scheduled after the admin queue\ncommand but before other state variables are updated. This causes\nincorrect input to i40e_nvmupd_check_wait_event and state transitions\ndon't happen.\n\nThis fix updates the state variables so that adminq_subtask will have\naccurate information whenever it gets scheduled.\n\nSigned-off-by: Sudheer Mogilappagari \nTested-by: Andrew Bowers \nSigned-off-by: Jeff Kirsher \n---\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 10 ++++++++--\n 1 file changed, 8 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex 2cf7db2dc7cd..96afef98a08f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -755,7 +755,11 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,\n \n \t/* Acquire lock to prevent race condition where adminq_task\n \t * can execute after i40e_nvmupd_nvm_read/write but before state\n-\t * variables (nvm_wait_opcode, nvm_release_on_done) are updated\n+\t * variables (nvm_wait_opcode, nvm_release_on_done) are updated.\n+\t *\n+\t * During NVMUpdate, it is observed that lock could be held for\n+\t * ~5ms for most commands. However lock is held for ~60ms for\n+\t * NVMUPD_CSUM_LCB command.\n \t */\n \tmutex_lock(&hw->aq.arq_mutex);\n \tswitch (hw->nvmupd_state) {\n@@ -778,7 +782,8 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,\n \t\t */\n \t\tif (cmd->offset == 0xffff) {\n \t\t\ti40e_nvmupd_check_wait_event(hw, hw->nvm_wait_opcode);\n-\t\t\treturn 0;\n+\t\t\tstatus = 0;\n+\t\t\tgoto exit;\n \t\t}\n \n \t\tstatus = I40E_ERR_NOT_READY;\n@@ -793,6 +798,7 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,\n \t\t*perrno = -ESRCH;\n \t\tbreak;\n \t}\n+exit:\n \tmutex_unlock(&hw->aq.arq_mutex);\n \treturn status;\n }\n","prefixes":["net-next","01/15"]}