Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536834/?format=api
{ "id": 536834, "url": "http://patchwork.ozlabs.org/api/patches/536834/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445976906-161903-2-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": "<1445976906-161903-2-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-27T20:15:06", "name": "[next,S20,v2,06/15] i40evf: create a generic config rss function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "dae8196024e3a4d41bfb17ca68d0883017eadbe9", "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/1445976906-161903-2-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536834/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536834/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 91E3714134E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 28 Oct 2015 07:15:57 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C56D526549;\n\tTue, 27 Oct 2015 20:15:56 +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 0JBlhzTf7VxO; Tue, 27 Oct 2015 20:15:54 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6C43032E8B;\n\tTue, 27 Oct 2015 20:15:54 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6699B1C16CE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 27 Oct 2015 20:15:53 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6066893D36\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 27 Oct 2015 20:15:53 +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 6Puss1rPIp93 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 27 Oct 2015 20:15:51 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B577A93D34\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 27 Oct 2015 20:15:51 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga103.jf.intel.com with ESMTP; 27 Oct 2015 13:15:51 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga001.jf.intel.com with ESMTP; 27 Oct 2015 13:15:51 -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.20,206,1444719600\"; d=\"scan'208\";a=\"804718618\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 27 Oct 2015 16:15:06 -0400", "Message-Id": "<1445976906-161903-2-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1445976906-161903-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1445976906-161903-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Helin Zhang <helin.zhang@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S20 v2 06/15] i40evf: create a\n\tgeneric config rss function", "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: Helin Zhang <helin.zhang@intel.com>\n\nThere are two ways to configure RSS, this patch adjusts those two\nfunctions with the same input parameters, and creates a more\ngeneric function for configuring RSS.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\nChange-ID: Iace73bdeba4831909979bef221011060ab327f71\n\n---\nv2: Fixed spelling\n\nTesting-hints: Test VFQF_HKEY and VFQF_HLUT registers are the same\nbefore and after and make sure that ethtool -x and ethtool -X still work\ncorrectly.\n drivers/net/ethernet/intel/i40evf/i40evf.h | 3 +\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 29 ++--\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 168 +++++++++++++--------\n 3 files changed, 130 insertions(+), 70 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex 22fc3d4..b5aa377 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -99,6 +99,7 @@ struct i40e_vsi {\n #define MAX_TX_QUEUES MAX_RX_QUEUES\n \n #define I40EVF_HKEY_ARRAY_SIZE ((I40E_VFQF_HKEY_MAX_INDEX + 1) * 4)\n+#define I40EVF_HLUT_ARRAY_SIZE ((I40E_VFQF_HLUT_MAX_INDEX + 1) * 4)\n \n /* MAX_MSIX_Q_VECTORS of these are allocated,\n * but we only use one per queue-specific vector.\n@@ -313,4 +314,6 @@ void i40evf_request_reset(struct i40evf_adapter *adapter);\n void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,\n \t\t\t\tenum i40e_virtchnl_ops v_opcode,\n \t\t\t\ti40e_status v_retval, u8 *msg, u16 msglen);\n+int i40evf_config_rss(struct i40e_vsi *vsi, const u8 *seed, u8 *lut,\n+\t\t u16 lut_size);\n #endif /* _I40EVF_H_ */\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\nindex 4790437..cf253df 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -668,9 +668,11 @@ static int i40evf_set_rxfh(struct net_device *netdev, const u32 *indir,\n \t\t\t const u8 *key, const u8 hfunc)\n {\n \tstruct i40evf_adapter *adapter = netdev_priv(netdev);\n-\tstruct i40e_hw *hw = &adapter->hw;\n-\tu32 hlut_val;\n-\tint i, j;\n+\tstruct i40e_vsi *vsi = &adapter->vsi;\n+\tu8 seed_def[I40EVF_HKEY_ARRAY_SIZE];\n+\tu8 *seed = NULL, *lut;\n+\tint ret;\n+\tu16 i;\n \n \t/* We do not allow change in unsupported parameters */\n \tif (key ||\n@@ -679,15 +681,22 @@ static int i40evf_set_rxfh(struct net_device *netdev, const u32 *indir,\n \tif (!indir)\n \t\treturn 0;\n \n-\tfor (i = 0, j = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++) {\n-\t\thlut_val = indir[j++];\n-\t\thlut_val |= indir[j++] << 8;\n-\t\thlut_val |= indir[j++] << 16;\n-\t\thlut_val |= indir[j++] << 24;\n-\t\twr32(hw, I40E_VFQF_HLUT(i), hlut_val);\n+\tif (key) {\n+\t\tmemcpy(seed_def, key, I40EVF_HKEY_ARRAY_SIZE);\n+\t\tseed = seed_def;\n \t}\n+\tlut = kzalloc(I40EVF_HLUT_ARRAY_SIZE, GFP_KERNEL);\n+\tif (!lut)\n+\t\treturn -ENOMEM;\n \n-\treturn 0;\n+\t/* Each 32 bits pointed by 'indir' is stored with a lut entry */\n+\tfor (i = 0; i < I40EVF_HLUT_ARRAY_SIZE; i++)\n+\t\tlut[i] = (u8)(indir[i]);\n+\n+\tret = i40evf_config_rss(vsi, seed, lut, I40EVF_HLUT_ARRAY_SIZE);\n+\tkfree(lut);\n+\n+\treturn ret;\n }\n \n static const struct ethtool_ops i40evf_ethtool_ops = {\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex a8f67d3..65d0e04 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -1211,110 +1211,158 @@ out:\n }\n \n /**\n- * i40e_configure_rss_aq - Prepare for RSS using AQ commands\n+ * i40e_config_rss_aq - Prepare for RSS using AQ commands\n * @vsi: vsi structure\n * @seed: RSS hash seed\n+ * @lut: Lookup table\n+ * @lut_size: Lookup table size\n+ *\n+ * Return 0 on success, negative on failure\n **/\n-static void i40evf_configure_rss_aq(struct i40e_vsi *vsi, const u8 *seed)\n+static int i40evf_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,\n+\t\t\t\tu8 *lut, u16 lut_size)\n {\n-\tstruct i40e_aqc_get_set_rss_key_data rss_key;\n \tstruct i40evf_adapter *adapter = vsi->back;\n \tstruct i40e_hw *hw = &adapter->hw;\n-\tint ret = 0, i;\n-\tu8 *rss_lut;\n+\tint ret = 0;\n \n \tif (!vsi->id)\n-\t\treturn;\n+\t\treturn -EINVAL;\n \n \tif (adapter->current_op != I40E_VIRTCHNL_OP_UNKNOWN) {\n \t\t/* bail because we already have a command pending */\n \t\tdev_err(&adapter->pdev->dev, \"Cannot confiure RSS, command %d pending\\n\",\n \t\t\tadapter->current_op);\n-\t\treturn;\n+\t\treturn -EBUSY;\n \t}\n \n-\tmemset(&rss_key, 0, sizeof(rss_key));\n-\tmemcpy(&rss_key, seed, sizeof(rss_key));\n-\n-\trss_lut = kzalloc(((I40E_VFQF_HLUT_MAX_INDEX + 1) * 4), GFP_KERNEL);\n-\tif (!rss_lut)\n-\t\treturn;\n-\n-\t/* Populate the LUT with max no. PF queues in round robin fashion */\n-\tfor (i = 0; i <= (I40E_VFQF_HLUT_MAX_INDEX * 4); i++)\n-\t\trss_lut[i] = i % adapter->num_active_queues;\n+\tif (seed) {\n+\t\tstruct i40e_aqc_get_set_rss_key_data *rss_key =\n+\t\t\t(struct i40e_aqc_get_set_rss_key_data *)seed;\n+\t\tret = i40evf_aq_set_rss_key(hw, vsi->id, rss_key);\n+\t\tif (ret) {\n+\t\t\tdev_err(&adapter->pdev->dev, \"Cannot set RSS key, err %s aq_err %s\\n\",\n+\t\t\t\ti40evf_stat_str(hw, ret),\n+\t\t\t\ti40evf_aq_str(hw, hw->aq.asq_last_status));\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n \n-\tret = i40evf_aq_set_rss_key(hw, vsi->id, &rss_key);\n-\tif (ret) {\n-\t\tdev_err(&adapter->pdev->dev,\n-\t\t\t\"Cannot set RSS key, err %s aq_err %s\\n\",\n-\t\t\ti40evf_stat_str(hw, ret),\n-\t\t\ti40evf_aq_str(hw, hw->aq.asq_last_status));\n-\t\treturn;\n+\tif (lut) {\n+\t\tret = i40evf_aq_set_rss_lut(hw, vsi->id, false, lut, lut_size);\n+\t\tif (ret) {\n+\t\t\tdev_err(&adapter->pdev->dev,\n+\t\t\t\t\"Cannot set RSS lut, err %s aq_err %s\\n\",\n+\t\t\t\ti40evf_stat_str(hw, ret),\n+\t\t\t\ti40evf_aq_str(hw, hw->aq.asq_last_status));\n+\t\t\treturn ret;\n+\t\t}\n \t}\n \n-\tret = i40evf_aq_set_rss_lut(hw, vsi->id, false, rss_lut,\n-\t\t\t\t (I40E_VFQF_HLUT_MAX_INDEX + 1) * 4);\n-\tif (ret)\n-\t\tdev_err(&adapter->pdev->dev,\n-\t\t\t\"Cannot set RSS lut, err %s aq_err %s\\n\",\n-\t\t\ti40evf_stat_str(hw, ret),\n-\t\t\ti40evf_aq_str(hw, hw->aq.asq_last_status));\n+\treturn ret;\n }\n \n /**\n- * i40e_configure_rss_reg - Prepare for RSS if used\n- * @adapter: board private structure\n+ * i40evf_config_rss_reg - Configure RSS keys and lut by writing registers\n+ * @vsi: Pointer to vsi structure\n * @seed: RSS hash seed\n+ * @lut: Lookup table\n+ * @lut_size: Lookup table size\n+ *\n+ * Returns 0 on success, negative on failure\n **/\n-static void i40evf_configure_rss_reg(struct i40evf_adapter *adapter,\n-\t\t\t\t const u8 *seed)\n+static int i40evf_config_rss_reg(struct i40e_vsi *vsi, const u8 *seed,\n+\t\t\t\t const u8 *lut, u16 lut_size)\n {\n+\tstruct i40evf_adapter *adapter = vsi->back;\n \tstruct i40e_hw *hw = &adapter->hw;\n-\tu32 *seed_dw = (u32 *)seed;\n-\tu32 cqueue = 0;\n-\tu32 lut = 0;\n-\tint i, j;\n+\tu16 i;\n \n-\t/* Fill out hash function seed */\n-\tfor (i = 0; i <= I40E_VFQF_HKEY_MAX_INDEX; i++)\n-\t\twr32(hw, I40E_VFQF_HKEY(i), seed_dw[i]);\n-\n-\t/* Populate the LUT with max no. PF queues in round robin fashion */\n-\tfor (i = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++) {\n-\t\tlut = 0;\n-\t\tfor (j = 0; j < 4; j++) {\n-\t\t\tif (cqueue == adapter->num_active_queues)\n-\t\t\t\tcqueue = 0;\n-\t\t\tlut |= ((cqueue) << (8 * j));\n-\t\t\tcqueue++;\n-\t\t}\n-\t\twr32(hw, I40E_VFQF_HLUT(i), lut);\n+\tif (seed) {\n+\t\tu32 *seed_dw = (u32 *)seed;\n+\n+\t\tfor (i = 0; i <= I40E_VFQF_HKEY_MAX_INDEX; i++)\n+\t\t\twr32(hw, I40E_VFQF_HKEY(i), seed_dw[i]);\n+\t}\n+\n+\tif (lut) {\n+\t\tu32 *lut_dw = (u32 *)lut;\n+\n+\t\tif (lut_size != I40EVF_HLUT_ARRAY_SIZE)\n+\t\t\treturn -EINVAL;\n+\n+\t\tfor (i = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++)\n+\t\t\twr32(hw, I40E_VFQF_HLUT(i), lut_dw[i]);\n \t}\n \ti40e_flush(hw);\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * i40evf_config_rss - Configure RSS keys and lut\n+ * @vsi: Pointer to vsi structure\n+ * @seed: RSS hash seed\n+ * @lut: Lookup table\n+ * @lut_size: Lookup table size\n+ *\n+ * Returns 0 on success, negative on failure\n+ **/\n+int i40evf_config_rss(struct i40e_vsi *vsi, const u8 *seed,\n+\t\t u8 *lut, u16 lut_size)\n+{\n+\tstruct i40evf_adapter *adapter = vsi->back;\n+\n+\tif (RSS_AQ(adapter))\n+\t\treturn i40evf_config_rss_aq(vsi, seed, lut, lut_size);\n+\telse\n+\t\treturn i40evf_config_rss_reg(vsi, seed, lut, lut_size);\n+}\n+\n+/**\n+ * i40evf_fill_rss_lut - Fill the lut with default values\n+ * @lut: Lookup table to be filled with\n+ * @rss_table_size: Lookup table size\n+ * @rss_size: Range of queue number for hashing\n+ **/\n+static void i40evf_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size)\n+{\n+\tu16 i;\n+\n+\tfor (i = 0; i < rss_table_size; i++)\n+\t\tlut[i] = i % rss_size;\n }\n \n /**\n * i40evf_init_rss - Prepare for RSS\n * @adapter: board private structure\n+ *\n+ * Return 0 on success, negative on failure\n **/\n-static void i40evf_init_rss(struct i40evf_adapter *adapter)\n+static int i40evf_init_rss(struct i40evf_adapter *adapter)\n {\n+\tstruct i40e_vsi *vsi = &adapter->vsi;\n \tstruct i40e_hw *hw = &adapter->hw;\n \tu8 seed[I40EVF_HKEY_ARRAY_SIZE];\n \tu64 hena;\n-\n-\tnetdev_rss_key_fill((void *)seed, I40EVF_HKEY_ARRAY_SIZE);\n+\tu8 *lut;\n+\tint ret;\n \n \t/* Enable PCTYPES for RSS, TCP/UDP with IPv4/IPv6 */\n \thena = I40E_DEFAULT_RSS_HENA;\n \twr32(hw, I40E_VFQF_HENA(0), (u32)hena);\n \twr32(hw, I40E_VFQF_HENA(1), (u32)(hena >> 32));\n \n-\tif (RSS_AQ(adapter))\n-\t\ti40evf_configure_rss_aq(&adapter->vsi, seed);\n-\telse\n-\t\ti40evf_configure_rss_reg(adapter, seed);\n+\tlut = kzalloc(I40EVF_HLUT_ARRAY_SIZE, GFP_KERNEL);\n+\tif (!lut)\n+\t\treturn -ENOMEM;\n+\ti40evf_fill_rss_lut(lut, I40EVF_HLUT_ARRAY_SIZE,\n+\t\t\t adapter->num_active_queues);\n+\tnetdev_rss_key_fill((void *)seed, I40EVF_HKEY_ARRAY_SIZE);\n+\tret = i40evf_config_rss(vsi, seed, lut, I40EVF_HLUT_ARRAY_SIZE);\n+\tkfree(lut);\n+\n+\treturn ret;\n }\n \n /**\n", "prefixes": [ "next", "S20", "v2", "06/15" ] }