Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1212927/?format=api
{ "id": 1212927, "url": "http://patchwork.ozlabs.org/api/patches/1212927/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191218183845.20038-3-jcfaracco@gmail.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": "<20191218183845.20038-3-jcfaracco@gmail.com>", "list_archive_url": null, "date": "2019-12-18T18:38:45", "name": "[net-next,2/2] drivers: net: ice: Removing hung_queue variable to use txqueue function parameter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5ccf5ce9226a8d4f06f772b2d76934c02311128b", "submitter": { "id": 65615, "url": "http://patchwork.ozlabs.org/api/people/65615/?format=api", "name": "Julio Faracco", "email": "jcfaracco@gmail.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/20191218183845.20038-3-jcfaracco@gmail.com/mbox/", "series": [ { "id": 149484, "url": "http://patchwork.ozlabs.org/api/series/149484/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=149484", "date": "2019-12-18T18:38:43", "name": "drivers: net: intel: update i40e and ice to use txqueue parameter from tx_timeout.", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/149484/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1212927/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1212927/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=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=gmail.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"MSod8Urm\"; dkim-atps=neutral" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 47dY1m0WzWz9sR0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 19 Dec 2019 11:40:11 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D4A1D86B91;\n\tThu, 19 Dec 2019 00:40: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 C6NBe9QMVgQD; Thu, 19 Dec 2019 00:40:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B0C9F86CFD;\n\tThu, 19 Dec 2019 00:40:08 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id B5A881BF9AD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Dec 2019 18:38:56 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B2CF0884C1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Dec 2019 18:38:56 +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 fip8r2FLiqku for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Dec 2019 18:38:56 +0000 (UTC)", "from mail-qv1-f67.google.com (mail-qv1-f67.google.com\n\t[209.85.219.67])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id E1EC0883AD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Dec 2019 18:38:55 +0000 (UTC)", "by mail-qv1-f67.google.com with SMTP id u10so1085209qvi.2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Dec 2019 10:38:55 -0800 (PST)", "from ubuntu.default (201-42-108-210.dsl.telesp.net.br.\n\t[201.42.108.210]) by smtp.gmail.com with ESMTPSA id\n\ts11sm890049qkg.99.2019.12.18.10.38.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 18 Dec 2019 10:38:54 -0800 (PST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=m3KJbj/2ipgtN2cLNIjJ62WUMegElStcycrQCWUakW4=;\n\tb=MSod8UrmGdVJcpGg5iDEGZEtucemBJMcZxQmQYHXEpGTzHGcU2uAmJ23swilPdBgKA\n\t+fQOyPNtm2TiqHF+nx+b44JXeIbxxgj6RJ1iClk6Ms1xWT/sfZ15KotqZaIe0rNU7ZJj\n\tLNZNLuCZFH2LRkVnNPiYyMljy50xh7TIYIpVrJm9dRi+f+eevOF+SnrausJSM7WHHxMP\n\tFC0NckbJHpEhLKYBthPX4C6NWog8fMbqYlsVFGTra/n5KuECW3apBwB3ZoNqHbpbQQLj\n\t4eeSQmSUpOOfLoo160Ld0ZbqjEG6mtBHciR9aE3RMI5bbPXOmv6axh1GzLsBxR54Ylxk\n\tH+bQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=m3KJbj/2ipgtN2cLNIjJ62WUMegElStcycrQCWUakW4=;\n\tb=Pmhuui8bqn4DUIghIAs2NqgkivRvIlrJ4m6H9TJFlReSyXc6R/2HfPiLiTKaIluIEO\n\tVI5wnQTAG7Mdg3OSyIfZQ3To7IJL/eVamFehghCPKgKo5r+BOgdGqTixoQrepXr3qV0W\n\tQaE31fkZk8Z1yHI2f7Q3kdZPQV1DP8VbbAbGmHO43GK8PvfNkA82vwN+sbh63/ve9yQH\n\tC4AHkPAieq+g7d88Zj5Ojd2KGkpeGGsSkK6h3jZzzegcPJOtdhc0Fy8CPQP/mjAHxa5p\n\tcQoC4CSactWqVk5s1EW4sBHJ7OMpb1SBPXcld3HdrneRtiP6t8grDsGOrzvmnna1gzXv\n\t118g==", "X-Gm-Message-State": "APjAAAUSswmvJhbqEtaeqKidYRm/AOen8CjGCPaccRMRvsEHcC2exxKY\n\tExc7hcXFJ4g5zU8VZsi2jMM=", "X-Google-Smtp-Source": "APXvYqyZCbO5O2rsw8OAW3WcqAf9alCRDuH3LbXiMGAi+iRjJ0DPd94k6pVWzpzcTnZOMphkvFTv8g==", "X-Received": "by 2002:a0c:8d0a:: with SMTP id r10mr3586051qvb.7.1576694334723; \n\tWed, 18 Dec 2019 10:38:54 -0800 (PST)", "From": "Julio Faracco <jcfaracco@gmail.com>", "To": "netdev@vger.kernel.org", "Date": "Wed, 18 Dec 2019 15:38:45 -0300", "Message-Id": "<20191218183845.20038-3-jcfaracco@gmail.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191218183845.20038-1-jcfaracco@gmail.com>", "References": "<20191218183845.20038-1-jcfaracco@gmail.com>", "X-Mailman-Approved-At": "Thu, 19 Dec 2019 00:40:00 +0000", "Subject": "[Intel-wired-lan] [PATCH net-next 2/2] drivers: net: ice: Removing\n\thung_queue variable to use txqueue function parameter", "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": "intel-wired-lan@lists.osuosl.org, davem@davemloft.net", "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": "The scope of function .ndo_tx_timeout was changed to include the hang\nqueue when a TX timeout event occurs. See commit 0290bd291cc0\n(\"netdev: pass the stuck queue to the timeout handler\") for more\ndetails. Now, drivers don't need to identify which queue is stopped.\nDrivers can simply use the queue index provided bt dev_watchdog and\nexecute all actions needed to restore network traffic. This commit do\nsome cleanups into Intel ice driver to remove a redundant loop to find\nstopped queue.\n\nSigned-off-by: Julio Faracco <jcfaracco@gmail.com>\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 41 ++++++-----------------\n 1 file changed, 11 insertions(+), 30 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 4d5220c9c721..2d7ecdc157be 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -5066,36 +5066,17 @@ static void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)\n \tstruct ice_ring *tx_ring = NULL;\n \tstruct ice_vsi *vsi = np->vsi;\n \tstruct ice_pf *pf = vsi->back;\n-\tint hung_queue = -1;\n \tu32 i;\n \n \tpf->tx_timeout_count++;\n \n-\t/* find the stopped queue the same way dev_watchdog() does */\n-\tfor (i = 0; i < netdev->num_tx_queues; i++) {\n-\t\tunsigned long trans_start;\n-\t\tstruct netdev_queue *q;\n-\n-\t\tq = netdev_get_tx_queue(netdev, i);\n-\t\ttrans_start = q->trans_start;\n-\t\tif (netif_xmit_stopped(q) &&\n-\t\t time_after(jiffies,\n-\t\t\t trans_start + netdev->watchdog_timeo)) {\n-\t\t\thung_queue = i;\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n-\tif (i == netdev->num_tx_queues)\n-\t\tnetdev_info(netdev, \"tx_timeout: no netdev hung queue found\\n\");\n-\telse\n-\t\t/* now that we have an index, find the tx_ring struct */\n-\t\tfor (i = 0; i < vsi->num_txq; i++)\n-\t\t\tif (vsi->tx_rings[i] && vsi->tx_rings[i]->desc)\n-\t\t\t\tif (hung_queue == vsi->tx_rings[i]->q_index) {\n-\t\t\t\t\ttx_ring = vsi->tx_rings[i];\n-\t\t\t\t\tbreak;\n-\t\t\t\t}\n+\t/* now that we have an index, find the tx_ring struct */\n+\tfor (i = 0; i < vsi->num_txq; i++)\n+\t\tif (vsi->tx_rings[i] && vsi->tx_rings[i]->desc)\n+\t\t\tif (txqueue == vsi->tx_rings[i]->q_index) {\n+\t\t\t\ttx_ring = vsi->tx_rings[i];\n+\t\t\t\tbreak;\n+\t\t\t}\n \n \t/* Reset recovery level if enough time has elapsed after last timeout.\n \t * Also ensure no new reset action happens before next timeout period.\n@@ -5110,19 +5091,19 @@ static void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)\n \t\tstruct ice_hw *hw = &pf->hw;\n \t\tu32 head, val = 0;\n \n-\t\thead = (rd32(hw, QTX_COMM_HEAD(vsi->txq_map[hung_queue])) &\n+\t\thead = (rd32(hw, QTX_COMM_HEAD(vsi->txq_map[txqueue])) &\n \t\t\tQTX_COMM_HEAD_HEAD_M) >> QTX_COMM_HEAD_HEAD_S;\n \t\t/* Read interrupt register */\n \t\tval = rd32(hw, GLINT_DYN_CTL(tx_ring->q_vector->reg_idx));\n \n \t\tnetdev_info(netdev, \"tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\\n\",\n-\t\t\t vsi->vsi_num, hung_queue, tx_ring->next_to_clean,\n+\t\t\t vsi->vsi_num, txqueue, tx_ring->next_to_clean,\n \t\t\t head, tx_ring->next_to_use, val);\n \t}\n \n \tpf->tx_timeout_last_recovery = jiffies;\n-\tnetdev_info(netdev, \"tx_timeout recovery level %d, hung_queue %d\\n\",\n-\t\t pf->tx_timeout_recovery_level, hung_queue);\n+\tnetdev_info(netdev, \"tx_timeout recovery level %d, txqueue %d\\n\",\n+\t\t pf->tx_timeout_recovery_level, txqueue);\n \n \tswitch (pf->tx_timeout_recovery_level) {\n \tcase 1:\n", "prefixes": [ "net-next", "2/2" ] }