Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/787393/?format=api
{ "id": 787393, "url": "http://patchwork.ozlabs.org/api/patches/787393/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170712094614.76501-3-alice.michael@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": "<20170712094614.76501-3-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-07-12T09:46:06", "name": "[next,S75-V3,03/11] i40e: prevent changing ITR if adaptive-rx/tx enabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "485c0c12e4472b2ae1b2fa0aa56846df99475012", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20170712094614.76501-3-alice.michael@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/787393/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/787393/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" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3x761n5XGfz9s3T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 13 Jul 2017 03:50:53 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 470D53091B;\n\tWed, 12 Jul 2017 17:50:52 +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 pvLG6tpIiJHV; Wed, 12 Jul 2017 17:50:46 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9528330913;\n\tWed, 12 Jul 2017 17:50:46 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6817C1C411B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 12 Jul 2017 17:50:43 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6268E89FE8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 12 Jul 2017 17:50:43 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id zIC02zF8hsfv for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 12 Jul 2017 17:50:42 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 0A7AD89FE9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 12 Jul 2017 17:50:42 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga104.jf.intel.com with ESMTP; 12 Jul 2017 10:50:41 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby FMSMGA003.fm.intel.com with ESMTP; 12 Jul 2017 10:50:41 -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.40,350,1496127600\"; d=\"scan'208\";a=\"878118666\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 12 Jul 2017 05:46:06 -0400", "Message-Id": "<20170712094614.76501-3-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170712094614.76501-1-alice.michael@intel.com>", "References": "<20170712094614.76501-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S75-V3 03/11] i40e: prevent changing\n\tITR if adaptive-rx/tx enabled", "X-BeenThere": "intel-wired-lan@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.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>", "MIME-Version": "1.0", "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: Alan Brady <alan.brady@intel.com>\n\nCurrently the driver allows the user to change (or even disable)\ninterrupt moderation if adaptive-rx/tx is enabled when this should\nnot be the case.\n\nAdaptive RX/TX will not respect the user's ITR settings so\nallowing the user to change it is weird. This bug would also\nallow the user to disable interrupt moderation with adaptive-rx/tx\nenabled which doesn't make much sense either.\n\nThis patch makes it such that if adaptive-rx/tx is enabled, the user\ncannot make any manual adjustments to interrupt moderation. It also\nmakes it so that if ITR is disabled but adaptive-rx/tx is then\nenabled, ITR will be re-enabled.\n\nSigned-off-by: Alan Brady <alan.brady@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 61 +++++++++++++++++---------\n 1 file changed, 41 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex a868c8d..b273c24 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2194,14 +2194,29 @@ static int __i40e_set_coalesce(struct net_device *netdev,\n \t\t\t int queue)\n {\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n+\tu16 intrl_reg, cur_rx_itr, cur_tx_itr;\n \tstruct i40e_vsi *vsi = np->vsi;\n \tstruct i40e_pf *pf = vsi->back;\n-\tu16 intrl_reg;\n \tint i;\n \n \tif (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)\n \t\tvsi->work_limit = ec->tx_max_coalesced_frames_irq;\n \n+\tif (queue < 0) {\n+\t\tcur_rx_itr = vsi->rx_rings[0]->rx_itr_setting;\n+\t\tcur_tx_itr = vsi->tx_rings[0]->tx_itr_setting;\n+\t} else if (queue < vsi->num_queue_pairs) {\n+\t\tcur_rx_itr = vsi->rx_rings[queue]->rx_itr_setting;\n+\t\tcur_tx_itr = vsi->tx_rings[queue]->tx_itr_setting;\n+\t} else {\n+\t\tnetif_info(pf, drv, netdev, \"Invalid queue value, queue range is 0 - %d\\n\",\n+\t\t\t vsi->num_queue_pairs - 1);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tcur_tx_itr &= ~I40E_ITR_DYNAMIC;\n+\tcur_rx_itr &= ~I40E_ITR_DYNAMIC;\n+\n \t/* tx_coalesce_usecs_high is ignored, use rx-usecs-high instead */\n \tif (ec->tx_coalesce_usecs_high != vsi->int_rate_limit) {\n \t\tnetif_info(pf, drv, netdev, \"tx-usecs-high is not used, please program rx-usecs-high\\n\");\n@@ -2214,15 +2229,34 @@ static int __i40e_set_coalesce(struct net_device *netdev,\n \t\treturn -EINVAL;\n \t}\n \n-\tif (ec->rx_coalesce_usecs == 0) {\n-\t\tif (ec->use_adaptive_rx_coalesce)\n-\t\t\tnetif_info(pf, drv, netdev, \"rx-usecs=0, need to disable adaptive-rx for a complete disable\\n\");\n-\t} else if ((ec->rx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||\n-\t\t (ec->rx_coalesce_usecs > (I40E_MAX_ITR << 1))) {\n+\tif (ec->rx_coalesce_usecs != cur_rx_itr &&\n+\t ec->use_adaptive_rx_coalesce) {\n+\t\tnetif_info(pf, drv, netdev, \"RX interrupt moderation cannot be changed if adaptive-rx is enabled.\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (ec->rx_coalesce_usecs > (I40E_MAX_ITR << 1)) {\n \t\t\tnetif_info(pf, drv, netdev, \"Invalid value, rx-usecs range is 0-8160\\n\");\n \t\t\treturn -EINVAL;\n \t}\n \n+\tif (ec->tx_coalesce_usecs != cur_tx_itr &&\n+\t ec->use_adaptive_tx_coalesce) {\n+\t\tnetif_info(pf, drv, netdev, \"TX interrupt moderation cannot be changed if adaptive-tx is enabled.\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (ec->tx_coalesce_usecs > (I40E_MAX_ITR << 1)) {\n+\t\tnetif_info(pf, drv, netdev, \"Invalid value, tx-usecs range is 0-8160\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (ec->use_adaptive_rx_coalesce && !cur_rx_itr)\n+\t\tec->rx_coalesce_usecs = I40E_MIN_ITR << 1;\n+\n+\tif (ec->use_adaptive_tx_coalesce && !cur_tx_itr)\n+\t\tec->tx_coalesce_usecs = I40E_MIN_ITR << 1;\n+\n \tintrl_reg = i40e_intrl_usec_to_reg(ec->rx_coalesce_usecs_high);\n \tvsi->int_rate_limit = INTRL_REG_TO_USEC(intrl_reg);\n \tif (vsi->int_rate_limit != ec->rx_coalesce_usecs_high) {\n@@ -2230,27 +2264,14 @@ static int __i40e_set_coalesce(struct net_device *netdev,\n \t\t\t vsi->int_rate_limit);\n \t}\n \n-\tif (ec->tx_coalesce_usecs == 0) {\n-\t\tif (ec->use_adaptive_tx_coalesce)\n-\t\t\tnetif_info(pf, drv, netdev, \"tx-usecs=0, need to disable adaptive-tx for a complete disable\\n\");\n-\t} else if ((ec->tx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||\n-\t\t (ec->tx_coalesce_usecs > (I40E_MAX_ITR << 1))) {\n-\t\t\tnetif_info(pf, drv, netdev, \"Invalid value, tx-usecs range is 0-8160\\n\");\n-\t\t\treturn -EINVAL;\n-\t}\n-\n \t/* rx and tx usecs has per queue value. If user doesn't specify the queue,\n \t * apply to all queues.\n \t */\n \tif (queue < 0) {\n \t\tfor (i = 0; i < vsi->num_queue_pairs; i++)\n \t\t\ti40e_set_itr_per_queue(vsi, ec, i);\n-\t} else if (queue < vsi->num_queue_pairs) {\n-\t\ti40e_set_itr_per_queue(vsi, ec, queue);\n \t} else {\n-\t\tnetif_info(pf, drv, netdev, \"Invalid queue value, queue range is 0 - %d\\n\",\n-\t\t\t vsi->num_queue_pairs - 1);\n-\t\treturn -EINVAL;\n+\t\ti40e_set_itr_per_queue(vsi, ec, queue);\n \t}\n \n \treturn 0;\n", "prefixes": [ "next", "S75-V3", "03/11" ] }