Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536386/?format=api
{ "id": 536386, "url": "http://patchwork.ozlabs.org/api/patches/536386/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445903081-155893-9-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-9-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-26T23:44:34", "name": "[next,S20,08/15] i40evf: add new fields to store user configuration of RSS", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "04c7575191512dba3e6a6c80e07d4eae29b04947", "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-9-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536386/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536386/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 8028414030E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 27 Oct 2015 10:45:46 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id CBEB031BBF;\n\tMon, 26 Oct 2015 23:45:45 +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 ZPIjhVFNTuEW; Mon, 26 Oct 2015 23:45:43 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5884332DCC;\n\tMon, 26 Oct 2015 23:45:43 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 1BE5D1CEEC7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:40 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6E9ED87354\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:40 +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 3RJznU797vAs for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:38 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A34BA87287\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:38 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 26 Oct 2015 16:45:38 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 26 Oct 2015 16:45:37 -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=\"588532652\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 26 Oct 2015 19:44:34 -0400", "Message-Id": "<1445903081-155893-9-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 08/15] i40evf: add new fields to\n\tstore user configuration of RSS", "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: Ic5d3db8d9df52182b560248f8cdca9c5c7546879\n\n---\nTesting-hints: Test ethtool -x and ethtool -X work correctly on VF.\nAfter VF reset, user configured settings via ethtool -X should be\nrestored.\n drivers/net/ethernet/intel/i40evf/i40evf.h | 2 ++\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 31 ++++++++++--------\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 37 ++++++++++++++++++++--\n 3 files changed, 54 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex 5f2e61d..090c604 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -67,6 +67,8 @@ struct i40e_vsi {\n \tu16 rx_itr_setting;\n \tu16 tx_itr_setting;\n \tu16 qs_handle;\n+\tu8 *rss_hkey_user; /* User configured hash keys */\n+\tu8 *rss_lut_user; /* User configured lookup table entries */\n };\n \n /* How many Rx Buffers do we bundle into one write to the hardware ? */\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\nindex 0222e16..4f4e5a3 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -678,9 +678,7 @@ static int i40evf_set_rxfh(struct net_device *netdev, const u32 *indir,\n {\n \tstruct i40evf_adapter *adapter = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = &adapter->vsi;\n-\tu8 seed_def[I40EVF_HKEY_ARRAY_SIZE];\n-\tu8 *seed = NULL, *lut;\n-\tint ret;\n+\tu8 *seed = NULL;\n \tu16 i;\n \n \t/* We do not allow change in unsupported parameters */\n@@ -691,21 +689,28 @@ static int i40evf_set_rxfh(struct net_device *netdev, const u32 *indir,\n \t\treturn 0;\n \n \tif (key) {\n-\t\tmemcpy(seed_def, key, I40EVF_HKEY_ARRAY_SIZE);\n-\t\tseed = seed_def;\n+\t\tif (!vsi->rss_hkey_user) {\n+\t\t\tvsi->rss_hkey_user = kzalloc(I40EVF_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, I40EVF_HKEY_ARRAY_SIZE);\n+\t\tseed = vsi->rss_hkey_user;\n+\t}\n+\tif (!vsi->rss_lut_user) {\n+\t\tvsi->rss_lut_user = kzalloc(I40EVF_HLUT_ARRAY_SIZE,\n+\t\t\t\t\t GFP_KERNEL);\n+\t\tif (!vsi->rss_lut_user)\n+\t\t\treturn -ENOMEM;\n \t}\n-\tlut = kzalloc(I40EVF_HLUT_ARRAY_SIZE, GFP_KERNEL);\n-\tif (!lut)\n-\t\treturn -ENOMEM;\n \n \t/* Each 32 bits pointed by 'indir' is sotred with a lut entry */\n \tfor (i = 0; i < I40EVF_HLUT_ARRAY_SIZE; i++)\n-\t\tlut[i] = (u8)(indir[i]);\n+\t\tvsi->rss_lut_user[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+\treturn i40evf_config_rss(vsi, seed, vsi->rss_lut_user,\n+\t\t\t\t I40EVF_HLUT_ARRAY_SIZE);\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 ae20d95..52a3286 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -1453,9 +1453,21 @@ static int i40evf_init_rss(struct i40evf_adapter *adapter)\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+\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, I40EVF_HLUT_ARRAY_SIZE);\n+\telse\n+\t\ti40evf_fill_rss_lut(lut, I40EVF_HLUT_ARRAY_SIZE,\n+\t\t\t\t adapter->num_active_queues);\n+\n+\t/* Use user configured hash key if there is one, otherwise\n+\t * user default.\n+\t */\n+\tif (vsi->rss_hkey_user)\n+\t\tmemcpy(seed, vsi->rss_hkey_user, I40EVF_HKEY_ARRAY_SIZE);\n+\telse\n+\t\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@@ -1583,6 +1595,22 @@ err_set_interrupt:\n }\n \n /**\n+ * i40evf_clear_rss_config_user - Clear user configurations of RSS\n+ * @vsi: Pointer to VSI structure\n+ **/\n+static void i40evf_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 * i40evf_watchdog_timer - Periodic call-back timer\n * @data: pointer to adapter disguised as unsigned long\n **/\n@@ -2770,6 +2798,9 @@ static void i40evf_remove(struct pci_dev *pdev)\n \n \tflush_scheduled_work();\n \n+\t/* Clear user configurations for RSS */\n+\ti40evf_clear_rss_config_user(&adapter->vsi);\n+\n \tif (hw->aq.asq.count)\n \t\ti40evf_shutdown_adminq(hw);\n \n", "prefixes": [ "next", "S20", "08/15" ] }