Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1184480/?format=api
{ "id": 1184480, "url": "http://patchwork.ozlabs.org/api/patches/1184480/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191025143441.50151-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": "<20191025143441.50151-5-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-10-25T14:34:31", "name": "[S32,05/15] ice: Fix to change Rx/Tx ring descriptor size via ethtool with DCBx", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7da0631325a5012a11478eebd4be4d439374ec30", "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/20191025143441.50151-5-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 138814, "url": "http://patchwork.ozlabs.org/api/series/138814/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=138814", "date": "2019-10-25T14:34:39", "name": "[S32,01/15] ice: Use ice_ena_vsi and ice_dis_vsi in DCB configuration flow", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/138814/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1184480/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1184480/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.136;\n\thelo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 470KTK4kxLz9sP4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 26 Oct 2019 10:05:25 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id EB73023B31;\n\tFri, 25 Oct 2019 23:05:23 +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 3Fu0je+hWBp4; Fri, 25 Oct 2019 23:05:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2D31824AFE;\n\tFri, 25 Oct 2019 23:05:19 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C930F1BF9CC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 25 Oct 2019 23:05:13 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C2D4F87A74\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 25 Oct 2019 23:05:13 +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 2cpbR6tHOLth for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 25 Oct 2019 23:05:12 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id E92B287A05\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 25 Oct 2019 23:05:11 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Oct 2019 16:05:09 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga002.jf.intel.com with ESMTP; 25 Oct 2019 16:05:08 -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.68,230,1569308400\"; d=\"scan'208\";a=\"210868740\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 25 Oct 2019 07:34:31 -0700", "Message-Id": "<20191025143441.50151-5-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191025143441.50151-1-anthony.l.nguyen@intel.com>", "References": "<20191025143441.50151-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S32 05/15] ice: Fix to change Rx/Tx ring\n\tdescriptor size via ethtool with DCBx", "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: Usha Ketineni <usha.k.ketineni@intel.com>\n\nThis patch fixes the call trace caused by the kernel when the Rx/Tx\ndescriptor size change request is initiated via ethtool when DCB is\nconfigured. ice_set_ringparam() should use vsi->num_txq instead of\nvsi->alloc_txq as it represents the queues that are enabled in the\ndriver when DCB is enabled/disabled. Otherwise, queue index being\nused can go out of range.\n\nFor example, when vsi->alloc_txq has 104 queues and with 3 TCS enabled\nvia DCB, each TC gets 34 queues, vsi->num_txq will be 102 and only 102\nqueues will be enabled.\n\nSigned-off-by: Usha Ketineni <usha.k.ketineni@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 14 +++++++-------\n 1 file changed, 7 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 67d884e27ea4..3b9d33ad23d8 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -2743,14 +2743,14 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \tnetdev_info(netdev, \"Changing Tx descriptor count from %d to %d\\n\",\n \t\t vsi->tx_rings[0]->count, new_tx_cnt);\n \n-\ttx_rings = devm_kcalloc(&pf->pdev->dev, vsi->alloc_txq,\n+\ttx_rings = devm_kcalloc(&pf->pdev->dev, vsi->num_txq,\n \t\t\t\tsizeof(*tx_rings), GFP_KERNEL);\n \tif (!tx_rings) {\n \t\terr = -ENOMEM;\n \t\tgoto done;\n \t}\n \n-\tfor (i = 0; i < vsi->alloc_txq; i++) {\n+\tice_for_each_txq(vsi, i) {\n \t\t/* clone ring and setup updated count */\n \t\ttx_rings[i] = *vsi->tx_rings[i];\n \t\ttx_rings[i].count = new_tx_cnt;\n@@ -2803,14 +2803,14 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \tnetdev_info(netdev, \"Changing Rx descriptor count from %d to %d\\n\",\n \t\t vsi->rx_rings[0]->count, new_rx_cnt);\n \n-\trx_rings = devm_kcalloc(&pf->pdev->dev, vsi->alloc_rxq,\n+\trx_rings = devm_kcalloc(&pf->pdev->dev, vsi->num_rxq,\n \t\t\t\tsizeof(*rx_rings), GFP_KERNEL);\n \tif (!rx_rings) {\n \t\terr = -ENOMEM;\n \t\tgoto done;\n \t}\n \n-\tfor (i = 0; i < vsi->alloc_rxq; i++) {\n+\tice_for_each_rxq(vsi, i) {\n \t\t/* clone ring and setup updated count */\n \t\trx_rings[i] = *vsi->rx_rings[i];\n \t\trx_rings[i].count = new_rx_cnt;\n@@ -2848,7 +2848,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \t\tice_down(vsi);\n \n \t\tif (tx_rings) {\n-\t\t\tfor (i = 0; i < vsi->alloc_txq; i++) {\n+\t\t\tice_for_each_txq(vsi, i) {\n \t\t\t\tice_free_tx_ring(vsi->tx_rings[i]);\n \t\t\t\t*vsi->tx_rings[i] = tx_rings[i];\n \t\t\t}\n@@ -2856,7 +2856,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \t\t}\n \n \t\tif (rx_rings) {\n-\t\t\tfor (i = 0; i < vsi->alloc_rxq; i++) {\n+\t\t\tice_for_each_rxq(vsi, i) {\n \t\t\t\tice_free_rx_ring(vsi->rx_rings[i]);\n \t\t\t\t/* copy the real tail offset */\n \t\t\t\trx_rings[i].tail = vsi->rx_rings[i]->tail;\n@@ -2890,7 +2890,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n free_tx:\n \t/* error cleanup if the Rx allocations failed after getting Tx */\n \tif (tx_rings) {\n-\t\tfor (i = 0; i < vsi->alloc_txq; i++)\n+\t\tice_for_each_txq(vsi, i)\n \t\t\tice_free_tx_ring(&tx_rings[i]);\n \t\tdevm_kfree(&pf->pdev->dev, tx_rings);\n \t}\n", "prefixes": [ "S32", "05/15" ] }