Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512054/?format=api
{ "id": 512054, "url": "http://patchwork.ozlabs.org/api/patches/512054/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440798961-17326-15-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": "<1440798961-17326-15-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-28T21:56:00", "name": "[next,S13,14/15] i40e: fix ip-ip GRE encapulation", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "9ea04faf476e89ecee3b684db15e519ad7130325", "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/1440798961-17326-15-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512054/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512054/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 (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 2DBA714031B\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 29 Aug 2015 07:55:20 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 829D28B985;\n\tFri, 28 Aug 2015 21:55:19 +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 lybHqtnmtXYT; Fri, 28 Aug 2015 21:55:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6EC9B8B98A;\n\tFri, 28 Aug 2015 21:55:18 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 029B11CEB0B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id F32F195EBB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:11 +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 bNHD92Kbb40u for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:09 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5B96F95ECC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:09 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP; 28 Aug 2015 14:55:09 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 28 Aug 2015 14:55:09 -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.17,427,1437462000\"; d=\"scan'208\";a=\"634260337\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Aug 2015 17:56:00 -0400", "Message-Id": "<1440798961-17326-15-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1440798961-17326-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1440798961-17326-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S13 14/15] i40e: fix ip-ip GRE\n\tencapulation", "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\nThe i40e driver will soon be capable of offloading GRE traffic\nbut in the meantime, don't let the driver tell the OS that\nit can offload types of traffic it cannot.\n\nThis fixes a bug where if you stack a GRE MAC in IP tunnel\nover i40e, all TSO packets will be sent with invalid checksums\ncausing really bad throughput.\n\nNOTE: I still see some retransmits that are unexplained when\ntesting with vxlan or ip/mac tunnels (GRE) but the throughput\nis more like what is expected with multi-gigabit on a single\nflow.\n\nReported-by: Stefan Assman <sassman@redhat.com>\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: Ie31843b150695b2b1889e306b8c33c1d2da29a9e\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 36 ++++++++++++++++++++++++++---\n 1 file changed, 33 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 469e1d5..b686450 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -30,6 +30,7 @@\n #if defined(CONFIG_VXLAN) || defined(CONFIG_VXLAN_MODULE)\n #include <net/vxlan.h>\n #endif\n+#include <net/gre.h>\n \n const char i40e_driver_name[] = \"i40e\";\n static const char i40e_driver_string[] =\n@@ -8372,12 +8373,41 @@ static netdev_features_t i40e_features_check(struct sk_buff *skb,\n \t\t\t\t\t struct net_device *dev,\n \t\t\t\t\t netdev_features_t features)\n {\n-\tif (skb->encapsulation &&\n-\t (skb_inner_mac_header(skb) - skb_transport_header(skb) >\n-\t I40E_MAX_TUNNEL_HDR_LEN))\n+\tu8 protocol = 0;\n+\tint hlen;\n+\n+\tif (!skb->encapsulation)\n+\t\treturn features;\n+\n+\t/* prevent tunnel headers that are too long to offload from\n+\t * being sent to the hardware\n+\t */\n+\tif (skb_inner_mac_header(skb) - skb_transport_header(skb) >\n+\t I40E_MAX_TUNNEL_HDR_LEN)\n+\t\treturn features & ~(NETIF_F_ALL_CSUM | NETIF_F_GSO_MASK);\n+\n+\tswitch (vlan_get_protocol(skb)) {\n+\tcase htons(ETH_P_IP):\n+\t\tprotocol = ip_hdr(skb)->protocol;\n+\t\tbreak;\n+\tcase htons(ETH_P_IPV6):\n+\t\tprotocol = ipv6_hdr(skb)->nexthdr;\n+\t\tbreak;\n+\t}\n+\n+\thlen = skb_inner_mac_header(skb) - skb_transport_header(skb);\n+\tif ((protocol == IPPROTO_GRE) &&\n+\t (skb->inner_protocol_type != ENCAP_TYPE_ETHER ||\n+\t skb->inner_protocol != htons(ETH_P_TEB) ||\n+\t hlen < sizeof(struct gre_base_hdr) ||\n+\t hlen > (sizeof(struct gre_base_hdr) + 12)))\n \t\treturn features & ~(NETIF_F_ALL_CSUM | NETIF_F_GSO_MASK);\n \n+#if IS_ENABLED(CONFIG_VXLAN)\n+\treturn vxlan_features_check(skb, features);\n+#else\n \treturn features;\n+#endif\n }\n \n static const struct net_device_ops i40e_netdev_ops = {\n", "prefixes": [ "next", "S13", "14/15" ] }