Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/770013/?format=api
{ "id": 770013, "url": "http://patchwork.ozlabs.org/api/patches/770013/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170601224051.6106-9-jacob.e.keller@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": "<20170601224051.6106-9-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-06-01T22:40:44", "name": "[08/15] fm10k: avoid divide by zero in rare cases when device is resetting", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "bd7123ae5e69e5b42810410ae14962bef4d59bca", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20170601224051.6106-9-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/770013/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/770013/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" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 3wf2Pm6ljmz9sN8\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 2 Jun 2017 08:41:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 71A3330C69;\n\tThu, 1 Jun 2017 22:41:15 +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 ccgWYv7ktbAp; Thu, 1 Jun 2017 22:41:11 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 73D5230C8F;\n\tThu, 1 Jun 2017 22:41:02 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 25B781C3EBE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:58 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 230F088B42\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:58 +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 mJE6iLf3yopo for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:56 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 94B4688B39\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:56 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t01 Jun 2017 15:40:55 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.35.158])\n\tby fmsmga001.fm.intel.com with ESMTP; 01 Jun 2017 15:40:55 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.39,281,1493708400\"; d=\"scan'208\";\n\ta=\"1155582866\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 1 Jun 2017 15:40:44 -0700", "Message-Id": "<20170601224051.6106-9-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.13.0.311.g0339965c70d6", "In-Reply-To": "<20170601224051.6106-1-jacob.e.keller@intel.com>", "References": "<20170601224051.6106-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 08/15] fm10k: avoid divide by zero in rare\n\tcases when device is resetting", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.18-1", "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": "It is possible that under rare circumstances the device is undergoing\na reset, such as when a PFLR occurs, and the device may be transmitting\nsimultaneously. In this case, we might attempt to divide by zero when\nfinding the proper r_idx. Instead, lets read the num_tx_queues once,\nand make sure it's non-zero.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 24f2f6f86f5a..f0d824558fbf 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -643,9 +643,13 @@ int fm10k_close(struct net_device *netdev)\n static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n+\tint num_tx_queues = READ_ONCE(interface->num_tx_queues);\n \tunsigned int r_idx = skb->queue_mapping;\n \tint err;\n \n+\tif (!num_tx_queues)\n+\t\treturn NETDEV_TX_BUSY;\n+\n \tif ((skb->protocol == htons(ETH_P_8021Q)) &&\n \t !skb_vlan_tag_present(skb)) {\n \t\t/* FM10K only supports hardware tagging, any tags in frame\n@@ -698,8 +702,8 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)\n \t\t__skb_put(skb, pad_len);\n \t}\n \n-\tif (r_idx >= interface->num_tx_queues)\n-\t\tr_idx %= interface->num_tx_queues;\n+\tif (r_idx >= num_tx_queues)\n+\t\tr_idx %= num_tx_queues;\n \n \terr = fm10k_xmit_frame_ring(skb, interface->tx_ring[r_idx]);\n \n", "prefixes": [ "08/15" ] }