Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/593066/?format=api
{ "id": 593066, "url": "http://patchwork.ozlabs.org/api/patches/593066/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160307173009.5682.9616.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": "<20160307173009.5682.9616.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2016-03-07T17:30:09", "name": "[3/5] ixgbe/ixgbevf: Add support for bulk free in Tx cleanup & cleanup boolean logic", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a77e14eb6554f5593b6b0b2312c749945d8816b2", "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/20160307173009.5682.9616.stgit@localhost.localdomain/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/593066/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/593066/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 079C91401CA\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 8 Mar 2016 04:30:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5308095CC5;\n\tMon, 7 Mar 2016 17:30:15 +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 m4jlUwRGOYQo; Mon, 7 Mar 2016 17:30:13 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id D5C6795CAC;\n\tMon, 7 Mar 2016 17:30:13 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 74CE61C1677\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 6E9F4920F9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:12 +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 Viun7o0r9i2M for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:11 +0000 (UTC)", "from mail-pa0-f43.google.com (mail-pa0-f43.google.com\n\t[209.85.220.43])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id F3556920F0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 7 Mar 2016 17:30:10 +0000 (UTC)", "by mail-pa0-f43.google.com with SMTP id tt10so20014149pab.3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 07 Mar 2016 09:30:10 -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\t3sm25395714pfn.59.2016.03.07.09.30.09\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:10 -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=jFiRscIk; 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=KQtP4X3caGyqZFy3vhtecM9u2FLsVADU+Aii086K+qc=;\n\tb=jFiRscIkFk32cOAqvVHmpo3d4pm3Q61WcyXB3n351MlHSQSyMOTn6ZtHCN1VxMv1Z0\n\tyUWx42p+chJ5QxUs14Q/YllyGj7GcBQEdbdxIIjDuvWdIAaW/gB2533gbqEQYZ5z82KA\n\tT0ZWij4nikuPZK4hyj9xUzpZ00OkKUXfgbNTE=", "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=KQtP4X3caGyqZFy3vhtecM9u2FLsVADU+Aii086K+qc=;\n\tb=Vt0FJgn4YE57lqyc3MlBGIDNQThNA/f1RRf30g/DrfJkav9sj649iDndyo4Hr3spJZ\n\tLiA6zXc8aGOqUwMhrUObdSkU5e9G/TVg7l4WR84WfWSpZOTEBRsR7bigAVfhYHlCh51E\n\t+f7ArpFTaQiqUNdR8ORPIYFHuvgUxO1j0ulFb4KZxjgmysMzssKxKMvbblw/vqTrH+hP\n\t+KGZ2vJ7aqC9FCE8UAThM3rfcCXCyTUqjW1iZAwJ6wDo4I3liUUKnqUbDC0ga6IWa/ni\n\tmQfTAZZ/qfeVKftIsdHRpLhGPwyPhl0CcVBVCUlBRCg3+yg7iRnVloIClyoEJJbVR4sZ\n\toEDQ==", "X-Gm-Message-State": "AD7BkJKpxpNS26elYenC6g2RTXFb7pXn1EX1nRtRkF4PsYV69/PW0z/D0qMzzEKNtiHueeAX", "X-Received": "by 10.66.187.36 with SMTP id fp4mr34909166pac.47.1457371810622; \n\tMon, 07 Mar 2016 09:30:10 -0800 (PST)", "From": "Alexander Duyck <aduyck@mirantis.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 07 Mar 2016 09:30:09 -0800", "Message-ID": "<20160307173009.5682.9616.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 3/5] ixgbe/ixgbevf: Add support for bulk\n\tfree in Tx cleanup & 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 ixgbevf and cleans up the\nboolean logic in the polling routines for ixgbe and ixgbevf in the hopes of\navoiding any 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/ixgbe/ixgbe_main.c | 10 +++++++---\n drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 14 +++++++++-----\n 2 files changed, 16 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 9f8d7626075a..1b490d1c27ce 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -1111,6 +1111,7 @@ static int ixgbe_tx_maxrate(struct net_device *netdev,\n * ixgbe_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 ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,\n \t\t\t struct ixgbe_ring *tx_ring, int napi_budget)\n@@ -2807,8 +2808,10 @@ int ixgbe_poll(struct napi_struct *napi, int budget)\n \t\tixgbe_update_dca(q_vector);\n #endif\n \n-\tixgbe_for_each_ring(ring, q_vector->tx)\n-\t\tclean_complete &= !!ixgbe_clean_tx_irq(q_vector, ring, budget);\n+\tixgbe_for_each_ring(ring, q_vector->tx) {\n+\t\tif (!ixgbe_clean_tx_irq(q_vector, ring, budget))\n+\t\t\tclean_complete = false;\n+\t}\n \n \t/* Exit if we are called by netpoll or busy polling is active */\n \tif ((budget <= 0) || !ixgbe_qv_lock_napi(q_vector))\n@@ -2826,7 +2829,8 @@ int ixgbe_poll(struct napi_struct *napi, int budget)\n \t\t\t\t\t\t per_ring_budget);\n \n \t\twork_done += cleaned;\n-\t\tclean_complete &= (cleaned < per_ring_budget);\n+\t\tif (cleaned >= per_ring_budget)\n+\t\t\tclean_complete = false;\n \t}\n \n \tixgbe_qv_unlock_napi(q_vector);\ndiff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\nindex 98dca8050f3a..0c3e29b55b45 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n@@ -288,9 +288,10 @@ static void ixgbevf_tx_timeout(struct net_device *netdev)\n * ixgbevf_clean_tx_irq - Reclaim resources after transmit completes\n * @q_vector: board private structure\n * @tx_ring: tx ring to clean\n+ * @napi_budget: Used to determine if we are in netpoll\n **/\n static bool ixgbevf_clean_tx_irq(struct ixgbevf_q_vector *q_vector,\n-\t\t\t\t struct ixgbevf_ring *tx_ring)\n+\t\t\t\t struct ixgbevf_ring *tx_ring, int napi_budget)\n {\n \tstruct ixgbevf_adapter *adapter = q_vector->adapter;\n \tstruct ixgbevf_tx_buffer *tx_buffer;\n@@ -328,7 +329,7 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_q_vector *q_vector,\n \t\ttotal_packets += tx_buffer->gso_segs;\n \n \t\t/* free the skb */\n-\t\tdev_kfree_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@@ -1013,8 +1014,10 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget)\n \tint per_ring_budget, work_done = 0;\n \tbool clean_complete = true;\n \n-\tixgbevf_for_each_ring(ring, q_vector->tx)\n-\t\tclean_complete &= ixgbevf_clean_tx_irq(q_vector, ring);\n+\tixgbevf_for_each_ring(ring, q_vector->tx) {\n+\t\tif (!ixgbevf_clean_tx_irq(q_vector, ring, budget))\n+\t\t\tclean_complete = false;\n+\t}\n \n \tif (budget <= 0)\n \t\treturn budget;\n@@ -1035,7 +1038,8 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget)\n \t\tint cleaned = ixgbevf_clean_rx_irq(q_vector, ring,\n \t\t\t\t\t\t per_ring_budget);\n \t\twork_done += cleaned;\n-\t\tclean_complete &= (cleaned < per_ring_budget);\n+\t\tif (cleaned >= per_ring_budget)\n+\t\t\tclean_complete = false;\n \t}\n \n #ifdef CONFIG_NET_RX_BUSY_POLL\n", "prefixes": [ "3/5" ] }