Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/889177/?format=api
{ "id": 889177, "url": "http://patchwork.ozlabs.org/api/patches/889177/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180322003353.29970-10-vinicius.gomes@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": "<20180322003353.29970-10-vinicius.gomes@intel.com>", "list_archive_url": null, "date": "2018-03-22T00:33:53", "name": "[next-queue,v5,9/9] igb: Add support for adding offloaded clsflower filters", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "8ab85c07d669cc089445aa316c83055ed7e89762", "submitter": { "id": 72272, "url": "http://patchwork.ozlabs.org/api/people/72272/?format=api", "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@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/20180322003353.29970-10-vinicius.gomes@intel.com/mbox/", "series": [ { "id": 35168, "url": "http://patchwork.ozlabs.org/api/series/35168/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=35168", "date": "2018-03-22T00:33:44", "name": "igb: offloading of receive filters", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/35168/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/889177/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/889177/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 40673k4fXTz9s37\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 22 Mar 2018 11:34:58 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 03A9D8980F;\n\tThu, 22 Mar 2018 00:34:57 +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 O4RDm28eMOrw; Thu, 22 Mar 2018 00:34:54 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E11FB89CCA;\n\tThu, 22 Mar 2018 00:34:53 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 41E0B1C0AF7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 00:34:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3F08187BCB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 00:34:51 +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 6CgLpk-f2KRm for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 00:34:49 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 75CA087C1E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 00:34:49 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t21 Mar 2018 17:34:48 -0700", "from ellie.jf.intel.com (HELO localhost.localdomain)\n\t([10.54.70.23])\n\tby orsmga006.jf.intel.com with ESMTP; 21 Mar 2018 17:34:48 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.48,341,1517904000\"; d=\"scan'208\";a=\"27785579\"", "From": "Vinicius Costa Gomes <vinicius.gomes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 21 Mar 2018 17:33:53 -0700", "Message-Id": "<20180322003353.29970-10-vinicius.gomes@intel.com>", "X-Mailer": "git-send-email 2.16.2", "In-Reply-To": "<20180322003353.29970-1-vinicius.gomes@intel.com>", "References": "<20180322003353.29970-1-vinicius.gomes@intel.com>", "Subject": "[Intel-wired-lan] [next-queue PATCH v5 9/9] igb: Add support for\n\tadding offloaded clsflower filters", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "netdev@vger.kernel.org, jesus.sanchez-palencia@intel.com", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This allows filters added by tc-flower and specifying MAC addresses,\nEthernet types, and the VLAN priority field, to be offloaded to the\ncontroller.\n\nThis reuses most of the infrastructure used by ethtool, but clsflower\nfilters are kept in a separated list, so they are invisible to\nethtool.\n\nSigned-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>\n---\n drivers/net/ethernet/intel/igb/igb.h | 2 +\n drivers/net/ethernet/intel/igb/igb_main.c | 188 +++++++++++++++++++++++++++++-\n 2 files changed, 188 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex 66165879f12b..adfef068e866 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -464,6 +464,7 @@ struct igb_nfc_input {\n struct igb_nfc_filter {\n \tstruct hlist_node nfc_node;\n \tstruct igb_nfc_input filter;\n+\tunsigned long cookie;\n \tu16 etype_reg_index;\n \tu16 sw_idx;\n \tu16 action;\n@@ -603,6 +604,7 @@ struct igb_adapter {\n \n \t/* RX network flow classification support */\n \tstruct hlist_head nfc_filter_list;\n+\tstruct hlist_head cls_flower_list;\n \tunsigned int nfc_filter_count;\n \t/* lock for RX network flow classification filter */\n \tspinlock_t nfc_lock;\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 150231e4db9d..cc580b17dab3 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -2498,16 +2498,197 @@ static int igb_offload_cbs(struct igb_adapter *adapter,\n \treturn 0;\n }\n \n+#define ETHER_TYPE_FULL_MASK ((__force __be16)~0)\n+#define VLAN_PRIO_FULL_MASK (0x07)\n+\n+static int igb_parse_cls_flower(struct igb_adapter *adapter,\n+\t\t\t\tstruct tc_cls_flower_offload *f,\n+\t\t\t\tint traffic_class,\n+\t\t\t\tstruct igb_nfc_filter *input)\n+{\n+\tstruct netlink_ext_ack *extack = f->common.extack;\n+\n+\tif (f->dissector->used_keys &\n+\t ~(BIT(FLOW_DISSECTOR_KEY_BASIC) |\n+\t BIT(FLOW_DISSECTOR_KEY_CONTROL) |\n+\t BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |\n+\t BIT(FLOW_DISSECTOR_KEY_VLAN))) {\n+\t\tNL_SET_ERR_MSG_MOD(extack,\n+\t\t\t\t \"Unsupported key used, only BASIC, CONTROL, ETH_ADDRS and VLAN are supported\");\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+\n+\tif (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {\n+\t\tstruct flow_dissector_key_eth_addrs *key, *mask;\n+\n+\t\tkey = skb_flow_dissector_target(f->dissector,\n+\t\t\t\t\t\tFLOW_DISSECTOR_KEY_ETH_ADDRS,\n+\t\t\t\t\t\tf->key);\n+\t\tmask = skb_flow_dissector_target(f->dissector,\n+\t\t\t\t\t\t FLOW_DISSECTOR_KEY_ETH_ADDRS,\n+\t\t\t\t\t\t f->mask);\n+\n+\t\tif (!is_zero_ether_addr(mask->dst)) {\n+\t\t\tif (!is_broadcast_ether_addr(mask->dst)) {\n+\t\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Only full masks are supported for destination MAC address\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tinput->filter.match_flags |=\n+\t\t\t\tIGB_FILTER_FLAG_DST_MAC_ADDR;\n+\t\t\tether_addr_copy(input->filter.dst_addr, key->dst);\n+\t\t}\n+\n+\t\tif (!is_zero_ether_addr(mask->src)) {\n+\t\t\tif (!is_broadcast_ether_addr(mask->src)) {\n+\t\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Only full masks are supported for source MAC address\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tinput->filter.match_flags |=\n+\t\t\t\tIGB_FILTER_FLAG_SRC_MAC_ADDR;\n+\t\t\tether_addr_copy(input->filter.src_addr, key->src);\n+\t\t}\n+\t}\n+\n+\tif (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_BASIC)) {\n+\t\tstruct flow_dissector_key_basic *key, *mask;\n+\n+\t\tkey = skb_flow_dissector_target(f->dissector,\n+\t\t\t\t\t\tFLOW_DISSECTOR_KEY_BASIC,\n+\t\t\t\t\t\tf->key);\n+\t\tmask = skb_flow_dissector_target(f->dissector,\n+\t\t\t\t\t\t FLOW_DISSECTOR_KEY_BASIC,\n+\t\t\t\t\t\t f->mask);\n+\n+\t\tif (mask->n_proto) {\n+\t\t\tif (mask->n_proto != ETHER_TYPE_FULL_MASK) {\n+\t\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Only full mask is supported for EtherType filter\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tinput->filter.match_flags |= IGB_FILTER_FLAG_ETHER_TYPE;\n+\t\t\tinput->filter.etype = key->n_proto;\n+\t\t}\n+\t}\n+\n+\tif (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_VLAN)) {\n+\t\tstruct flow_dissector_key_vlan *key, *mask;\n+\n+\t\tkey = skb_flow_dissector_target(f->dissector,\n+\t\t\t\t\t\tFLOW_DISSECTOR_KEY_VLAN,\n+\t\t\t\t\t\tf->key);\n+\t\tmask = skb_flow_dissector_target(f->dissector,\n+\t\t\t\t\t\t FLOW_DISSECTOR_KEY_VLAN,\n+\t\t\t\t\t\t f->mask);\n+\n+\t\tif (mask->vlan_priority) {\n+\t\t\tif (mask->vlan_priority != VLAN_PRIO_FULL_MASK) {\n+\t\t\t\tNL_SET_ERR_MSG_MOD(extack, \"Only full mask is supported for VLAN priority\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tinput->filter.match_flags |= IGB_FILTER_FLAG_VLAN_TCI;\n+\t\t\tinput->filter.vlan_tci = key->vlan_priority;\n+\t\t}\n+\t}\n+\n+\tinput->action = traffic_class;\n+\tinput->cookie = f->cookie;\n+\n+\treturn 0;\n+}\n+\n static int igb_configure_clsflower(struct igb_adapter *adapter,\n \t\t\t\t struct tc_cls_flower_offload *cls_flower)\n {\n-\treturn -EOPNOTSUPP;\n+\tstruct netlink_ext_ack *extack = cls_flower->common.extack;\n+\tstruct igb_nfc_filter *filter, *f;\n+\tint err, tc;\n+\n+\ttc = tc_classid_to_hwtc(adapter->netdev, cls_flower->classid);\n+\tif (tc < 0) {\n+\t\tNL_SET_ERR_MSG_MOD(extack, \"Invalid traffic class\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfilter = kzalloc(sizeof(*filter), GFP_KERNEL);\n+\tif (!filter)\n+\t\treturn -ENOMEM;\n+\n+\terr = igb_parse_cls_flower(adapter, cls_flower, tc, filter);\n+\tif (err < 0)\n+\t\tgoto err_parse;\n+\n+\tspin_lock(&adapter->nfc_lock);\n+\n+\thlist_for_each_entry(f, &adapter->nfc_filter_list, nfc_node) {\n+\t\tif (!memcmp(&f->filter, &filter->filter, sizeof(f->filter))) {\n+\t\t\terr = -EEXIST;\n+\t\t\tNL_SET_ERR_MSG_MOD(extack,\n+\t\t\t\t\t \"This filter is already set in ethtool\");\n+\t\t\tgoto err_locked;\n+\t\t}\n+\t}\n+\n+\thlist_for_each_entry(f, &adapter->cls_flower_list, nfc_node) {\n+\t\tif (!memcmp(&f->filter, &filter->filter, sizeof(f->filter))) {\n+\t\t\terr = -EEXIST;\n+\t\t\tNL_SET_ERR_MSG_MOD(extack,\n+\t\t\t\t\t \"This filter is already set in cls_flower\");\n+\t\t\tgoto err_locked;\n+\t\t}\n+\t}\n+\n+\terr = igb_add_filter(adapter, filter);\n+\tif (err < 0) {\n+\t\tNL_SET_ERR_MSG_MOD(extack, \"Could not add filter to the adapter\");\n+\t\tgoto err_locked;\n+\t}\n+\n+\thlist_add_head(&filter->nfc_node, &adapter->cls_flower_list);\n+\n+\tspin_unlock(&adapter->nfc_lock);\n+\n+\treturn 0;\n+\n+err_locked:\n+\tspin_unlock(&adapter->nfc_lock);\n+\n+err_parse:\n+\tkfree(filter);\n+\n+\treturn err;\n }\n \n static int igb_delete_clsflower(struct igb_adapter *adapter,\n \t\t\t\tstruct tc_cls_flower_offload *cls_flower)\n {\n-\treturn -EOPNOTSUPP;\n+\tstruct igb_nfc_filter *filter;\n+\tint err;\n+\n+\tspin_lock(&adapter->nfc_lock);\n+\n+\thlist_for_each_entry(filter, &adapter->cls_flower_list, nfc_node)\n+\t\tif (filter->cookie == cls_flower->cookie)\n+\t\t\tbreak;\n+\n+\tif (!filter) {\n+\t\terr = -ENOENT;\n+\t\tgoto out;\n+\t}\n+\n+\terr = igb_erase_filter(adapter, filter);\n+\tif (err < 0)\n+\t\tgoto out;\n+\n+\thlist_del(&filter->nfc_node);\n+\tkfree(filter);\n+\n+out:\n+\tspin_unlock(&adapter->nfc_lock);\n+\n+\treturn err;\n }\n \n static int igb_setup_tc_cls_flower(struct igb_adapter *adapter,\n@@ -9320,6 +9501,9 @@ static void igb_nfc_filter_exit(struct igb_adapter *adapter)\n \thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node)\n \t\tigb_erase_filter(adapter, rule);\n \n+\thlist_for_each_entry(rule, &adapter->cls_flower_list, nfc_node)\n+\t\tigb_erase_filter(adapter, rule);\n+\n \tspin_unlock(&adapter->nfc_lock);\n }\n \n", "prefixes": [ "next-queue", "v5", "9/9" ] }