Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/499530/?format=api
{ "id": 499530, "url": "http://patchwork.ozlabs.org/api/patches/499530/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1437684884-222825-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": "<1437684884-222825-9-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-07-23T20:54:37", "name": "[next,S9,08/15] i40e: limit debugfs io ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d36ea4479b29338401fb3b1f94e98a868b96ec17", "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/1437684884-222825-9-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/499530/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/499530/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id D0E7A140D19\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 24 Jul 2015 06:53:51 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2F42AA438E;\n\tThu, 23 Jul 2015 20:53:51 +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 C2o-F7arSrKJ; Thu, 23 Jul 2015 20:53:50 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7F83EA43A2;\n\tThu, 23 Jul 2015 20:53:50 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 428AA1BFA6C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:48 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3DF4D91FF8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:48 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Mv5XgTAbHUqp for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:47 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A121A91FF1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:47 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP; 23 Jul 2015 13:53:47 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jul 2015 13:53:47 -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.15,533,1432623600\"; d=\"scan'208\";a=\"753353359\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 23 Jul 2015 16:54:37 -0400", "Message-Id": "<1437684884-222825-9-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S9 08/15] i40e: limit debugfs io ops", "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: Shannon Nelson <shannon.nelson@intel.com>\n\nDon't let the debugfs register read and write commands try to access\noutside of the ioremapped space. While we're at it, remove the use of\na misleading constant.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: Ifce2893e232c65c7a76c23532c658f298218a81b\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 3 ++-\n drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 12 ++++++------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 9 ++++-----\n 3 files changed, 12 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex c452527..d821c99 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -71,7 +71,6 @@\n #define I40E_MAX_VEB 16\n \n #define I40E_MAX_NUM_DESCRIPTORS 4096\n-#define I40E_MAX_REGISTER 0x800000\n #define I40E_MAX_CSR_SPACE (4 * 1024 * 1024 - 64 * 1024)\n #define I40E_DEFAULT_NUM_DESCRIPTORS 512\n #define I40E_REQ_DESCRIPTOR_MULTIPLE 32\n@@ -408,6 +407,8 @@ struct i40e_pf {\n \t/* These are only valid in NPAR modes */\n \tu32 npar_max_bw;\n \tu32 npar_min_bw;\n+\n+\tu32 ioremap_len;\n };\n \n struct i40e_mac_filter {\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\nindex d7c15d1..3671611 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n@@ -1495,9 +1495,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,\n \t\t}\n \n \t\t/* check the range on address */\n-\t\tif (address >= I40E_MAX_REGISTER) {\n-\t\t\tdev_info(&pf->pdev->dev, \"read reg address 0x%08x too large\\n\",\n-\t\t\t\t address);\n+\t\tif (address > (pf->ioremap_len - sizeof(u32))) {\n+\t\t\tdev_info(&pf->pdev->dev, \"read reg address 0x%08x too large, max=0x%08lx\\n\",\n+\t\t\t\t address, (pf->ioremap_len - sizeof(u32)));\n \t\t\tgoto command_write_done;\n \t\t}\n \n@@ -1514,9 +1514,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,\n \t\t}\n \n \t\t/* check the range on address */\n-\t\tif (address >= I40E_MAX_REGISTER) {\n-\t\t\tdev_info(&pf->pdev->dev, \"write reg address 0x%08x too large\\n\",\n-\t\t\t\t address);\n+\t\tif (address > (pf->ioremap_len - sizeof(u32))) {\n+\t\t\tdev_info(&pf->pdev->dev, \"write reg address 0x%08x too large, max=0x%08lx\\n\",\n+\t\t\t\t address, (pf->ioremap_len - sizeof(u32)));\n \t\t\tgoto command_write_done;\n \t\t}\n \t\twr32(&pf->hw, address, value);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex a6a5f45..b267e7a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -9792,7 +9792,6 @@ static void i40e_print_features(struct i40e_pf *pf)\n static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n {\n \tstruct i40e_aq_get_phy_abilities_resp abilities;\n-\tunsigned long ioremap_len;\n \tstruct i40e_pf *pf;\n \tstruct i40e_hw *hw;\n \tstatic u16 pfs_found;\n@@ -9845,15 +9844,15 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \thw = &pf->hw;\n \thw->back = pf;\n \n-\tioremap_len = min_t(unsigned long, pci_resource_len(pdev, 0),\n-\t\t\t I40E_MAX_CSR_SPACE);\n+\tpf->ioremap_len = min_t(int, pci_resource_len(pdev, 0),\n+\t\t\t\tI40E_MAX_CSR_SPACE);\n \n-\thw->hw_addr = ioremap(pci_resource_start(pdev, 0), ioremap_len);\n+\thw->hw_addr = ioremap(pci_resource_start(pdev, 0), pf->ioremap_len);\n \tif (!hw->hw_addr) {\n \t\terr = -EIO;\n \t\tdev_info(&pdev->dev, \"ioremap(0x%04x, 0x%04x) failed: 0x%x\\n\",\n \t\t\t (unsigned int)pci_resource_start(pdev, 0),\n-\t\t\t (unsigned int)pci_resource_len(pdev, 0), err);\n+\t\t\t pf->ioremap_len, err);\n \t\tgoto err_ioremap;\n \t}\n \thw->vendor_id = pdev->vendor;\n", "prefixes": [ "next", "S9", "08/15" ] }