Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/461895/?format=api
{ "id": 461895, "url": "http://patchwork.ozlabs.org/api/patches/461895/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1429229172-143692-14-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-14-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-17T00:06:10", "name": "[net-next,S4,13/15] i40e/i40evf: force inline transmit functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ec7e2441d4db292a9b48bd6e165c6ef82080aaf9", "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-14-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/461895/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/461895/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 1AAB21402A6\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 17 Apr 2015 10:03:33 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4161C89E8D;\n\tFri, 17 Apr 2015 00:03:32 +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 6mwdEU00DV80; Fri, 17 Apr 2015 00:03:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A9CF589E85;\n\tFri, 17 Apr 2015 00:03:31 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 1CE891C223A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 1916D89E8A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:30 +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 GilWDIzV_Mpc for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:29 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4F4F389E6E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:29 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 16 Apr 2015 17:03:29 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2015 17:03:28 -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=\"481989725\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 16 Apr 2015 20:06:10 -0400", "Message-Id": "<1429229172-143692-14-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>", "Subject": "[Intel-wired-lan] [net-next S4 13/15] i40e/i40evf: force inline\n\ttransmit functions", "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\nInlining these functions gives us about 15% more 64 byte packets per\nsecond when using pktgen. 13.3 million to 15 million with a single\nqueue.\n\nAlso fix the function names in i40evf to i40evf not i40e while we are\ntouching the function header.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nSigned-off-by: Catherine Sullivan <catherine.sullivan@intel.com>\nChange-ID: I3294ae9b085cf438672b6db5f9af122490ead9d0\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 32 ++++++++++++------------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 36 ++++++++++++---------------\n 2 files changed, 32 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex d6ad42b..ca21f9a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2065,13 +2065,13 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n * otherwise returns 0 to indicate the flags has been set properly.\n **/\n #ifdef I40E_FCOE\n-int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,\n-\t\t\t struct i40e_ring *tx_ring,\n-\t\t\t u32 *flags)\n-#else\n-static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,\n+inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,\n \t\t\t\t struct i40e_ring *tx_ring,\n \t\t\t\t u32 *flags)\n+#else\n+static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,\n+\t\t\t\t\t struct i40e_ring *tx_ring,\n+\t\t\t\t\t u32 *flags)\n #endif\n {\n \t__be16 protocol = skb->protocol;\n@@ -2414,9 +2414,9 @@ static inline int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n * Returns 0 if stop is not needed\n **/\n #ifdef I40E_FCOE\n-int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n+inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n #else\n-static int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n+static inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n #endif\n {\n \tif (likely(I40E_DESC_UNUSED(tx_ring) >= size))\n@@ -2496,13 +2496,13 @@ linearize_chk_done:\n * @td_offset: offset for checksum or crc\n **/\n #ifdef I40E_FCOE\n-void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n-\t\t struct i40e_tx_buffer *first, u32 tx_flags,\n-\t\t const u8 hdr_len, u32 td_cmd, u32 td_offset)\n-#else\n-static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n+inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\t\tstruct i40e_tx_buffer *first, u32 tx_flags,\n \t\t\tconst u8 hdr_len, u32 td_cmd, u32 td_offset)\n+#else\n+static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n+\t\t\t struct i40e_tx_buffer *first, u32 tx_flags,\n+\t\t\t const u8 hdr_len, u32 td_cmd, u32 td_offset)\n #endif\n {\n \tunsigned int data_len = skb->data_len;\n@@ -2663,11 +2663,11 @@ dma_error:\n * one descriptor.\n **/\n #ifdef I40E_FCOE\n-int i40e_xmit_descriptor_count(struct sk_buff *skb,\n-\t\t\t struct i40e_ring *tx_ring)\n-#else\n-static int i40e_xmit_descriptor_count(struct sk_buff *skb,\n+inline int i40e_xmit_descriptor_count(struct sk_buff *skb,\n \t\t\t\t struct i40e_ring *tx_ring)\n+#else\n+static inline int i40e_xmit_descriptor_count(struct sk_buff *skb,\n+\t\t\t\t\t struct i40e_ring *tx_ring)\n #endif\n {\n \tunsigned int f;\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 4f77d38..fa2458b 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1349,7 +1349,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)\n }\n \n /**\n- * i40e_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW\n+ * i40evf_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW\n * @skb: send buffer\n * @tx_ring: ring to send buffer on\n * @flags: the tx flags to be set\n@@ -1360,9 +1360,9 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)\n * Returns error code indicate the frame should be dropped upon error and the\n * otherwise returns 0 to indicate the flags has been set properly.\n **/\n-static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,\n-\t\t\t\t struct i40e_ring *tx_ring,\n-\t\t\t\t u32 *flags)\n+static inline int i40evf_tx_prepare_vlan_flags(struct sk_buff *skb,\n+\t\t\t\t\t struct i40e_ring *tx_ring,\n+\t\t\t\t\t u32 *flags)\n {\n \t__be16 protocol = skb->protocol;\n \tu32 tx_flags = 0;\n@@ -1701,11 +1701,7 @@ static inline int __i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\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+static inline int i40evf_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@@ -1713,7 +1709,7 @@ static int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n }\n \n /**\n- * i40e_tx_map - Build the Tx descriptor\n+ * i40evf_tx_map - Build the Tx descriptor\n * @tx_ring: ring to send buffer on\n * @skb: send buffer\n * @first: first buffer info buffer to use\n@@ -1722,9 +1718,9 @@ static int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)\n * @td_cmd: the command field in the descriptor\n * @td_offset: offset for checksum or crc\n **/\n-static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n-\t\t\tstruct i40e_tx_buffer *first, u32 tx_flags,\n-\t\t\tconst u8 hdr_len, u32 td_cmd, u32 td_offset)\n+static inline void i40evf_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n+\t\t\t\t struct i40e_tx_buffer *first, u32 tx_flags,\n+\t\t\t\t const u8 hdr_len, u32 td_cmd, u32 td_offset)\n {\n \tunsigned int data_len = skb->data_len;\n \tunsigned int size = skb_headlen(skb);\n@@ -1876,7 +1872,7 @@ dma_error:\n }\n \n /**\n- * i40e_xmit_descriptor_count - calculate number of tx descriptors needed\n+ * i40evf_xmit_descriptor_count - calculate number of tx descriptors needed\n * @skb: send buffer\n * @tx_ring: ring to send buffer on\n *\n@@ -1884,8 +1880,8 @@ dma_error:\n * there is not enough descriptors available in this ring since we need at least\n * one descriptor.\n **/\n-static int i40e_xmit_descriptor_count(struct sk_buff *skb,\n-\t\t\t\t struct i40e_ring *tx_ring)\n+static inline int i40evf_xmit_descriptor_count(struct sk_buff *skb,\n+\t\t\t\t\t struct i40e_ring *tx_ring)\n {\n \tunsigned int f;\n \tint count = 0;\n@@ -1926,11 +1922,11 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \tu32 td_cmd = 0;\n \tu8 hdr_len = 0;\n \tint tso;\n-\tif (0 == i40e_xmit_descriptor_count(skb, tx_ring))\n+\tif (0 == i40evf_xmit_descriptor_count(skb, tx_ring))\n \t\treturn NETDEV_TX_BUSY;\n \n \t/* prepare the xmit flags */\n-\tif (i40e_tx_prepare_vlan_flags(skb, tx_ring, &tx_flags))\n+\tif (i40evf_tx_prepare_vlan_flags(skb, tx_ring, &tx_flags))\n \t\tgoto out_drop;\n \n \t/* obtain protocol of skb */\n@@ -1973,8 +1969,8 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \ti40e_create_tx_ctx(tx_ring, cd_type_cmd_tso_mss,\n \t\t\t cd_tunneling, cd_l2tag2);\n \n-\ti40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len,\n-\t\t td_cmd, td_offset);\n+\ti40evf_tx_map(tx_ring, skb, first, tx_flags, hdr_len,\n+\t\t td_cmd, td_offset);\n \n \treturn NETDEV_TX_OK;\n \n", "prefixes": [ "net-next", "S4", "13/15" ] }