Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/620117/?format=api
{ "id": 620117, "url": "http://patchwork.ozlabs.org/api/patches/620117/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1462786062-7572-2-git-send-email-gangfeng.huang@ni.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": "<1462786062-7572-2-git-send-email-gangfeng.huang@ni.com>", "list_archive_url": null, "date": "2016-05-09T09:27:39", "name": "[net-next,v5,1/4] igb: add support of RX network flow classification", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "2a48923b52e6bdc5bd3b423e1986f4b41704115b", "submitter": { "id": 67513, "url": "http://patchwork.ozlabs.org/api/people/67513/?format=api", "name": "Gangfeng Huang", "email": "gangfeng.huang@ni.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/1462786062-7572-2-git-send-email-gangfeng.huang@ni.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/620117/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/620117/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 3r3XWD74Xyz9t8R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 10 May 2016 05:29:12 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D922186F1B;\n\tMon, 9 May 2016 19:29:11 +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 H9zLL3I3aOIn; Mon, 9 May 2016 19:29:10 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id ADE848954E;\n\tMon, 9 May 2016 19:29:10 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id C66A01CEE10\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 May 2016 09:27:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C19A22EA6B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 May 2016 09:27:50 +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 vkyZ6Nwy8WiX for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 May 2016 09:27:49 +0000 (UTC)", "from ni.com (skprod2.natinst.com [130.164.80.23])\n\tby silver.osuosl.org (Postfix) with ESMTPS id B6D9125034\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 May 2016 09:27:49 +0000 (UTC)", "from us-aus-mgwout1.amer.corp.natinst.com\n\t(nb-snip2-1338.natinst.com [130.164.19.135])\n\tby us-aus-skprod2.natinst.com (8.15.0.59/8.15.0.59) with ESMTP id\n\tu499RmV0019653\n\tfor <intel-wired-lan@lists.osuosl.org>; Mon, 9 May 2016 04:27:48 -0500", "from ni.com ([130.164.14.198])\n\tby us-aus-mgwout1.amer.corp.natinst.com (Lotus Domino Release\n\t8.5.3FP6 HF1218) with ESMTP id 2016050904270258-835959 ;\n\tMon, 9 May 2016 04:27:02 -0500 " ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Gangfeng <gangfeng.huang@ni.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 9 May 2016 17:27:39 +0800", "Message-Id": "<1462786062-7572-2-git-send-email-gangfeng.huang@ni.com>", "X-Mailer": "git-send-email 2.7.2", "In-Reply-To": "<1462786062-7572-1-git-send-email-gangfeng.huang@ni.com>", "References": "<1462786062-7572-1-git-send-email-gangfeng.huang@ni.com>", "X-MIMETrack": "Itemize by SMTP Server on US-AUS-MGWOut1/AUS/H/NIC(Release\n\t8.5.3FP6 HF1218|December 12, 2014) at 05/09/2016 04:27:03 AM,\n\tSerialize by Router on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6\n\tHF1218|December 12, 2014) at 05/09/2016 04:27:03 AM,\n\tSerialize complete at 05/09/2016 04:27:03 AM", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2016-05-09_04:, , signatures=0", "X-Mailman-Approved-At": "Mon, 09 May 2016 19:29:10 +0000", "Cc": "Gangfeng Huang <gangfeng.huang@ni.com>, Ruhao Gao <ruhao.gao@ni.com>", "Subject": "[Intel-wired-lan] [PATCH net-next v5 1/4] igb: add support of RX\n\tnetwork flow classification", "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: Gangfeng Huang <gangfeng.huang@ni.com>\n\nThis patch is meant to allow for RX network flow classification to insert\nand remove Rx filter by ethtool. Ethtool interface has it's own rules\nmanager\n\nShow all filters:\n$ ethtool -n eth0\n4 RX rings available\nTotal 2 rules\n\nSigned-off-by: Ruhao Gao <ruhao.gao@ni.com>\nSigned-off-by: Gangfeng Huang <gangfeng.huang@ni.com>\n---\n drivers/net/ethernet/intel/igb/igb.h | 32 +++++\n drivers/net/ethernet/intel/igb/igb_ethtool.c | 193 +++++++++++++++++++++++++++\n drivers/net/ethernet/intel/igb/igb_main.c | 44 ++++++\n 3 files changed, 269 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex b9609af..cdc214c 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -355,6 +355,27 @@ struct hwmon_buff {\n #define IGB_N_SDP\t4\n #define IGB_RETA_SIZE\t128\n \n+enum igb_filter_match_flags {\n+\tIGB_FILTER_FLAG_NONE = 0x0,\n+};\n+\n+#define IGB_MAX_RXNFC_FILTERS 16\n+\n+/* RX network flow classification data structure */\n+struct igb_nfc_input {\n+\t/* Byte layout in order, all values with MSB first:\n+\t* match_flags - 1 byte\n+\t*/\n+\tu8 match_flags;\n+};\n+\n+struct igb_nfc_filter {\n+\tstruct hlist_node nfc_node;\n+\tstruct igb_nfc_input filter;\n+\tu16 sw_idx;\n+\tu16 action;\n+};\n+\n /* board specific private data structure */\n struct igb_adapter {\n \tunsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];\n@@ -472,6 +493,12 @@ struct igb_adapter {\n \tint copper_tries;\n \tstruct e1000_info ei;\n \tu16 eee_advert;\n+\n+\t/* RX network flow classification support */\n+\tstruct hlist_head nfc_filter_list;\n+\tunsigned int nfc_filter_count;\n+\t/* lock for RX network flow classification filter */\n+\tspinlock_t nfc_lock;\n };\n \n #define IGB_FLAG_HAS_MSI\t\tBIT(0)\n@@ -594,4 +621,9 @@ static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)\n \treturn netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);\n }\n \n+int igb_add_filter(struct igb_adapter *adapter,\n+\t\t struct igb_nfc_filter *input);\n+int igb_erase_filter(struct igb_adapter *adapter,\n+\t\t struct igb_nfc_filter *input);\n+\n #endif /* _IGB_H_ */\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c\nindex 64e91c5..2599826 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c\n@@ -2431,6 +2431,48 @@ static int igb_get_ts_info(struct net_device *dev,\n \t}\n }\n \n+static int igb_get_ethtool_nfc_entry(struct igb_adapter *adapter,\n+\t\t\t\t struct ethtool_rxnfc *cmd)\n+{\n+\tstruct ethtool_rx_flow_spec *fsp = &cmd->fs;\n+\tstruct igb_nfc_filter *rule = NULL;\n+\n+\t/* report total rule count */\n+\tcmd->data = IGB_MAX_RXNFC_FILTERS;\n+\n+\thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node) {\n+\t\tif (fsp->location <= rule->sw_idx)\n+\t\t\tbreak;\n+\t}\n+\n+\tif (!rule || fsp->location != rule->sw_idx)\n+\t\treturn -EINVAL;\n+\n+\treturn -EINVAL;\n+}\n+\n+static int igb_get_ethtool_nfc_all(struct igb_adapter *adapter,\n+\t\t\t\t struct ethtool_rxnfc *cmd,\n+\t\t\t\t u32 *rule_locs)\n+{\n+\tstruct igb_nfc_filter *rule;\n+\tint cnt = 0;\n+\n+\t/* report total rule count */\n+\tcmd->data = IGB_MAX_RXNFC_FILTERS;\n+\n+\thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node) {\n+\t\tif (cnt == cmd->rule_cnt)\n+\t\t\treturn -EMSGSIZE;\n+\t\trule_locs[cnt] = rule->sw_idx;\n+\t\tcnt++;\n+\t}\n+\n+\tcmd->rule_cnt = cnt;\n+\n+\treturn 0;\n+}\n+\n static int igb_get_rss_hash_opts(struct igb_adapter *adapter,\n \t\t\t\t struct ethtool_rxnfc *cmd)\n {\n@@ -2484,6 +2526,16 @@ static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,\n \t\tcmd->data = adapter->num_rx_queues;\n \t\tret = 0;\n \t\tbreak;\n+\tcase ETHTOOL_GRXCLSRLCNT:\n+\t\tcmd->rule_cnt = adapter->nfc_filter_count;\n+\t\tret = 0;\n+\t\tbreak;\n+\tcase ETHTOOL_GRXCLSRULE:\n+\t\tret = igb_get_ethtool_nfc_entry(adapter, cmd);\n+\t\tbreak;\n+\tcase ETHTOOL_GRXCLSRLALL:\n+\t\tret = igb_get_ethtool_nfc_all(adapter, cmd, rule_locs);\n+\t\tbreak;\n \tcase ETHTOOL_GRXFH:\n \t\tret = igb_get_rss_hash_opts(adapter, cmd);\n \t\tbreak;\n@@ -2598,6 +2650,142 @@ static int igb_set_rss_hash_opt(struct igb_adapter *adapter,\n \treturn 0;\n }\n \n+int igb_add_filter(struct igb_adapter *adapter, struct igb_nfc_filter *input)\n+{\n+\treturn -EINVAL;\n+}\n+\n+int igb_erase_filter(struct igb_adapter *adapter, struct igb_nfc_filter *input)\n+{\n+\treturn 0;\n+}\n+\n+static int igb_update_ethtool_nfc_entry(struct igb_adapter *adapter,\n+\t\t\t\t\tstruct igb_nfc_filter *input,\n+\t\t\t\t\tu16 sw_idx)\n+{\n+\tstruct igb_nfc_filter *rule, *parent;\n+\tint err = -EINVAL;\n+\n+\tparent = NULL;\n+\trule = NULL;\n+\n+\thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node) {\n+\t\t/* hash found, or no matching entry */\n+\t\tif (rule->sw_idx >= sw_idx)\n+\t\t\tbreak;\n+\t\tparent = rule;\n+\t}\n+\n+\t/* if there is an old rule occupying our place remove it */\n+\tif (rule && (rule->sw_idx == sw_idx)) {\n+\t\tif (!input)\n+\t\t\terr = igb_erase_filter(adapter, rule);\n+\n+\t\thlist_del(&rule->nfc_node);\n+\t\tkfree(rule);\n+\t\tadapter->nfc_filter_count--;\n+\t}\n+\n+\t/* If no input this was a delete, err should be 0 if a rule was\n+\t * successfully found and removed from the list else -EINVAL\n+\t */\n+\tif (!input)\n+\t\treturn err;\n+\n+\t/* initialize node */\n+\tINIT_HLIST_NODE(&input->nfc_node);\n+\n+\t/* add filter to the list */\n+\tif (parent)\n+\t\thlist_add_behind(&parent->nfc_node, &input->nfc_node);\n+\telse\n+\t\thlist_add_head(&input->nfc_node, &adapter->nfc_filter_list);\n+\n+\t/* update counts */\n+\tadapter->nfc_filter_count++;\n+\n+\treturn 0;\n+}\n+\n+static int igb_add_ethtool_nfc_entry(struct igb_adapter *adapter,\n+\t\t\t\t struct ethtool_rxnfc *cmd)\n+{\n+\tstruct net_device *netdev = adapter->netdev;\n+\tstruct ethtool_rx_flow_spec *fsp =\n+\t\t(struct ethtool_rx_flow_spec *)&cmd->fs;\n+\tstruct igb_nfc_filter *input, *rule;\n+\tint err = 0;\n+\n+\tif (!(netdev->hw_features & NETIF_F_NTUPLE))\n+\t\treturn -ENOTSUPP;\n+\n+\t/* Don't allow programming if the action is a queue greater than\n+\t * the number of online Rx queues.\n+\t */\n+\tif ((fsp->ring_cookie == RX_CLS_FLOW_DISC) ||\n+\t (fsp->ring_cookie >= adapter->num_rx_queues)) {\n+\t\tdev_err(&adapter->pdev->dev, \"ethtool -N: The specified action is invalid\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Don't allow indexes to exist outside of available space */\n+\tif (fsp->location >= IGB_MAX_RXNFC_FILTERS) {\n+\t\tdev_err(&adapter->pdev->dev, \"Location out of range\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif ((fsp->flow_type & ~FLOW_EXT) != ETHER_FLOW)\n+\t\treturn -EINVAL;\n+\n+\tinput = kzalloc(sizeof(*input), GFP_KERNEL);\n+\tif (!input)\n+\t\treturn -ENOMEM;\n+\n+\tinput->action = fsp->ring_cookie;\n+\tinput->sw_idx = fsp->location;\n+\n+\tspin_lock(&adapter->nfc_lock);\n+\n+\thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node) {\n+\t\tif (!memcmp(&input->filter, &rule->filter,\n+\t\t\t sizeof(input->filter))) {\n+\t\t\terr = -EEXIST;\n+\t\t\tdev_err(&adapter->pdev->dev,\n+\t\t\t\t\"ethtool: this filter is already set\\n\");\n+\t\t\tgoto err_out_w_lock;\n+\t\t}\n+\t}\n+\n+\terr = igb_add_filter(adapter, input);\n+\tif (err)\n+\t\tgoto err_out_w_lock;\n+\n+\tigb_update_ethtool_nfc_entry(adapter, input, input->sw_idx);\n+\n+\tspin_unlock(&adapter->nfc_lock);\n+\treturn 0;\n+\n+err_out_w_lock:\n+\tspin_unlock(&adapter->nfc_lock);\n+\tkfree(input);\n+\treturn err;\n+}\n+\n+static int igb_del_ethtool_nfc_entry(struct igb_adapter *adapter,\n+\t\t\t\t struct ethtool_rxnfc *cmd)\n+{\n+\tstruct ethtool_rx_flow_spec *fsp =\n+\t\t(struct ethtool_rx_flow_spec *)&cmd->fs;\n+\tint err;\n+\n+\tspin_lock(&adapter->nfc_lock);\n+\terr = igb_update_ethtool_nfc_entry(adapter, NULL, fsp->location);\n+\tspin_unlock(&adapter->nfc_lock);\n+\n+\treturn err;\n+}\n+\n static int igb_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)\n {\n \tstruct igb_adapter *adapter = netdev_priv(dev);\n@@ -2607,6 +2795,11 @@ static int igb_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)\n \tcase ETHTOOL_SRXFH:\n \t\tret = igb_set_rss_hash_opt(adapter, cmd);\n \t\tbreak;\n+\tcase ETHTOOL_SRXCLSRLINS:\n+\t\tret = igb_add_ethtool_nfc_entry(adapter, cmd);\n+\t\tbreak;\n+\tcase ETHTOOL_SRXCLSRLDEL:\n+\t\tret = igb_del_ethtool_nfc_entry(adapter, cmd);\n \tdefault:\n \t\tbreak;\n \t}\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 2172769..18acf06 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -176,6 +176,8 @@ static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,\n static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,\n \t\t\t\t struct ifla_vf_info *ivi);\n static void igb_check_vf_rate_limit(struct igb_adapter *);\n+static void igb_nfc_filter_exit(struct igb_adapter *adapter);\n+static void igb_nfc_filter_restore(struct igb_adapter *adapter);\n \n #ifdef CONFIG_PCI_IOV\n static int igb_vf_configure(struct igb_adapter *adapter, int vf);\n@@ -1611,6 +1613,7 @@ static void igb_configure(struct igb_adapter *adapter)\n \tigb_setup_mrqc(adapter);\n \tigb_setup_rctl(adapter);\n \n+\tigb_nfc_filter_restore(adapter);\n \tigb_configure_tx(adapter);\n \tigb_configure_rx(adapter);\n \n@@ -2058,6 +2061,21 @@ static int igb_set_features(struct net_device *netdev,\n \tif (!(changed & (NETIF_F_RXALL | NETIF_F_NTUPLE)))\n \t\treturn 0;\n \n+\tif (!(features & NETIF_F_NTUPLE)) {\n+\t\tstruct hlist_node *node2;\n+\t\tstruct igb_nfc_filter *rule;\n+\n+\t\tspin_lock(&adapter->nfc_lock);\n+\t\thlist_for_each_entry_safe(rule, node2,\n+\t\t\t\t\t &adapter->nfc_filter_list, nfc_node) {\n+\t\t\tigb_erase_filter(adapter, rule);\n+\t\t\thlist_del(&rule->nfc_node);\n+\t\t\tkfree(rule);\n+\t\t}\n+\t\tspin_unlock(&adapter->nfc_lock);\n+\t\tadapter->nfc_filter_count = 0;\n+\t}\n+\n \tnetdev->features = features;\n \n \tif (netif_running(netdev))\n@@ -3243,6 +3261,8 @@ static int __igb_close(struct net_device *netdev, bool suspending)\n \tigb_down(adapter);\n \tigb_free_irq(adapter);\n \n+\tigb_nfc_filter_exit(adapter);\n+\n \tigb_free_all_tx_resources(adapter);\n \tigb_free_all_rx_resources(adapter);\n \n@@ -8306,4 +8326,28 @@ int igb_reinit_queues(struct igb_adapter *adapter)\n \n \treturn err;\n }\n+\n+static void igb_nfc_filter_exit(struct igb_adapter *adapter)\n+{\n+\tstruct igb_nfc_filter *rule;\n+\n+\tspin_lock(&adapter->nfc_lock);\n+\n+\thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node)\n+\t\tigb_erase_filter(adapter, rule);\n+\n+\tspin_unlock(&adapter->nfc_lock);\n+}\n+\n+static void igb_nfc_filter_restore(struct igb_adapter *adapter)\n+{\n+\tstruct igb_nfc_filter *rule;\n+\n+\tspin_lock(&adapter->nfc_lock);\n+\n+\thlist_for_each_entry(rule, &adapter->nfc_filter_list, nfc_node)\n+\t\tigb_add_filter(adapter, rule);\n+\n+\tspin_unlock(&adapter->nfc_lock);\n+}\n /* igb_main.c */\n", "prefixes": [ "net-next", "v5", "1/4" ] }