Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536380/?format=api
{ "id": 536380, "url": "http://patchwork.ozlabs.org/api/patches/536380/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445903081-155893-3-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-3-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-26T23:44:28", "name": "[next,S20,02/15] i40e: rename rss_size to alloc_rss_size in i40e_pf", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ed7f7dcca7b7a540dbf9d769bd13badbcbc4e4bd", "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-3-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536380/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536380/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 130E114030E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 27 Oct 2015 10:45:36 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5EE9332DE2;\n\tMon, 26 Oct 2015 23:45:35 +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 YyA68M+UOCes; Mon, 26 Oct 2015 23:45:32 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 18DDB32330;\n\tMon, 26 Oct 2015 23:45:32 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id A1DBC1CEEC7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9D9E387354\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:30 +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 EOD3vleVoT-P for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:30 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 126B487287\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:30 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 26 Oct 2015 16:45:29 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 26 Oct 2015 16:45:31 -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=\"588532611\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 26 Oct 2015 19:44:28 -0400", "Message-Id": "<1445903081-155893-3-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 02/15] i40e: rename rss_size to\n\talloc_rss_size in i40e_pf", "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 renames rss_size to alloc_rss_size in i40e_pf, which is\nclearer and avoids confusion. It also adds comments to the other\nrelated structure members to help clarify usage.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\nChange-ID: Ia90090609d006ab589cb639975bb8a0af795d16f\n\n---\nTesting-hints: Test all the RSS knobs from ethtool for X[L]710 and X722.\n drivers/net/ethernet/intel/i40e/i40e.h | 8 ++++----\n drivers/net/ethernet/intel/i40e/i40e_main.c | 31 +++++++++++++++++------------\n 2 files changed, 22 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 6efab66..d854a46 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -266,7 +266,7 @@ struct i40e_pf {\n \tu16 num_lan_qps; /* num lan queues this PF has set up */\n \tu16 num_lan_msix; /* num queue vectors for the base PF vsi */\n \tint queues_left; /* queues left unclaimed */\n-\tu16 rss_size; /* num queues in the RSS array */\n+\tu16 alloc_rss_size; /* allocated RSS queues */\n \tu16 rss_size_max; /* HW defined max RSS queues */\n \tu16 fdir_pf_filter_count; /* num of guaranteed filters for this PF */\n \tu16 num_alloc_vsi; /* num VSIs this driver supports */\n@@ -413,7 +413,7 @@ struct i40e_pf {\n \tu32 rx_hwtstamp_cleared;\n \tbool ptp_tx;\n \tbool ptp_rx;\n-\tu16 rss_table_size;\n+\tu16 rss_table_size; /* HW RSS table size */\n \t/* These are only valid in NPAR modes */\n \tu32 npar_max_bw;\n \tu32 npar_min_bw;\n@@ -506,8 +506,8 @@ struct i40e_vsi {\n \tu16 tx_itr_setting;\n \tu16 int_rate_limit; /* value in usecs */\n \n-\tu16 rss_table_size;\n-\tu16 rss_size;\n+\tu16 rss_table_size; /* HW RSS table size */\n+\tu16 rss_size; /* Allocated RSS queues */\n \tu8 *rss_hkey_user; /* User configured hash keys */\n \tu8 *rss_lut_user; /* User configured lookup table entries */\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex c0a784f..491c82f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1630,7 +1630,8 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,\n \n \t\t\tswitch (vsi->type) {\n \t\t\tcase I40E_VSI_MAIN:\n-\t\t\t\tqcount = min_t(int, pf->rss_size, num_tc_qps);\n+\t\t\t\tqcount = min_t(int, pf->alloc_rss_size,\n+\t\t\t\t\t num_tc_qps);\n \t\t\t\tbreak;\n #ifdef I40E_FCOE\n \t\t\tcase I40E_VSI_FCOE:\n@@ -7883,7 +7884,7 @@ static int i40e_vsi_config_rss(struct i40e_vsi *vsi)\n \n \ti40e_fill_rss_lut(pf, lut, vsi->rss_table_size, vsi->rss_size);\n \tnetdev_rss_key_fill((void *)seed, I40E_HKEY_ARRAY_SIZE);\n-\tvsi->rss_size = min_t(int, pf->rss_size, vsi->num_queue_pairs);\n+\tvsi->rss_size = min_t(int, pf->alloc_rss_size, vsi->num_queue_pairs);\n \tret = i40e_config_rss_aq(vsi, seed, lut, vsi->rss_table_size);\n \tkfree(lut);\n \n@@ -8042,7 +8043,8 @@ static int i40e_pf_config_rss(struct i40e_pf *pf)\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+\t\tvsi->rss_size = min_t(int, pf->alloc_rss_size,\n+\t\t\t\t vsi->num_queue_pairs);\n \n \tlut = kzalloc(vsi->rss_table_size, GFP_KERNEL);\n \tif (!lut)\n@@ -8089,7 +8091,7 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count)\n \t\tvsi->req_queue_pairs = queue_count;\n \t\ti40e_prep_for_reset(pf);\n \n-\t\tpf->rss_size = new_rss_size;\n+\t\tpf->alloc_rss_size = new_rss_size;\n \n \t\ti40e_reset_and_rebuild(pf, true);\n \n@@ -8103,12 +8105,13 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count)\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+\t\tvsi->rss_size = min_t(int, pf->alloc_rss_size,\n+\t\t\t\t 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-\treturn pf->rss_size;\n+\tdev_info(&pf->pdev->dev, \"RSS count: %d\\n\", pf->alloc_rss_size);\n+\treturn pf->alloc_rss_size;\n }\n \n /**\n@@ -8279,13 +8282,14 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t * maximum might end up larger than the available queues\n \t */\n \tpf->rss_size_max = BIT(pf->hw.func_caps.rss_table_entry_width);\n-\tpf->rss_size = 1;\n+\tpf->alloc_rss_size = 1;\n \tpf->rss_table_size = pf->hw.func_caps.rss_table_size;\n \tpf->rss_size_max = min_t(int, pf->rss_size_max,\n \t\t\t\t pf->hw.func_caps.num_tx_qp);\n \tif (pf->hw.func_caps.rss) {\n \t\tpf->flags |= I40E_FLAG_RSS_ENABLED;\n-\t\tpf->rss_size = min_t(int, pf->rss_size_max, num_online_cpus());\n+\t\tpf->alloc_rss_size = min_t(int, pf->rss_size_max,\n+\t\t\t\t\t num_online_cpus());\n \t}\n \n \t/* MFP mode enabled */\n@@ -10152,7 +10156,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)\n \t !(pf->flags & I40E_FLAG_MSIX_ENABLED)) {\n \t\t/* one qp for PF, no queues for anything else */\n \t\tqueues_left = 0;\n-\t\tpf->rss_size = pf->num_lan_qps = 1;\n+\t\tpf->alloc_rss_size = pf->num_lan_qps = 1;\n \n \t\t/* make sure all the fancies are disabled */\n \t\tpf->flags &= ~(I40E_FLAG_RSS_ENABLED\t|\n@@ -10169,7 +10173,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)\n \t\t\t\t I40E_FLAG_FD_ATR_ENABLED |\n \t\t\t\t I40E_FLAG_DCB_CAPABLE))) {\n \t\t/* one qp for PF */\n-\t\tpf->rss_size = pf->num_lan_qps = 1;\n+\t\tpf->alloc_rss_size = pf->num_lan_qps = 1;\n \t\tqueues_left -= pf->num_lan_qps;\n \n \t\tpf->flags &= ~(I40E_FLAG_RSS_ENABLED\t|\n@@ -10239,8 +10243,9 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)\n \t\t\"qs_avail=%d FD SB=%d lan_qs=%d lan_tc0=%d vf=%d*%d vmdq=%d*%d, remaining=%d\\n\",\n \t\tpf->hw.func_caps.num_tx_qp,\n \t\t!!(pf->flags & I40E_FLAG_FD_SB_ENABLED),\n-\t\tpf->num_lan_qps, pf->rss_size, pf->num_req_vfs, pf->num_vf_qps,\n-\t\tpf->num_vmdq_vsis, pf->num_vmdq_qps, queues_left);\n+\t\tpf->num_lan_qps, pf->alloc_rss_size, pf->num_req_vfs,\n+\t\tpf->num_vf_qps, pf->num_vmdq_vsis, pf->num_vmdq_qps,\n+\t\tqueues_left);\n #ifdef I40E_FCOE\n \tdev_dbg(&pf->pdev->dev, \"fcoe queues = %d\\n\", pf->num_fcoe_qps);\n #endif\n", "prefixes": [ "next", "S20", "02/15" ] }