Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/639897/?format=api
{ "id": 639897, "url": "http://patchwork.ozlabs.org/api/patches/639897/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160623205403.20327-3-jacob.e.keller@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": "<20160623205403.20327-3-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-06-23T20:54:03", "name": "[2/2] fm10k: add support for Rx offloads on one Geneve tunnel", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "07e8f09ef85f996a90a61c6fa681bd7b855da9ab", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20160623205403.20327-3-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/639897/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/639897/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3rbDGc6Mkmz9sBg\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 24 Jun 2016 06:54:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3A2B28B58F;\n\tThu, 23 Jun 2016 20:54:15 +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 7sU38oy+t4uD; Thu, 23 Jun 2016 20:54:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D342A8CDA5;\n\tThu, 23 Jun 2016 20:54:12 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id C48041CF6DB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jun 2016 20:54:09 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 886EDC0B98\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jun 2016 20:54:07 +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 61y74LNQMCmc for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jun 2016 20:54:05 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D6A13C0BCB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jun 2016 20:54:05 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP; 23 Jun 2016 13:54:05 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.116])\n\tby fmsmga004.fm.intel.com with ESMTP; 23 Jun 2016 13:54:05 -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.26,518,1459839600\"; d=\"scan'208\";a=\"127512098\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 23 Jun 2016 13:54:03 -0700", "Message-Id": "<20160623205403.20327-3-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.9.0.rc1.405.g81f467e", "In-Reply-To": "<20160623205403.20327-1-jacob.e.keller@intel.com>", "References": "<20160623205403.20327-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 2/2] fm10k: add support for Rx offloads on\n\tone Geneve tunnel", "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": "Similar to how we handle VXLAN offload, enable support for a single\nGeneve tunnel.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 1 +\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 30 ++++++++++++++++++++++---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 3 ++-\n drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 +\n 4 files changed, 31 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 209268a14712..67ff01aeb11a 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -335,6 +335,7 @@ struct fm10k_intfc {\n \n \t/* UDP encapsulation port tracking information */\n \tstruct list_head vxlan_port;\n+\tstruct list_head geneve_port;\n \n #ifdef CONFIG_DEBUG_FS\n \tstruct dentry *dbg_intfc;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 411933b02712..554dd22887dd 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -387,7 +387,7 @@ static void fm10k_request_glort_range(struct fm10k_intfc *interface)\n * fm10k_free_udp_port_info\n * @interface: board private structure\n *\n- * This function frees the entire vxlan_port list\n+ * This function frees both geneve_port and vxlan_port structures\n **/\n static void fm10k_free_udp_port_info(struct fm10k_intfc *interface)\n {\n@@ -403,6 +403,17 @@ static void fm10k_free_udp_port_info(struct fm10k_intfc *interface)\n \t\t\t\t\t\tstruct fm10k_udp_port,\n \t\t\t\t\t\tlist);\n \t}\n+\n+\t/* flush all entries from geneve list */\n+\tport = list_first_entry_or_null(&interface->geneve_port,\n+\t\t\t\t\tstruct fm10k_udp_port, list);\n+\twhile (port) {\n+\t\tlist_del(&port->list);\n+\t\tkfree(port);\n+\t\tport = list_first_entry_or_null(&interface->vxlan_port,\n+\t\t\t\t\t\tstruct fm10k_udp_port,\n+\t\t\t\t\t\tlist);\n+\t}\n }\n \n /**\n@@ -427,6 +438,13 @@ static void fm10k_restore_udp_port_info(struct fm10k_intfc *interface)\n \tfm10k_write_reg(hw, FM10K_TUNNEL_CFG,\n \t\t\t(port ? ntohs(port->port) : 0) |\n \t\t\t(ETH_P_TEB << FM10K_TUNNEL_CFG_NVGRE_SHIFT));\n+\n+\tport = list_first_entry_or_null(&interface->geneve_port,\n+\t\t\t\t\tstruct fm10k_udp_port, list);\n+\n+\t/* restore Geneve tunnel configuration register */\n+\tfm10k_write_reg(hw, FM10K_TUNNEL_CFG_GENEVE,\n+\t\t\t(port ? ntohs(port->port) : 0));\n }\n \n static struct fm10k_udp_port *\n@@ -472,8 +490,8 @@ static void fm10k_insert_tunnel_port(struct list_head *ports,\n * @ti: Tunnel endpoint information\n *\n * This function is called when a new UDP tunnel port has been added.\n- * Currently we only support VXLAN and only one port will actually be\n- * offloaded due to hardware restrictions.\n+ * Due to hardware restrictions, only one port per type can be offloaded at\n+ * once.\n **/\n static void fm10k_udp_tunnel_add(struct net_device *dev,\n \t\t\t\t struct udp_tunnel_info *ti)\n@@ -488,6 +506,9 @@ static void fm10k_udp_tunnel_add(struct net_device *dev,\n \tcase UDP_TUNNEL_TYPE_VXLAN:\n \t\tfm10k_insert_tunnel_port(&interface->vxlan_port, ti);\n \t\tbreak;\n+\tcase UDP_TUNNEL_TYPE_GENEVE:\n+\t\tfm10k_insert_tunnel_port(&interface->geneve_port, ti);\n+\t\tbreak;\n \tdefault:\n \t\treturn;\n \t}\n@@ -517,6 +538,9 @@ static void fm10k_udp_tunnel_del(struct net_device *dev,\n \tcase UDP_TUNNEL_TYPE_VXLAN:\n \t\tport = fm10k_remove_tunnel_port(&interface->vxlan_port, ti);\n \t\tbreak;\n+\tcase UDP_TUNNEL_TYPE_GENEVE:\n+\t\tport = fm10k_remove_tunnel_port(&interface->geneve_port, ti);\n+\t\tbreak;\n \tdefault:\n \t\treturn;\n \t}\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 0293eed5005b..4bb352e3039b 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -1835,8 +1835,9 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,\n \tinterface->tx_itr = FM10K_TX_ITR_DEFAULT;\n \tinterface->rx_itr = FM10K_ITR_ADAPTIVE | FM10K_RX_ITR_DEFAULT;\n \n-\t/* initialize vxlan_port list */\n+\t/* initialize udp port lists */\n \tINIT_LIST_HEAD(&interface->vxlan_port);\n+\tINIT_LIST_HEAD(&interface->geneve_port);\n \n \tnetdev_rss_key_fill(rss_key, sizeof(rss_key));\n \tmemcpy(interface->rssrk, rss_key, sizeof(rss_key));\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_type.h b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\nindex f4e75c498287..6bb16c13d9d6 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n@@ -154,6 +154,7 @@ struct fm10k_hw;\n #define FM10K_DGLORTDEC_INNERRSS_ENABLE\t\t0x08000000\n #define FM10K_TUNNEL_CFG\t0x0040\n #define FM10K_TUNNEL_CFG_NVGRE_SHIFT\t\t16\n+#define FM10K_TUNNEL_CFG_GENEVE\t0x0041\n #define FM10K_SWPRI_MAP(_n)\t((_n) + 0x0050)\n #define FM10K_SWPRI_MAX\t\t16\n #define FM10K_RSSRK(_n, _m)\t(((_n) * 0x10) + (_m) + 0x0800)\n", "prefixes": [ "2/2" ] }