Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536379/?format=api
{ "id": 536379, "url": "http://patchwork.ozlabs.org/api/patches/536379/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445903081-155893-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": "<1445903081-155893-2-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-26T23:44:27", "name": "[next,S20,01/15] i40e: add new fields to store user configuraion", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "44cb2d5bca1c2ac9a4d41f1e06034dea230c4120", "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/1445903081-155893-2-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536379/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536379/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 0B82114030E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 27 Oct 2015 10:45:32 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4EC8432DC6;\n\tMon, 26 Oct 2015 23:45:32 +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 CxyhTLCeDJex; Mon, 26 Oct 2015 23:45:30 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id C043F319F3;\n\tMon, 26 Oct 2015 23:45:30 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 269D81CEEC7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 22CE0891A4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:29 +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 Og2Wx8sYQszV for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:28 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 89E5D87354\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:28 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 26 Oct 2015 16:45:28 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 26 Oct 2015 16:45:29 -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,202,1444719600\"; d=\"scan'208\";a=\"588532601\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 26 Oct 2015 19:44:27 -0400", "Message-Id": "<1445903081-155893-2-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1445903081-155893-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1445903081-155893-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Helin Zhang <helin.zhang@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S20 01/15] i40e: add new fields to\n\tstore user configuraion", "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\nThis patch adds new fields to i40e_vsi to store user configured\nRSS config data and code to use it.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\nChange-ID: I73886469dca9e9f6b16d842182a87f3f4009f95d\n\n---\nTesting-hints: Test with the next patch.\n drivers/net/ethernet/intel/i40e/i40e.h | 2 +\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 31 +++++++++------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 52 +++++++++++++++++++++++---\n 3 files changed, 68 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 89f5323..6efab66 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -508,6 +508,8 @@ struct i40e_vsi {\n \n \tu16 rss_table_size;\n \tu16 rss_size;\n+\tu8 *rss_hkey_user; /* User configured hash keys */\n+\tu8 *rss_lut_user; /* User configured lookup table entries */\n \n \tu16 max_frame;\n \tu16 rx_hdr_len;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 6cb2b34..b52c509 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2651,10 +2651,8 @@ static int i40e_set_rxfh(struct net_device *netdev, const u32 *indir,\n {\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = np->vsi;\n-\tu8 seed_def[I40E_HKEY_ARRAY_SIZE];\n-\tu8 *lut, *seed = NULL;\n+\tu8 *seed = NULL;\n \tu16 i;\n-\tint ret;\n \n \tif (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)\n \t\treturn -EOPNOTSUPP;\n@@ -2663,18 +2661,27 @@ static int i40e_set_rxfh(struct net_device *netdev, const u32 *indir,\n \t\treturn 0;\n \n \tif (key) {\n-\t\tmemcpy(seed_def, key, I40E_HKEY_ARRAY_SIZE);\n-\t\tseed = seed_def;\n+\t\tif (!vsi->rss_hkey_user) {\n+\t\t\tvsi->rss_hkey_user = kzalloc(I40E_HKEY_ARRAY_SIZE,\n+\t\t\t\t\t\t GFP_KERNEL);\n+\t\t\tif (!vsi->rss_hkey_user)\n+\t\t\t\treturn -ENOMEM;\n+\t\t}\n+\t\tmemcpy(vsi->rss_hkey_user, key, I40E_HKEY_ARRAY_SIZE);\n+\t\tseed = vsi->rss_hkey_user;\n \t}\n-\tlut = kzalloc(I40E_HLUT_ARRAY_SIZE, GFP_KERNEL);\n-\tif (!lut)\n-\t\treturn -ENOMEM;\n+\tif (!vsi->rss_lut_user) {\n+\t\tvsi->rss_lut_user = kzalloc(I40E_HLUT_ARRAY_SIZE, GFP_KERNEL);\n+\t\tif (!vsi->rss_lut_user)\n+\t\t\treturn -ENOMEM;\n+\t}\n+\n+\t/* Each 32 bits pointed by 'indir' is stored with a lut entry */\n \tfor (i = 0; i < I40E_HLUT_ARRAY_SIZE; i++)\n-\t\tlut[i] = (u8)(indir[i]);\n-\tret = i40e_config_rss(vsi, seed, lut, I40E_HLUT_ARRAY_SIZE);\n-\tkfree(lut);\n+\t\tvsi->rss_lut_user[i] = (u8)(indir[i]);\n \n-\treturn ret;\n+\treturn i40e_config_rss(vsi, seed, vsi->rss_lut_user,\n+\t\t\t I40E_HLUT_ARRAY_SIZE);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 4b7d874..c0a784f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -7301,6 +7301,23 @@ static void i40e_vsi_free_arrays(struct i40e_vsi *vsi, bool free_qvectors)\n }\n \n /**\n+ * i40e_clear_rss_config_user - clear the user configured RSS hash keys\n+ * and lookup table\n+ * @vsi: Pointer to VSI structure\n+ */\n+static void i40e_clear_rss_config_user(struct i40e_vsi *vsi)\n+{\n+\tif (!vsi)\n+\t\treturn;\n+\n+\tkfree(vsi->rss_hkey_user);\n+\tvsi->rss_hkey_user = NULL;\n+\n+\tkfree(vsi->rss_lut_user);\n+\tvsi->rss_lut_user = NULL;\n+}\n+\n+/**\n * i40e_vsi_clear - Deallocate the VSI provided\n * @vsi: the VSI being un-configured\n **/\n@@ -7337,6 +7354,7 @@ static int i40e_vsi_clear(struct i40e_vsi *vsi)\n \ti40e_put_lump(pf->irq_pile, vsi->base_vector, vsi->idx);\n \n \ti40e_vsi_free_arrays(vsi, true);\n+\ti40e_clear_rss_config_user(vsi);\n \n \tpf->vsi[vsi->idx] = NULL;\n \tif (vsi->idx < pf->next_vsi)\n@@ -8015,8 +8033,6 @@ static int i40e_pf_config_rss(struct i40e_pf *pf)\n \twr32(hw, I40E_PFQF_HENA(0), (u32)hena);\n \twr32(hw, I40E_PFQF_HENA(1), (u32)(hena >> 32));\n \n-\tvsi->rss_size = min_t(int, pf->rss_size, vsi->num_queue_pairs);\n-\n \t/* Determine the RSS table size based on the hardware capabilities */\n \treg_val = rd32(hw, I40E_PFQF_CTL_0);\n \treg_val = (pf->rss_table_size == 512) ?\n@@ -8024,15 +8040,28 @@ static int i40e_pf_config_rss(struct i40e_pf *pf)\n \t\t\t(reg_val & ~I40E_PFQF_CTL_0_HASHLUTSIZE_512);\n \twr32(hw, I40E_PFQF_CTL_0, reg_val);\n \n+\t/* Determine the RSS size of the VSI */\n+\tif (!vsi->rss_size)\n+\t\tvsi->rss_size = min_t(int, pf->rss_size, vsi->num_queue_pairs);\n+\n \tlut = kzalloc(vsi->rss_table_size, GFP_KERNEL);\n \tif (!lut)\n \t\treturn -ENOMEM;\n \n-\ti40e_fill_rss_lut(pf, lut, vsi->rss_table_size, vsi->rss_size);\n+\t/* Use user configured lut if there is one, otherwise use default */\n+\tif (vsi->rss_lut_user)\n+\t\tmemcpy(lut, vsi->rss_lut_user, vsi->rss_table_size);\n+\telse\n+\t\ti40e_fill_rss_lut(pf, lut, vsi->rss_table_size, vsi->rss_size);\n \n-\tnetdev_rss_key_fill((void *)seed, I40E_HKEY_ARRAY_SIZE);\n+\t/* Use user configured hash key if there is one, otherwise\n+\t * use default.\n+\t */\n+\tif (vsi->rss_hkey_user)\n+\t\tmemcpy(seed, vsi->rss_hkey_user, I40E_HKEY_ARRAY_SIZE);\n+\telse\n+\t\tnetdev_rss_key_fill((void *)seed, I40E_HKEY_ARRAY_SIZE);\n \tret = i40e_config_rss(vsi, seed, lut, vsi->rss_table_size);\n-\n \tkfree(lut);\n \n \treturn ret;\n@@ -8063,6 +8092,19 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count)\n \t\tpf->rss_size = new_rss_size;\n \n \t\ti40e_reset_and_rebuild(pf, true);\n+\n+\t\t/* Discard the user configured hash keys and lut, if less\n+\t\t * queues are enabled.\n+\t\t */\n+\t\tif (queue_count < vsi->rss_size) {\n+\t\t\ti40e_clear_rss_config_user(vsi);\n+\t\t\tdev_dbg(&pf->pdev->dev,\n+\t\t\t\t\"discard user configured hash keys and lut\\n\");\n+\t\t}\n+\n+\t\t/* Reset vsi->rss_size, as number of enabled queues changed */\n+\t\tvsi->rss_size = min_t(int, pf->rss_size, vsi->num_queue_pairs);\n+\n \t\ti40e_pf_config_rss(pf);\n \t}\n \tdev_info(&pf->pdev->dev, \"RSS count: %d\\n\", pf->rss_size);\n", "prefixes": [ "next", "S20", "01/15" ] }