Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1141311/?format=api
{ "id": 1141311, "url": "http://patchwork.ozlabs.org/api/patches/1141311/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190802082533.23083-5-anthony.l.nguyen@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": "<20190802082533.23083-5-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-08-02T08:25:23", "name": "[S26,05/15] ice: Rework ice_ena_msix_range", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9a14cf3a3b1fab825d1cab44a70d19d53c9a93fe", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20190802082533.23083-5-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 123025, "url": "http://patchwork.ozlabs.org/api/series/123025/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=123025", "date": "2019-08-02T08:25:29", "name": "[S26,01/15] ice: add support for enabling/disabling single queues", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/123025/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1141311/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1141311/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 460YCm5159z9sND\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 3 Aug 2019 02:54:12 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 090FE876EE;\n\tFri, 2 Aug 2019 16:54:11 +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 JxeXsXzxCkUv; Fri, 2 Aug 2019 16:54:06 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4C2DD87BE5;\n\tFri, 2 Aug 2019 16:54:05 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 98EC31BF9BD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Aug 2019 16:54:01 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8CAFA8775B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Aug 2019 16:54:01 +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 JWrC5xP8wrHr for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Aug 2019 16:54:00 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id C8D13876EE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Aug 2019 16:54:00 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t02 Aug 2019 09:53:58 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga003.jf.intel.com with ESMTP; 02 Aug 2019 09:53:58 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,338,1559545200\"; d=\"scan'208\";a=\"175640942\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 2 Aug 2019 01:25:23 -0700", "Message-Id": "<20190802082533.23083-5-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190802082533.23083-1-anthony.l.nguyen@intel.com>", "References": "<20190802082533.23083-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S26 05/15] ice: Rework ice_ena_msix_range", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n\nThe current implementation of ice_ena_msix_range is difficult to read\nand has subtle issues. This patch reworks the said function for\nclarity and correctness.\n\nMore specifically,\n\n1. Add more checks to bail out of 'needed' is greater than 'v_left'.\n\n2. Simplify fallback logic\n\n3. Do not set pf->num_avail_sw_msix in ice_ena_msix_range as it\n gets overwritten by ice_init_interrupt_scheme.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 32 +++++++++++++++--------\n 1 file changed, 21 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 0eefac05eae1..0d850d92cd5c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -2317,13 +2317,18 @@ static int ice_ena_msix_range(struct ice_pf *pf)\n \n \t/* reserve one vector for miscellaneous handler */\n \tneeded = 1;\n+\tif (v_left < needed)\n+\t\tgoto no_hw_vecs_left_err;\n \tv_budget += needed;\n \tv_left -= needed;\n \n \t/* reserve vectors for LAN traffic */\n-\tpf->num_lan_msix = min_t(int, num_online_cpus(), v_left);\n-\tv_budget += pf->num_lan_msix;\n-\tv_left -= pf->num_lan_msix;\n+\tneeded = min_t(int, num_online_cpus(), v_left);\n+\tif (v_left < needed)\n+\t\tgoto no_hw_vecs_left_err;\n+\tpf->num_lan_msix = needed;\n+\tv_budget += needed;\n+\tv_left -= needed;\n \n \tpf->msix_entries = devm_kcalloc(&pf->pdev->dev, v_budget,\n \t\t\t\t\tsizeof(*pf->msix_entries), GFP_KERNEL);\n@@ -2348,18 +2353,18 @@ static int ice_ena_msix_range(struct ice_pf *pf)\n \n \tif (v_actual < v_budget) {\n \t\tdev_warn(&pf->pdev->dev,\n-\t\t\t \"not enough vectors. requested = %d, obtained = %d\\n\",\n+\t\t\t \"not enough OS MSI-X vectors. requested = %d, obtained = %d\\n\",\n \t\t\t v_budget, v_actual);\n-\t\tif (v_actual >= (pf->num_lan_msix + 1)) {\n-\t\t\tpf->num_avail_sw_msix = v_actual -\n-\t\t\t\t\t\t(pf->num_lan_msix + 1);\n-\t\t} else if (v_actual >= 2) {\n-\t\t\tpf->num_lan_msix = 1;\n-\t\t\tpf->num_avail_sw_msix = v_actual - 2;\n-\t\t} else {\n+/* 2 vectors for LAN (traffic + OICR) */\n+#define ICE_MIN_LAN_VECS 2\n+\n+\t\tif (v_actual < ICE_MIN_LAN_VECS) {\n+\t\t\t/* error if we can't get minimum vectors */\n \t\t\tpci_disable_msix(pf->pdev);\n \t\t\terr = -ERANGE;\n \t\t\tgoto msix_err;\n+\t\t} else {\n+\t\t\tpf->num_lan_msix = ICE_MIN_LAN_VECS;\n \t\t}\n \t}\n \n@@ -2369,6 +2374,11 @@ static int ice_ena_msix_range(struct ice_pf *pf)\n \tdevm_kfree(&pf->pdev->dev, pf->msix_entries);\n \tgoto exit_err;\n \n+no_hw_vecs_left_err:\n+\tdev_err(&pf->pdev->dev,\n+\t\t\"not enough device MSI-X vectors. requested = %d, available = %d\\n\",\n+\t\tneeded, v_left);\n+\terr = -ERANGE;\n exit_err:\n \tpf->num_lan_msix = 0;\n \treturn err;\n", "prefixes": [ "S26", "05/15" ] }