Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/593067/?format=api
{ "id": 593067, "url": "http://patchwork.ozlabs.org/api/patches/593067/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160307173015.5682.15247.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": "<20160307173015.5682.15247.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2016-03-07T17:30:15", "name": "[4/5] fm10k: Add support for bulk Tx cleanup & cleanup boolean logic", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "049b917d73895c6546d526b1ad13945b9d998dd2", "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/20160307173015.5682.15247.stgit@localhost.localdomain/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/593067/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/593067/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 E69961401B5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 8 Mar 2016 04:30:19 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 4123B95C96;\n\tMon, 7 Mar 2016 17:30:19 +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 pBioXtuybW0Y; Mon, 7 Mar 2016 17:30:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2ADE495CAC;\n\tMon, 7 Mar 2016 17:30:18 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9D1511C1652\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:17 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 958F092107\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:17 +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 e0VRt3ukyAVM for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:17 +0000 (UTC)", "from mail-pf0-f176.google.com (mail-pf0-f176.google.com\n\t[209.85.192.176])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 1451F920E1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:17 +0000 (UTC)", "by mail-pf0-f176.google.com with SMTP id x188so59408636pfb.2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 07 Mar 2016 09:30:17 -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\ty21sm25364653pfa.85.2016.03.07.09.30.16\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:16 -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=Du9WCkNG; 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=P6QTnW2RQiKYD4rWjboBxx1vfs0/O1OIZOmKb6pbS6Y=;\n\tb=Du9WCkNGIDMXk6fEZ3e5TqyAfWs7/0+Yb1AoGpSAhVWxf/kSmEaIWD3Ygfsy9nC7H+\n\tuF8+JoKxbLRQ2Jjpq+c0DO9PlvpeMpAJKMytQ1IGzUXqYrkPZ+rW754B6POpFOTMsuQ+\n\t/bc6kyaLNe9WbgeZGo92MDEoiopvvMCzlbhq0=", "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=P6QTnW2RQiKYD4rWjboBxx1vfs0/O1OIZOmKb6pbS6Y=;\n\tb=ipyMbTUHN6ew+Z4V2HhwrGZJbuYRnbUt5LcPisZXXHm1B39aQ5t7LSNlSPE07iKgoQ\n\tSqFZd0IVz8l7S6c8yPSgIvPfI+lwfC2XnmF+L4rpBJH7CzBOuENVSUitc6fJ+Ym2BzsH\n\tAPxqO2xoqbMeEtbfb0AKFiwGhZT/CqWWCOF2q/jr831B0YHXWrNb5DiFINING/mXWULY\n\t+6xmTxk+Xr5tMpa60P6JghVK9Av+2Iwov0bnt+lPGJ0vgCRYEdZbYz22Cpmc/GryBTko\n\tRsmOAi4oQPPjFf+EXvqqn8noh2eRIQZ+Ee4373JbG04ahEm0SULX/3I2bHyQ85lozfbU\n\tzC+A==", "X-Gm-Message-State": "AD7BkJIZR3fNOjzOUaMEDDyLP3Z/3V7jZwFj7E+6Le1aEZb/vWi/MZqBQg4eHlAtW9TmC0w2", "X-Received": "by 10.98.17.208 with SMTP id 77mr34345095pfr.37.1457371816783;\n\tMon, 07 Mar 2016 09:30:16 -0800 (PST)", "From": "Alexander Duyck <aduyck@mirantis.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 07 Mar 2016 09:30:15 -0800", "Message-ID": "<20160307173015.5682.15247.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 4/5] fm10k: Add support for bulk Tx\n\tcleanup & 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 fm10k and cleans up the\nboolean logic in the polling routines for fm10k 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/fm10k/fm10k_main.c | 14 +++++++++-----\n 1 file changed, 9 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex 43f3674501cc..de406dca8f06 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -1198,9 +1198,10 @@ void fm10k_tx_timeout_reset(struct fm10k_intfc *interface)\n * fm10k_clean_tx_irq - Reclaim resources after transmit completes\n * @q_vector: structure containing interrupt and ring information\n * @tx_ring: tx ring to clean\n+ * @napi_budget: Used to determine if we are in netpoll\n **/\n static bool fm10k_clean_tx_irq(struct fm10k_q_vector *q_vector,\n-\t\t\t struct fm10k_ring *tx_ring)\n+\t\t\t struct fm10k_ring *tx_ring, int napi_budget)\n {\n \tstruct fm10k_intfc *interface = q_vector->interface;\n \tstruct fm10k_tx_buffer *tx_buffer;\n@@ -1238,7 +1239,7 @@ static bool fm10k_clean_tx_irq(struct fm10k_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@@ -1449,8 +1450,10 @@ static int fm10k_poll(struct napi_struct *napi, int budget)\n \tint per_ring_budget, work_done = 0;\n \tbool clean_complete = true;\n \n-\tfm10k_for_each_ring(ring, q_vector->tx)\n-\t\tclean_complete &= fm10k_clean_tx_irq(q_vector, ring);\n+\tfm10k_for_each_ring(ring, q_vector->tx) {\n+\t\tif (!fm10k_clean_tx_irq(q_vector, ring, budget))\n+\t\t\tclean_complete = false;\n+\t}\n \n \t/* Handle case where we are called by netpoll with a budget of 0 */\n \tif (budget <= 0)\n@@ -1468,7 +1471,8 @@ static int fm10k_poll(struct napi_struct *napi, int budget)\n \t\tint work = fm10k_clean_rx_irq(q_vector, ring, per_ring_budget);\n \n \t\twork_done += work;\n-\t\tclean_complete &= !!(work < per_ring_budget);\n+\t\tif (work >= per_ring_budget)\n+\t\t\tclean_complete = false;\n \t}\n \n \t/* If all work not completed, return budget and keep polling */\n", "prefixes": [ "4/5" ] }