Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/554886/?format=api
{ "id": 554886, "url": "http://patchwork.ozlabs.org/api/patches/554886/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1449705033-4968-2-git-send-email-joshua.a.hay@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": "<1449705033-4968-2-git-send-email-joshua.a.hay@intel.com>", "list_archive_url": null, "date": "2015-12-09T23:50:21", "name": "[next,S23,01/13] i40e: Fix Rx hash reported to the stack by our driver", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5906ac5832dd56e506606d0fd488c36a7740d7ee", "submitter": { "id": 19461, "url": "http://patchwork.ozlabs.org/api/people/19461/?format=api", "name": "Joshua Hay", "email": "joshua.a.hay@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/1449705033-4968-2-git-send-email-joshua.a.hay@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/554886/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/554886/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 00BC0140E1E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 10 Dec 2015 10:50:57 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 17210332FF;\n\tWed, 9 Dec 2015 23:50:57 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id EBxCJsCYnw32; Wed, 9 Dec 2015 23:50:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9ED933318E;\n\tWed, 9 Dec 2015 23:50:50 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 4B4501C0F90\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Dec 2015 23:50:45 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 426C4924B2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Dec 2015 23:50:45 +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 wqxh1XDvqI45 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Dec 2015 23:50:41 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 85E5F91610\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 9 Dec 2015 23:50:41 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga101.fm.intel.com with ESMTP; 09 Dec 2015 15:50:33 -0800", "from jahay1-mobl2.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.79])\n\tby orsmga002.jf.intel.com with ESMTP; 09 Dec 2015 15:50:33 -0800" ], "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.20,405,1444719600\"; d=\"scan'208\";a=\"868414309\"", "From": "Joshua Hay <joshua.a.hay@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 9 Dec 2015 15:50:21 -0800", "Message-Id": "<1449705033-4968-2-git-send-email-joshua.a.hay@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1449705033-4968-1-git-send-email-joshua.a.hay@intel.com>", "References": "<1449705033-4968-1-git-send-email-joshua.a.hay@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S23 01/13] i40e: Fix Rx hash reported\n\tto the stack by our driver", "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: Anjali Singhai Jain <anjali.singhai@intel.com>\n\nIf the driver calls skb_set_hash even with a zero hash, that\nindicates to the stack that the hash calculation is offloaded\nin hardware. So the Stack doesn't do a SW hash which is required\nfor load balancing if the user decides to turn of rx-hashing\non our device.\n\nThis patch fixes the path so that we do not call skb_set_hash\nif the feature is disabled.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\nChange-ID: Ic4debfa4ff91b5a72e447348a75768ed7a2d3e1b\n---\nTesting Hints:Test interrupt overload x710 Apart from the\ninterrupt overload, the user sees a problem where the stack\nis not calculating the hash when rx-hasing is turned off which\nis resulting in tpacket_v3 not balancing the load across\nmultiple threads.\n\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 54 ++++++++++++++-------------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 54 ++++++++++++++-------------\n 2 files changed, 58 insertions(+), 50 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex e2ab7a6..28d2943 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1422,31 +1422,12 @@ checksum_fail:\n }\n \n /**\n- * i40e_rx_hash - returns the hash value from the Rx descriptor\n- * @ring: descriptor ring\n- * @rx_desc: specific descriptor\n- **/\n-static inline u32 i40e_rx_hash(struct i40e_ring *ring,\n-\t\t\t union i40e_rx_desc *rx_desc)\n-{\n-\tconst __le64 rss_mask =\n-\t\tcpu_to_le64((u64)I40E_RX_DESC_FLTSTAT_RSS_HASH <<\n-\t\t\t I40E_RX_DESC_STATUS_FLTSTAT_SHIFT);\n-\n-\tif ((ring->netdev->features & NETIF_F_RXHASH) &&\n-\t (rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask)\n-\t\treturn le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);\n-\telse\n-\t\treturn 0;\n-}\n-\n-/**\n- * i40e_ptype_to_hash - get a hash type\n+ * i40e_ptype_to_htype - get a hash type\n * @ptype: the ptype value from the descriptor\n *\n * Returns a hash type to be used by skb_set_hash\n **/\n-static inline enum pkt_hash_types i40e_ptype_to_hash(u8 ptype)\n+static inline enum pkt_hash_types i40e_ptype_to_htype(u8 ptype)\n {\n \tstruct i40e_rx_ptype_decoded decoded = decode_rx_desc_ptype(ptype);\n \n@@ -1464,6 +1445,30 @@ static inline enum pkt_hash_types i40e_ptype_to_hash(u8 ptype)\n }\n \n /**\n+ * i40e_rx_hash - set the hash value in the skb\n+ * @ring: descriptor ring\n+ * @rx_desc: specific descriptor\n+ **/\n+static inline void i40e_rx_hash(struct i40e_ring *ring,\n+\t\t\t\tunion i40e_rx_desc *rx_desc,\n+\t\t\t\tstruct sk_buff *skb,\n+\t\t\t\tu8 rx_ptype)\n+{\n+\tu32 hash;\n+\tconst __le64 rss_mask =\n+\t\tcpu_to_le64((u64)I40E_RX_DESC_FLTSTAT_RSS_HASH <<\n+\t\t\t I40E_RX_DESC_STATUS_FLTSTAT_SHIFT);\n+\n+\tif (ring->netdev->features & NETIF_F_RXHASH)\n+\t\treturn;\n+\n+\tif ((rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask) {\n+\t\thash = le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);\n+\t\tskb_set_hash(skb, hash, i40e_ptype_to_htype(rx_ptype));\n+\t}\n+}\n+\n+/**\n * i40e_clean_rx_irq_ps - Reclaim resources after receive; packet split\n * @rx_ring: rx ring to clean\n * @budget: how many cleans we're allowed\n@@ -1612,8 +1617,8 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tskb_set_hash(skb, i40e_rx_hash(rx_ring, rx_desc),\n-\t\t\t i40e_ptype_to_hash(rx_ptype));\n+\t\ti40e_rx_hash(rx_ring, rx_desc, skb, rx_ptype);\n+\n \t\tif (unlikely(rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK)) {\n \t\t\ti40e_ptp_rx_hwtstamp(vsi->back, skb, (rx_status &\n \t\t\t\t\t I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >>\n@@ -1741,8 +1746,7 @@ static int i40e_clean_rx_irq_1buf(struct i40e_ring *rx_ring, int budget)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tskb_set_hash(skb, i40e_rx_hash(rx_ring, rx_desc),\n-\t\t\t i40e_ptype_to_hash(rx_ptype));\n+\t\ti40e_rx_hash(rx_ring, rx_desc, skb, rx_ptype);\n \t\tif (unlikely(rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK)) {\n \t\t\ti40e_ptp_rx_hwtstamp(vsi->back, skb, (rx_status &\n \t\t\t\t\t I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >>\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 4ca4065..7a00657 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -886,31 +886,12 @@ checksum_fail:\n }\n \n /**\n- * i40e_rx_hash - returns the hash value from the Rx descriptor\n- * @ring: descriptor ring\n- * @rx_desc: specific descriptor\n- **/\n-static inline u32 i40e_rx_hash(struct i40e_ring *ring,\n-\t\t\t union i40e_rx_desc *rx_desc)\n-{\n-\tconst __le64 rss_mask =\n-\t\tcpu_to_le64((u64)I40E_RX_DESC_FLTSTAT_RSS_HASH <<\n-\t\t\t I40E_RX_DESC_STATUS_FLTSTAT_SHIFT);\n-\n-\tif ((ring->netdev->features & NETIF_F_RXHASH) &&\n-\t (rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask)\n-\t\treturn le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);\n-\telse\n-\t\treturn 0;\n-}\n-\n-/**\n- * i40e_ptype_to_hash - get a hash type\n+ * i40e_ptype_to_htype - get a hash type\n * @ptype: the ptype value from the descriptor\n *\n * Returns a hash type to be used by skb_set_hash\n **/\n-static inline enum pkt_hash_types i40e_ptype_to_hash(u8 ptype)\n+static inline enum pkt_hash_types i40e_ptype_to_htype(u8 ptype)\n {\n \tstruct i40e_rx_ptype_decoded decoded = decode_rx_desc_ptype(ptype);\n \n@@ -928,6 +909,30 @@ static inline enum pkt_hash_types i40e_ptype_to_hash(u8 ptype)\n }\n \n /**\n+ * i40e_rx_hash - set the hash value in the skb\n+ * @ring: descriptor ring\n+ * @rx_desc: specific descriptor\n+ **/\n+static inline void i40e_rx_hash(struct i40e_ring *ring,\n+\t\t\t\tunion i40e_rx_desc *rx_desc,\n+\t\t\t\tstruct sk_buff *skb,\n+\t\t\t\tu8 rx_ptype)\n+{\n+\tu32 hash;\n+\tconst __le64 rss_mask =\n+\t\tcpu_to_le64((u64)I40E_RX_DESC_FLTSTAT_RSS_HASH <<\n+\t\t\t I40E_RX_DESC_STATUS_FLTSTAT_SHIFT);\n+\n+\tif (ring->netdev->features & NETIF_F_RXHASH)\n+\t\treturn;\n+\n+\tif ((rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask) {\n+\t\thash = le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);\n+\t\tskb_set_hash(skb, hash, i40e_ptype_to_htype(rx_ptype));\n+\t}\n+}\n+\n+/**\n * i40e_clean_rx_irq_ps - Reclaim resources after receive; packet split\n * @rx_ring: rx ring to clean\n * @budget: how many cleans we're allowed\n@@ -1068,8 +1073,8 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tskb_set_hash(skb, i40e_rx_hash(rx_ring, rx_desc),\n-\t\t\t i40e_ptype_to_hash(rx_ptype));\n+\t\ti40e_rx_hash(rx_ring, rx_desc, skb, rx_ptype);\n+\n \t\t/* probably a little skewed due to removing CRC */\n \t\ttotal_rx_bytes += skb->len;\n \t\ttotal_rx_packets++;\n@@ -1185,8 +1190,7 @@ static int i40e_clean_rx_irq_1buf(struct i40e_ring *rx_ring, int budget)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tskb_set_hash(skb, i40e_rx_hash(rx_ring, rx_desc),\n-\t\t\t i40e_ptype_to_hash(rx_ptype));\n+\t\ti40e_rx_hash(rx_ring, rx_desc, skb, rx_ptype);\n \t\t/* probably a little skewed due to removing CRC */\n \t\ttotal_rx_bytes += skb->len;\n \t\ttotal_rx_packets++;\n", "prefixes": [ "next", "S23", "01/13" ] }