Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/571387/?format=api
{ "id": 571387, "url": "http://patchwork.ozlabs.org/api/patches/571387/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1453420954-23011-1-git-send-email-jesse.brandeburg@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": "<1453420954-23011-1-git-send-email-jesse.brandeburg@intel.com>", "list_archive_url": null, "date": "2016-01-22T00:02:34", "name": "[next,S23,06/13,v3] i40e/i40evf: tunnels can be generic", "commit_ref": null, "pull_url": null, "state": "deferred", "archived": false, "hash": "a541373b94c795d34bb20fc356db96ccbdea9c16", "submitter": { "id": 189, "url": "http://patchwork.ozlabs.org/api/people/189/?format=api", "name": "Jesse Brandeburg", "email": "jesse.brandeburg@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/1453420954-23011-1-git-send-email-jesse.brandeburg@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/571387/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/571387/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 9BBE21402D9\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 22 Jan 2016 11:05:37 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7578C8B53F;\n\tFri, 22 Jan 2016 00:05:36 +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 Gs-LL_4QY3-A; Fri, 22 Jan 2016 00:05:35 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B494F8B3E0;\n\tFri, 22 Jan 2016 00:05:35 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2FDD61C0F70\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Jan 2016 00:05:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E85F78BEF7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Jan 2016 00:05:33 +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 YSAiex3wmu+d for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Jan 2016 00:05:32 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D2F268BEE5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Jan 2016 00:05:32 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga103.fm.intel.com with ESMTP; 21 Jan 2016 16:05:23 -0800", "from jbrandeb-hsm2.jf.intel.com ([134.134.3.108])\n\tby orsmga001.jf.intel.com with ESMTP; 21 Jan 2016 16:05:22 -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.22,327,1449561600\"; d=\"scan'208\";a=\"865811703\"", "From": "Jesse Brandeburg <jesse.brandeburg@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 21 Jan 2016 16:02:34 -0800", "Message-Id": "<1453420954-23011-1-git-send-email-jesse.brandeburg@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [next PATCH S23 06/13 v3] i40e/i40evf: tunnels\n\tcan be generic", "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": "Since the i40e driver now supports VxLAN, GRE, and soon\nto be Geneve tunnels, the driver can just note that an skb\ncontains a tunneled packet generically, instead of calling\nout VXLAN specifically. The tunnel set up we do for hardware\nis almost always the same for all tunnel types.\n\nThis specifically enables ATR/Flow Director on GRE packets\nwhich increases performance/scaling. Without this patch\nGRE RX packets end up on a random RSS assigned queue.\n\nReported-by: Alexander Duyck <alexander.duyck@gmail.com>\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: Ie8e205603654910d2f718592cbef8132ae0719e4\n\n---\nTesting Hints:\nTest tunnelled traffic, specifically also test VxLAN and other tunnel\ntypes to make sure that ATR counters are still counting when doing\nIPv4/TCP traffic over the tunnel.\n\n---\nv2: Fix code error found by Alex, by repairing if/else clause\n for tunnel.\n\nv3: remove extra parens\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 +++++++------\n drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +-\n drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 2 +-\n 4 files changed, 10 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 720516b..1831ff0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2005,7 +2005,10 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \tif (!(tx_flags & (I40E_TX_FLAGS_IPV4 | I40E_TX_FLAGS_IPV6)))\n \t\treturn;\n \n-\tif (!(tx_flags & I40E_TX_FLAGS_UDP_TUNNEL)) {\n+\tif (tx_flags & I40E_TX_FLAGS_TUNNEL) {\n+\t\thdr.network = skb_inner_network_header(skb);\n+\t\thlen = skb_inner_network_header_len(skb);\n+\t} else {\n \t\t/* snag network header to get L4 type and address */\n \t\thdr.network = skb_network_header(skb);\n \n@@ -2018,9 +2021,6 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\t\thlen = sizeof(struct ipv6hdr);\n \t\telse\n \t\t\treturn;\n-\t} else {\n-\t\thdr.network = skb_inner_network_header(skb);\n-\t\thlen = skb_inner_network_header_len(skb);\n \t}\n \n \t/* Currently only IPv4/IPv6 with TCP is supported\n@@ -2090,7 +2090,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\t I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT;\n \n \tdtype_cmd |= I40E_TXD_FLTR_QW1_CNT_ENA_MASK;\n-\tif (!(tx_flags & I40E_TX_FLAGS_UDP_TUNNEL))\n+\tif (!(tx_flags & I40E_TX_FLAGS_TUNNEL))\n \t\tdtype_cmd |=\n \t\t\t((u32)I40E_FD_ATR_STAT_IDX(pf->hw.pf_id) <<\n \t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &\n@@ -2323,10 +2323,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\toudph = udp_hdr(skb);\n \t\t\toiph = ip_hdr(skb);\n \t\t\tl4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;\n-\t\t\t*tx_flags |= I40E_TX_FLAGS_UDP_TUNNEL;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_TUNNEL;\n \t\t\tbreak;\n \t\tcase IPPROTO_GRE:\n \t\t\tl4_tunnel = I40E_TXD_CTX_GRE_TUNNELING;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_TUNNEL;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\treturn;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex 3f081e2..1d167b6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -163,7 +163,7 @@ enum i40e_dyn_idx_t {\n #define I40E_TX_FLAGS_FSO\t\tBIT(7)\n #define I40E_TX_FLAGS_TSYN\t\tBIT(8)\n #define I40E_TX_FLAGS_FD_SB\t\tBIT(9)\n-#define I40E_TX_FLAGS_UDP_TUNNEL\tBIT(10)\n+#define I40E_TX_FLAGS_TUNNEL\t\tBIT(10)\n #define I40E_TX_FLAGS_VLAN_MASK\t\t0xffff0000\n #define I40E_TX_FLAGS_VLAN_PRIO_MASK\t0xe0000000\n #define I40E_TX_FLAGS_VLAN_PRIO_SHIFT\t29\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 7a00657..ed4934a 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1521,7 +1521,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\toudph = udp_hdr(skb);\n \t\t\toiph = ip_hdr(skb);\n \t\t\tl4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;\n-\t\t\t*tx_flags |= I40E_TX_FLAGS_VXLAN_TUNNEL;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_TUNNEL;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\treturn;\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\nindex e29bb3e..d7950b1 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n@@ -162,7 +162,7 @@ enum i40e_dyn_idx_t {\n #define I40E_TX_FLAGS_FCCRC\t\tBIT(6)\n #define I40E_TX_FLAGS_FSO\t\tBIT(7)\n #define I40E_TX_FLAGS_FD_SB\t\tBIT(9)\n-#define I40E_TX_FLAGS_VXLAN_TUNNEL\tBIT(10)\n+#define I40E_TX_FLAGS_TUNNEL\t\tBIT(10)\n #define I40E_TX_FLAGS_VLAN_MASK\t\t0xffff0000\n #define I40E_TX_FLAGS_VLAN_PRIO_MASK\t0xe0000000\n #define I40E_TX_FLAGS_VLAN_PRIO_SHIFT\t29\n", "prefixes": [ "next", "S23", "06/13", "v3" ] }