Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/593068/?format=api
{ "id": 593068, "url": "http://patchwork.ozlabs.org/api/patches/593068/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160307173021.5682.83995.stgit@localhost.localdomain/", "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": "<20160307173021.5682.83995.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2016-03-07T17:30:21", "name": "[5/5] igb: Add support for bulk Tx cleanup & cleanup boolean logic", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a2ef80ba9b6d68148b3f8bc48522b987dc7cb719", "submitter": { "id": 67293, "url": "http://patchwork.ozlabs.org/api/people/67293/?format=api", "name": "Alexander Duyck", "email": "aduyck@mirantis.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/20160307173021.5682.83995.stgit@localhost.localdomain/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/593068/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/593068/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id EA15C1401CA\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 8 Mar 2016 04:30:28 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 48F1395CB9;\n\tMon, 7 Mar 2016 17:30:28 +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 AoeoMLuDTO8H; Mon, 7 Mar 2016 17:30:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6A65F95C96;\n\tMon, 7 Mar 2016 17:30:26 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 359171C0B99\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:25 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 31A7CA6271\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:25 +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 A7_vp0qnjMUD for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:23 +0000 (UTC)", "from mail-pf0-f175.google.com (mail-pf0-f175.google.com\n\t[209.85.192.175])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 269C6A62FB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:23 +0000 (UTC)", "by mail-pf0-f175.google.com with SMTP id 63so83122950pfe.3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 07 Mar 2016 09:30:23 -0800 (PST)", "from localhost.localdomain\n\t(static-50-53-29-36.bvtn.or.frontiernet.net. [50.53.29.36])\n\tby smtp.gmail.com with ESMTPSA id\n\tz68sm20438913pfi.19.2016.03.07.09.30.22\n\tfor <intel-wired-lan@lists.osuosl.org>\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 07 Mar 2016 09:30:22 -0800 (PST)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=mirantis.com header.i=@mirantis.com\n\theader.b=VUbN+5WQ; dkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=mirantis.com;\n\ts=google; \n\th=subject:from:to:date:message-id:in-reply-to:references:user-agent\n\t:mime-version:content-transfer-encoding;\n\tbh=i4xkHoWXPJE9yDUJOHdVkXhtMoEb31hZoBJ40bGvOWU=;\n\tb=VUbN+5WQNtTPzMskBuHlMF+GJ636eW873cTnafxurylqPWaHSWsXMTbWpKYbZSPQ84\n\txbpSO1dqAwbCOetEu/hM/tsPjJSgB/wdx0PWKIiNX6ZGPceWZjS74PLmN6H6Irmz+PaB\n\tWw7o+BmbXfZyqMusb2CoExvEaCM11RxMBgRso=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:subject:from:to:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-transfer-encoding;\n\tbh=i4xkHoWXPJE9yDUJOHdVkXhtMoEb31hZoBJ40bGvOWU=;\n\tb=cnUlbV4KAzbd7IaTj0DsqxHm26chaBFz/3A86pv9A9vR2oYuNv66C/bz8/RSfL2Uyo\n\trmq8LZV8kOtMoUnU9mZmF0xeKtD0KaRd5yciDgxtaCutGJinRnrBkjEwHvrO6gxUTn6C\n\tCFUcDQPZCrYFS7AbYZ4b4K28b2Ktj+aT4HBrqP9HpDfuwNz9678pnUBGfCX1vAskdOKt\n\tN7lkQKgZQEwo6yjRMlBatYs4/z0LMtUquHTrxz5GNS+5Ht8S8MJkw2uIxBGWtwS4CjJK\n\tIss7nRyQJdymMyg19i5SgxAwbF0dza2oouAwC5k6Mtdb/fKBMRwOD9zTG6NbiEnP1Rn9\n\tQT1A==", "X-Gm-Message-State": "AD7BkJITSHtcQ6TxKQuhXmpbIuabYHHQdt/tH2PteuXX8XrIeXuWR7uIPD6XPirQia7ce8bz", "X-Received": "by 10.98.76.216 with SMTP id e85mr5819313pfj.121.1457371822842; \n\tMon, 07 Mar 2016 09:30:22 -0800 (PST)", "From": "Alexander Duyck <aduyck@mirantis.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 07 Mar 2016 09:30:21 -0800", "Message-ID": "<20160307173021.5682.83995.stgit@localhost.localdomain>", "In-Reply-To": "<20160307172722.5682.38580.stgit@localhost.localdomain>", "References": "<20160307172722.5682.38580.stgit@localhost.localdomain>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 5/5] igb: Add support for bulk Tx cleanup\n\t& cleanup boolean logic", "X-BeenThere": "intel-wired-lan@lists.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.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "This patch enables bulk free in Tx cleanup for igb and cleans up the\nboolean logic in the polling routines for igb in the hopes of avoiding\nany mix-ups similar to what occurred with i40e and i40evf.\n\nSigned-off-by: Alexander Duyck <aduyck@mirantis.com>\n---\n drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++-----\n 1 file changed, 7 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 1846b8584ef2..99d37b0605d9 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -151,7 +151,7 @@ static void igb_update_dca(struct igb_q_vector *);\n static void igb_setup_dca(struct igb_adapter *);\n #endif /* CONFIG_IGB_DCA */\n static int igb_poll(struct napi_struct *, int);\n-static bool igb_clean_tx_irq(struct igb_q_vector *);\n+static bool igb_clean_tx_irq(struct igb_q_vector *, int);\n static int igb_clean_rx_irq(struct igb_q_vector *, int);\n static int igb_ioctl(struct net_device *, struct ifreq *, int cmd);\n static void igb_tx_timeout(struct net_device *);\n@@ -6534,13 +6534,14 @@ static int igb_poll(struct napi_struct *napi, int budget)\n \t\tigb_update_dca(q_vector);\n #endif\n \tif (q_vector->tx.ring)\n-\t\tclean_complete = igb_clean_tx_irq(q_vector);\n+\t\tclean_complete = igb_clean_tx_irq(q_vector, budget);\n \n \tif (q_vector->rx.ring) {\n \t\tint cleaned = igb_clean_rx_irq(q_vector, budget);\n \n \t\twork_done += cleaned;\n-\t\tclean_complete &= (cleaned < budget);\n+\t\tif (cleaned >= budget)\n+\t\t\tclean_complete = false;\n \t}\n \n \t/* If all work not completed, return budget and keep polling */\n@@ -6557,10 +6558,11 @@ static int igb_poll(struct napi_struct *napi, int budget)\n /**\n * igb_clean_tx_irq - Reclaim resources after transmit completes\n * @q_vector: pointer to q_vector containing needed info\n+ * @napi_budget: Used to determine if we are in netpoll\n *\n * returns true if ring is completely cleaned\n **/\n-static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)\n+static bool igb_clean_tx_irq(struct igb_q_vector *q_vector, int napi_budget)\n {\n \tstruct igb_adapter *adapter = q_vector->adapter;\n \tstruct igb_ring *tx_ring = q_vector->tx.ring;\n@@ -6599,7 +6601,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)\n \t\ttotal_packets += tx_buffer->gso_segs;\n \n \t\t/* free the skb */\n-\t\tdev_consume_skb_any(tx_buffer->skb);\n+\t\tnapi_consume_skb(tx_buffer->skb, napi_budget);\n \n \t\t/* unmap skb header data */\n \t\tdma_unmap_single(tx_ring->dev,\n", "prefixes": [ "5/5" ] }