Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/461894/?format=api
{ "id": 461894, "url": "http://patchwork.ozlabs.org/api/patches/461894/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1429229172-143692-13-git-send-email-catherine.sullivan@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": "<1429229172-143692-13-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-17T00:06:09", "name": "[net-next,S4,12/15] i40evf: skb->xmit_more support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3c9f237000efbe0bf44f3de5bf8b6384d83dcc6e", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1429229172-143692-13-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/461894/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/461894/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 fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id C544F1402A6\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 17 Apr 2015 10:03:31 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 24F9D89E86;\n\tFri, 17 Apr 2015 00:03:31 +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 AzyrKQuhK0Uo; Fri, 17 Apr 2015 00:03:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8C2C289E85;\n\tFri, 17 Apr 2015 00:03:29 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 302031C223A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2C24089E88\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:28 +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 jWbsSD_S6LIL for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:27 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B0EA789E86\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:27 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 16 Apr 2015 17:03:27 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2015 17:03:27 -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.11,591,1422950400\"; d=\"scan'208\";a=\"481989715\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 16 Apr 2015 20:06:09 -0400", "Message-Id": "<1429229172-143692-13-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Daniel Borkmann <dborkman@redhat.com>, Eric Dumazet <edumazet@google.com>", "Subject": "[Intel-wired-lan] [net-next S4 12/15] i40evf: skb->xmit_more support", "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>", "MIME-Version": "1.0", "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": "From: Jesse Brandeburg <jesse.brandeburg@intel.com>\n\nEric added support for skb->xmit_more in i40e, this ports that into i40evf as well.\n\nSupport skb->xmit_more in i40evf is straightforward; we need to move\naround i40e_maybe_stop_tx() call to correctly test netif_xmit_stopped()\nbefore taking the decision to not kick the NIC.\n\nSigned-off-by: Eric Dumazet <edumazet@google.com>\nSigned-off-by: Daniel Borkmann <dborkman@redhat.com>\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: Idddda6a2e4a7ab335631c91ced51f55b25eb8468\n---\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 88 ++++++++++++++-------------\n 1 file changed, 47 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex e1a44dd..4f77d38 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1672,6 +1672,47 @@ linearize_chk_done:\n }\n \n /**\n+ * __i40evf_maybe_stop_tx - 2nd level check for tx stop conditions\n+ * @tx_ring: the ring to be checked\n+ * @size: the size buffer we want to assure is available\n+ *\n+ * Returns -EBUSY if a stop is needed, else 0\n+ **/\n+static inline int __i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n+{\n+\tnetif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);\n+\t/* Memory barrier before checking head and tail */\n+\tsmp_mb();\n+\n+\t/* Check again in a case another CPU has just made room available. */\n+\tif (likely(I40E_DESC_UNUSED(tx_ring) < size))\n+\t\treturn -EBUSY;\n+\n+\t/* A reprieve! - use start_queue because it doesn't call schedule */\n+\tnetif_start_subqueue(tx_ring->netdev, tx_ring->queue_index);\n+\t++tx_ring->tx_stats.restart_queue;\n+\treturn 0;\n+}\n+\n+/**\n+ * i40evf_maybe_stop_tx - 1st level check for tx stop conditions\n+ * @tx_ring: the ring to be checked\n+ * @size: the size buffer we want to assure is available\n+ *\n+ * Returns 0 if stop is not needed\n+ **/\n+#ifdef I40E_FCOE\n+int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n+#else\n+static int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n+#endif\n+{\n+\tif (likely(I40E_DESC_UNUSED(tx_ring) >= size))\n+\t\treturn 0;\n+\treturn __i40evf_maybe_stop_tx(tx_ring, size);\n+}\n+\n+/**\n * i40e_tx_map - Build the Tx descriptor\n * @tx_ring: ring to send buffer on\n * @skb: send buffer\n@@ -1808,8 +1849,12 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \n \ttx_ring->next_to_use = i;\n \n+\ti40evf_maybe_stop_tx(tx_ring, DESC_NEEDED);\n \t/* notify HW of packet */\n-\twritel(i, tx_ring->tail);\n+\tif (!skb->xmit_more ||\n+\t netif_xmit_stopped(netdev_get_tx_queue(tx_ring->netdev,\n+\t\t\t\t\t\t tx_ring->queue_index)))\n+\t\twritel(i, tx_ring->tail);\n \n \treturn;\n \n@@ -1831,43 +1876,6 @@ dma_error:\n }\n \n /**\n- * __i40e_maybe_stop_tx - 2nd level check for tx stop conditions\n- * @tx_ring: the ring to be checked\n- * @size: the size buffer we want to assure is available\n- *\n- * Returns -EBUSY if a stop is needed, else 0\n- **/\n-static inline int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n-{\n-\tnetif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);\n-\t/* Memory barrier before checking head and tail */\n-\tsmp_mb();\n-\n-\t/* Check again in a case another CPU has just made room available. */\n-\tif (likely(I40E_DESC_UNUSED(tx_ring) < size))\n-\t\treturn -EBUSY;\n-\n-\t/* A reprieve! - use start_queue because it doesn't call schedule */\n-\tnetif_start_subqueue(tx_ring->netdev, tx_ring->queue_index);\n-\t++tx_ring->tx_stats.restart_queue;\n-\treturn 0;\n-}\n-\n-/**\n- * i40e_maybe_stop_tx - 1st level check for tx stop conditions\n- * @tx_ring: the ring to be checked\n- * @size: the size buffer we want to assure is available\n- *\n- * Returns 0 if stop is not needed\n- **/\n-static int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n-{\n-\tif (likely(I40E_DESC_UNUSED(tx_ring) >= size))\n-\t\treturn 0;\n-\treturn __i40e_maybe_stop_tx(tx_ring, size);\n-}\n-\n-/**\n * i40e_xmit_descriptor_count - calculate number of tx descriptors needed\n * @skb: send buffer\n * @tx_ring: ring to send buffer on\n@@ -1892,7 +1900,7 @@ static int i40e_xmit_descriptor_count(struct sk_buff *skb,\n \t\tcount += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);\n \n \tcount += TXD_USE_COUNT(skb_headlen(skb));\n-\tif (i40e_maybe_stop_tx(tx_ring, count + 4 + 1)) {\n+\tif (i40evf_maybe_stop_tx(tx_ring, count + 4 + 1)) {\n \t\ttx_ring->tx_stats.tx_busy++;\n \t\treturn 0;\n \t}\n@@ -1968,8 +1976,6 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \ti40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len,\n \t\t td_cmd, td_offset);\n \n-\ti40e_maybe_stop_tx(tx_ring, DESC_NEEDED);\n-\n \treturn NETDEV_TX_OK;\n \n out_drop:\n", "prefixes": [ "net-next", "S4", "12/15" ] }