Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536384/?format=api
{ "id": 536384, "url": "http://patchwork.ozlabs.org/api/patches/536384/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445903081-155893-8-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-8-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-26T23:44:33", "name": "[next,S20,07/15] i40evf: create a generic get rss function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "061e5b2ecc70fd2378d527983631b690c1c0339b", "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-8-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536384/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536384/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 481D114030E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 27 Oct 2015 10:45:43 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8BA11319F3;\n\tMon, 26 Oct 2015 23:45:42 +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 1SNZVpZtmjj3; Mon, 26 Oct 2015 23:45:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 18ECE32DE1;\n\tMon, 26 Oct 2015 23:45:37 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id B94811CEEC7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B68C389254\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:35 +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 VOlY0fSTeOyq for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:35 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 13B3287354\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:35 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 26 Oct 2015 16:45:34 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 26 Oct 2015 16:45:36 -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=\"588532649\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 26 Oct 2015 19:44:33 -0400", "Message-Id": "<1445903081-155893-8-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 07/15] i40evf: create a generic\n\tget 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 get RSS, this patch implements two functions\nwith the same input parameters, and creates a more generic function\nfor getting RSS configuration.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\nChange-ID: I12d3b712c21455d47dd0a5aae58fc9b7c680db59\n\n---\nTesting-hints: Test RSS still works right on multiple RX queues in the\nVF (via testing multiple flows RX). Test setting RSS indirection table\nvia ethtool -X, and reading via ethtool -x works.\n drivers/net/ethernet/intel/i40evf/i40evf.h | 2 +\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 35 +++++---\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 97 ++++++++++++++++++++++\n 3 files changed, 121 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex b5aa377..5f2e61d 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -316,4 +316,6 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,\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+int i40evf_get_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 fe1d1a3..0222e16 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -634,25 +634,34 @@ static int i40evf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,\n \t\t\t 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 = NULL, *lut;\n+\tint ret;\n+\tu16 i;\n \n \tif (hfunc)\n \t\t*hfunc = ETH_RSS_HASH_TOP;\n \tif (!indir)\n \t\treturn 0;\n \n-\tif (indir) {\n-\t\tfor (i = 0, j = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++) {\n-\t\t\thlut_val = rd32(hw, I40E_VFQF_HLUT(i));\n-\t\t\tindir[j++] = hlut_val & 0xff;\n-\t\t\tindir[j++] = (hlut_val >> 8) & 0xff;\n-\t\t\tindir[j++] = (hlut_val >> 16) & 0xff;\n-\t\t\tindir[j++] = (hlut_val >> 24) & 0xff;\n-\t\t}\n-\t}\n-\treturn 0;\n+\tseed = key;\n+\n+\tlut = kzalloc(I40EVF_HLUT_ARRAY_SIZE, GFP_KERNEL);\n+\tif (!lut)\n+\t\treturn -ENOMEM;\n+\n+\tret = i40evf_get_rss(vsi, seed, lut, I40EVF_HLUT_ARRAY_SIZE);\n+\tif (ret)\n+\t\tgoto out;\n+\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\tindir[i] = (u32)lut[i];\n+\n+out:\n+\tkfree(lut);\n+\n+\treturn ret;\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 65d0e04..ae20d95 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -1300,6 +1300,84 @@ static int i40evf_config_rss_reg(struct i40e_vsi *vsi, const u8 *seed,\n }\n \n /**\n+ * * i40evf_get_rss_aq - Get RSS keys and lut by using AQ commands\n+ * @vsi: Pointer to 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 int i40evf_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,\n+\t\t\t u8 *lut, u16 lut_size)\n+{\n+\tstruct i40evf_adapter *adapter = vsi->back;\n+\tstruct i40e_hw *hw = &adapter->hw;\n+\tint ret = 0;\n+\n+\tif (seed) {\n+\t\tret = i40evf_aq_get_rss_key(hw, vsi->id,\n+\t\t\t(struct i40e_aqc_get_set_rss_key_data *)seed);\n+\t\tif (ret) {\n+\t\t\tdev_err(&adapter->pdev->dev,\n+\t\t\t\t\"Cannot get 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+\tif (lut) {\n+\t\tret = i40evf_aq_get_rss_lut(hw, vsi->id, seed, lut, lut_size);\n+\t\tif (ret) {\n+\t\t\tdev_err(&adapter->pdev->dev,\n+\t\t\t\t\"Cannot get 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+\treturn ret;\n+}\n+\n+/**\n+ * * i40evf_get_rss_reg - Get RSS keys and lut by reading 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 int i40evf_get_rss_reg(struct i40e_vsi *vsi, const u8 *seed,\n+\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+\tu16 i;\n+\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\tseed_dw[i] = rd32(hw, I40E_VFQF_HKEY(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\tlut_dw[i] = rd32(hw, I40E_VFQF_HLUT(i));\n+\t}\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@@ -1320,6 +1398,25 @@ int i40evf_config_rss(struct i40e_vsi *vsi, const u8 *seed,\n }\n \n /**\n+ * i40evf_get_rss - Get 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_get_rss(struct i40e_vsi *vsi, const u8 *seed, u8 *lut, u16 lut_size)\n+{\n+\tstruct i40evf_adapter *adapter = vsi->back;\n+\n+\tif (RSS_AQ(adapter))\n+\t\treturn i40evf_get_rss_aq(vsi, seed, lut, lut_size);\n+\telse\n+\t\treturn i40evf_get_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", "prefixes": [ "next", "S20", "07/15" ] }