Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1099622/?format=api
{ "id": 1099622, "url": "http://patchwork.ozlabs.org/api/patches/1099622/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190514173709.62431-8-alice.michael@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20190514173709.62431-8-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-05-14T17:37:06", "name": "[next,S5,iavf,08/11] iavf: Refactor thewatchdog state machine", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "490700182a7876590ec58b64efbdb8478e1852f0", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190514173709.62431-8-alice.michael@intel.com/mbox/", "series": [ { "id": 107823, "url": "http://patchwork.ozlabs.org/api/series/107823/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=107823", "date": "2019-05-14T17:37:00", "name": "[next,S5,iavf,01/11] iavf: Create VLAN tagelements starting from the first element", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/107823/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1099622/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1099622/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 453Pyt36XFz9sML\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 15 May 2019 03:37:42 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 92EDC81E21;\n\tTue, 14 May 2019 17:37:40 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ipa0XlXek7iY; Tue, 14 May 2019 17:37:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id CA68187CB5;\n\tTue, 14 May 2019 17:37:38 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 193921BF3FF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:36 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 980632FCEC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:35 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id HGdDGHyzuNZF for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:32 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 843C41FEF9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:32 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 May 2019 10:37:31 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga003.jf.intel.com with ESMTP; 14 May 2019 10:37:30 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 14 May 2019 10:37:06 -0700", "Message-Id": "<20190514173709.62431-8-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190514173709.62431-1-alice.michael@intel.com>", "References": "<20190514173709.62431-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S5 iavf 08/11] iavf: Refactor the\n\twatchdog state machine", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Jakub Pawlak <jakub.pawlak@intel.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Jan Sokolowski <jan.sokolowski@intel.com>\n\nRefactor the watchdog state machine implementation.\nAdd the additional state __IAVF_COMM_FAILED to process\nthe PF communication fails. Prepare the watchdog state machine\nto integrate with init state machine.\n\nSigned-off-by: Jakub Pawlak <jakub.pawlak@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf.h | 1 +\n drivers/net/ethernet/intel/iavf/iavf_main.c | 73 ++++++++++++---------\n 2 files changed, 44 insertions(+), 30 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 45dfb1a3bb40..9fc635d816d2 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -171,6 +171,7 @@ enum iavf_state_t {\n \t__IAVF_INIT_GET_RESOURCES,\t/* aq msg sent, awaiting reply */\n \t__IAVF_INIT_SW,\t\t/* got resources, setting up structs */\n \t__IAVF_RESETTING,\t\t/* in reset */\n+\t__IAVF_COMM_FAILED,\t\t/* communication with PF failed */\n \t/* Below here, watchdog is running */\n \t__IAVF_DOWN,\t\t\t/* ready, can be opened */\n \t__IAVF_DOWN_PENDING,\t\t/* descending, waiting for watchdog */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 7d994802d82e..5c25cf3754bb 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -1674,13 +1674,18 @@ static void iavf_watchdog_task(struct work_struct *work)\n \tif (test_and_set_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section))\n \t\tgoto restart_watchdog;\n \n-\tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED) {\n+\tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED)\n+\t\tadapter->state = __IAVF_COMM_FAILED;\n+\n+\tswitch (adapter->state) {\n+\tcase __IAVF_COMM_FAILED:\n \t\treg_val = rd32(hw, IAVF_VFGEN_RSTAT) &\n \t\t\t IAVF_VFGEN_RSTAT_VFR_STATE_MASK;\n \t\tif (reg_val == VIRTCHNL_VFR_VFACTIVE ||\n \t\t reg_val == VIRTCHNL_VFR_COMPLETED) {\n \t\t\t/* A chance for redemption! */\n-\t\t\tdev_err(&adapter->pdev->dev, \"Hardware came out of reset. Attemptingreinit.\\n\");\n+\t\t\tdev_err(&adapter->pdev->dev,\n+\t\t\t\t\"Hardware came out of reset. Attempting reinit.\\n\");\n \t\t\tadapter->state = __IAVF_STARTUP;\n \t\t\tadapter->flags &= ~IAVF_FLAG_PF_COMMS_FAILED;\n \t\t\tqueue_delayed_work(iavf_wq, &adapter->init_task, 10);\n@@ -1695,50 +1700,58 @@ static void iavf_watchdog_task(struct work_struct *work)\n \t\t}\n \t\tadapter->aq_required = 0;\n \t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n+\t\tclear_bit(__IAVF_IN_CRITICAL_TASK,\n+\t\t\t &adapter->crit_section);\n+\t\tqueue_delayed_work(iavf_wq,\n+\t\t\t\t &adapter->watchdog_task,\n+\t\t\t\t msecs_to_jiffies(10));\n \t\tgoto watchdog_done;\n+\tcase __IAVF_RESETTING:\n+\t\tclear_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section);\n+\t\tqueue_delayed_work(iavf_wq, &adapter->watchdog_task, HZ * 2);\n+\t\treturn;\n+\tcase __IAVF_DOWN:\n+\tcase __IAVF_DOWN_PENDING:\n+\tcase __IAVF_TESTING:\n+\tcase __IAVF_RUNNING:\n+\t\tif (adapter->current_op) {\n+\t\t\tif (!iavf_asq_done(hw)) {\n+\t\t\t\tdev_dbg(&adapter->pdev->dev,\n+\t\t\t\t\t\"Admin queue timeout\\n\");\n+\t\t\t\tiavf_send_api_ver(adapter);\n+\t\t\t}\n+\t\t} else {\n+\t\t\tif (!iavf_process_aq_command(adapter) &&\n+\t\t\t adapter->state == __IAVF_RUNNING)\n+\t\t\t\tiavf_request_stats(adapter);\n+\t\t}\n+\t\tbreak;\n+\tcase __IAVF_REMOVE:\n+\t\tclear_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section);\n+\t\treturn;\n+\tdefault:\n+\t\tgoto restart_watchdog;\n \t}\n \n-\tif (adapter->state < __IAVF_DOWN ||\n-\t (adapter->flags & IAVF_FLAG_RESET_PENDING))\n-\t\tgoto watchdog_done;\n-\n-\t/* check for reset */\n+\t\t/* check for hw reset */\n \treg_val = rd32(hw, IAVF_VF_ARQLEN1) & IAVF_VF_ARQLEN1_ARQENABLE_MASK;\n-\tif (!(adapter->flags & IAVF_FLAG_RESET_PENDING) && !reg_val) {\n+\tif (!reg_val) {\n \t\tadapter->state = __IAVF_RESETTING;\n \t\tadapter->flags |= IAVF_FLAG_RESET_PENDING;\n-\t\tdev_err(&adapter->pdev->dev, \"Hardware reset detected\\n\");\n-\t\tqueue_work(iavf_wq, &adapter->reset_task);\n \t\tadapter->aq_required = 0;\n \t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n+\t\tdev_err(&adapter->pdev->dev, \"Hardware reset detected\\n\");\n+\t\tqueue_work(iavf_wq, &adapter->reset_task);\n \t\tgoto watchdog_done;\n \t}\n \n-\t/* Process admin queue tasks. After init, everything gets done\n-\t * here so we don't race on the admin queue.\n-\t * The check is made against -EAGAIN, as it's the error code that\n-\t * would be returned on no op to run. Failures of called functions\n-\t * return other values.\n-\t */\n-\tif (adapter->current_op) {\n-\t\tif (!iavf_asq_done(hw)) {\n-\t\t\tdev_dbg(&adapter->pdev->dev, \"Admin queue timeout\\n\");\n-\t\t\tiavf_send_api_ver(adapter);\n-\t\t}\n-\t} else if (iavf_process_aq_command(adapter) == -EAGAIN &&\n-\t\t adapter->state == __IAVF_RUNNING) {\n-\t\tiavf_request_stats(adapter);\n-\t}\n-\n \tschedule_delayed_work(&adapter->client_task, msecs_to_jiffies(5));\n-\n watchdog_done:\n-\tif (adapter->state == __IAVF_RUNNING)\n+\tif (adapter->state == __IAVF_RUNNING ||\n+\t adapter->state == __IAVF_COMM_FAILED)\n \t\tiavf_detect_recover_hung(&adapter->vsi);\n \tclear_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section);\n restart_watchdog:\n-\tif (adapter->state == __IAVF_REMOVE)\n-\t\treturn;\n \tif (adapter->aq_required)\n \t\tqueue_delayed_work(iavf_wq, &adapter->watchdog_task,\n \t\t\t\t msecs_to_jiffies(20));\n", "prefixes": [ "next", "S5", "iavf", "08/11" ] }