Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/947895/?format=api
{ "id": 947895, "url": "http://patchwork.ozlabs.org/api/patches/947895/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180723173752.19676-7-anirudh.venkataramanan@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": "<20180723173752.19676-7-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-07-23T17:37:45", "name": "[06/13] ice: Fix bugs in control queue processing", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "ec3e1a757456c05e82e6f136dde7a3dd3f2723a3", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20180723173752.19676-7-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 57101, "url": "http://patchwork.ozlabs.org/api/series/57101/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=57101", "date": "2018-07-23T17:37:39", "name": "Bug fixes for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/57101/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/947895/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/947895/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41Z7xZ6Hkgz9s3N\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 24 Jul 2018 03:38:10 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7BECB86283;\n\tMon, 23 Jul 2018 17:38:09 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id XvHvR8OEMsTC; Mon, 23 Jul 2018 17:38:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id EC70E8626D;\n\tMon, 23 Jul 2018 17:38:08 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C05431C05B5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Jul 2018 17:38:03 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BE0D48734C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Jul 2018 17:38:03 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id MLepdzBlAR3E for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Jul 2018 17:38:02 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id A3481872FF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 23 Jul 2018 17:38:02 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Jul 2018 10:38:00 -0700", "from shasta.jf.intel.com ([10.166.241.10])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jul 2018 10:37:52 -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", "X-IronPort-AV": "E=Sophos;i=\"5.51,394,1526367600\"; d=\"scan'208\";a=\"74790718\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 23 Jul 2018 10:37:45 -0700", "Message-Id": "<20180723173752.19676-7-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20180723173752.19676-1-anirudh.venkataramanan@intel.com>", "References": "<20180723173752.19676-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 06/13] ice: Fix bugs in control queue\n\tprocessing", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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>", "MIME-Version": "1.0", "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": "This patch is a consolidation of multiple bug fixes for control queue\nprocessing.\n\n1) In ice_clean_adminq_subtask() remove unnecessary reads/writes to\n registers. The bits PFINT_FW_CTL, PFINT_MBX_CTL and PFINT_SB_CTL\n are not set when an interrupt arrives, which means that clearing them\n again can be omitted.\n\n2) Get an accurate value in \"pending\" by re-reading the control queue\n head register from the hardware.\n\n3) Fix a corner case involving lost control queue messages by checking\n for new control messages (using ice_ctrlq_pending) before exiting the\n cleanup routine.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_controlq.c | 5 ++++-\n drivers/net/ethernet/intel/ice/ice_main.c | 26 ++++++++++++++++++++++----\n 2 files changed, 26 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c\nindex c064416080e7..62be72fdc8f3 100644\n--- a/drivers/net/ethernet/intel/ice/ice_controlq.c\n+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c\n@@ -1065,8 +1065,11 @@ ice_clean_rq_elem(struct ice_hw *hw, struct ice_ctl_q_info *cq,\n \n clean_rq_elem_out:\n \t/* Set pending if needed, unlock and return */\n-\tif (pending)\n+\tif (pending) {\n+\t\t/* re-read HW head to calculate actual pending messages */\n+\t\tntu = (u16)(rd32(hw, cq->rq.head) & cq->rq.head_mask);\n \t\t*pending = (u16)((ntc > ntu ? cq->rq.count : 0) + (ntu - ntc));\n+\t}\n clean_rq_elem_err:\n \tmutex_unlock(&cq->rq_lock);\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 450911345144..81b04e1d7ea2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -916,6 +916,21 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n \treturn pending && (i == ICE_DFLT_IRQ_WORK);\n }\n \n+/**\n+ * ice_ctrlq_pending - check if there is a difference between ntc and ntu\n+ * @hw: pointer to hardware info\n+ * @cq: control queue information\n+ *\n+ * returns true if there are pending messages in a queue, false if there aren't\n+ */\n+static bool ice_ctrlq_pending(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n+{\n+\tu16 ntu;\n+\n+\tntu = (u16)(rd32(hw, cq->rq.head) & cq->rq.head_mask);\n+\treturn cq->rq.next_to_clean != ntu;\n+}\n+\n /**\n * ice_clean_adminq_subtask - clean the AdminQ rings\n * @pf: board private structure\n@@ -923,7 +938,6 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n static void ice_clean_adminq_subtask(struct ice_pf *pf)\n {\n \tstruct ice_hw *hw = &pf->hw;\n-\tu32 val;\n \n \tif (!test_bit(__ICE_ADMINQ_EVENT_PENDING, pf->state))\n \t\treturn;\n@@ -933,9 +947,13 @@ static void ice_clean_adminq_subtask(struct ice_pf *pf)\n \n \tclear_bit(__ICE_ADMINQ_EVENT_PENDING, pf->state);\n \n-\t/* re-enable Admin queue interrupt causes */\n-\tval = rd32(hw, PFINT_FW_CTL);\n-\twr32(hw, PFINT_FW_CTL, (val | PFINT_FW_CTL_CAUSE_ENA_M));\n+\t/* There might be a situation where new messages arrive to a control\n+\t * queue between processing the last message and clearing the\n+\t * EVENT_PENDING bit. So before exiting, check queue head again (using\n+\t * ice_ctrlq_pending) and process new messages if any.\n+\t */\n+\tif (ice_ctrlq_pending(hw, &hw->adminq))\n+\t\t__ice_clean_ctrlq(pf, ICE_CTL_Q_ADMIN);\n \n \tice_flush(hw);\n }\n", "prefixes": [ "06/13" ] }