Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1106462/?format=api
{ "id": 1106462, "url": "http://patchwork.ozlabs.org/api/patches/1106462/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190528175921.30534-6-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": "<20190528175921.30534-6-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-05-28T17:59:20", "name": "[next,S6,6/7] i40e: Fix descriptor count manipulation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7b3d3d0d3ad5668857c1ef6a9245f2458c3d6bce", "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/20190528175921.30534-6-alice.michael@intel.com/mbox/", "series": [ { "id": 110396, "url": "http://patchwork.ozlabs.org/api/series/110396/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=110396", "date": "2019-05-28T17:59:15", "name": "[next,S6,1/7] i40e: fix 'Unknown bps' in dmesg for 2.5Gb/5Gb speeds", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/110396/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1106462/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1106462/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 45D1pH1457z9s4V\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 29 May 2019 04:00:07 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A78E385521;\n\tTue, 28 May 2019 18:00:05 +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 tTYhXTodJReq; Tue, 28 May 2019 18:00:03 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9F90E854E0;\n\tTue, 28 May 2019 18:00:03 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id A9C3D1BF2A1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 28 May 2019 18:00:00 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A774122219\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 28 May 2019 18:00:00 +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 cFb3i6e1nmiJ for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 28 May 2019 17:59:57 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 8B76F2156F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 28 May 2019 17:59:57 +0000 (UTC)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 May 2019 10:59:56 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga008.jf.intel.com with ESMTP; 28 May 2019 10:59:56 -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", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.micheal@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 28 May 2019 10:59:20 -0700", "Message-Id": "<20190528175921.30534-6-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190528175921.30534-1-alice.michael@intel.com>", "References": "<20190528175921.30534-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S6 6/7] i40e: Fix descriptor count\n\tmanipulation", "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>", "Cc": "Maciej Fijalkowski <maciej.fijalkowski@intel.com>", "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: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\n\nChanging descriptor count via 'ethtool -G' is not persistent across resets.\nWhen PF reset occurs, we roll back to the default value of vsi->num_desc,\nwhich is used then in i40e_alloc_rings to set descriptor count. XDP does a\nPF reset so when user has changed the descriptor count and load XDP\nprogram, the default count will be back there.\n\nTo fix this:\n * introduce new VSI members - num_tx_desc and num_rx_desc in favour of\n num_desc\n * set them in i40e_set_ringparam to user's values\n * set them to default values in i40e_set_num_rings_in_vsi only when they\n don't have previous values\n\nSigned-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 3 +-\n .../net/ethernet/intel/i40e/i40e_debugfs.c | 5 +--\n .../net/ethernet/intel/i40e/i40e_ethtool.c | 4 +++\n drivers/net/ethernet/intel/i40e/i40e_main.c | 36 +++++++++++++------\n 4 files changed, 34 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 1da53c0d49ca..423ee9fa94d6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -795,7 +795,8 @@ struct i40e_vsi {\n \tu16 alloc_queue_pairs;\t/* Allocated Tx/Rx queues */\n \tu16 req_queue_pairs;\t/* User requested queue pairs */\n \tu16 num_queue_pairs;\t/* Used tx and rx pairs */\n-\tu16 num_desc;\n+\tu16 num_tx_desc;\n+\tu16 num_rx_desc;\n \tenum i40e_vsi_type type; /* VSI type, e.g., LAN, FCoE, etc */\n \ts16 vf_id;\t\t/* Virtual function ID for SRIOV VSIs */\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\nindex dc5b40013e61..55d20acfcf70 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n@@ -333,8 +333,9 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)\n \t\t \" seid = %d, id = %d, uplink_seid = %d\\n\",\n \t\t vsi->seid, vsi->id, vsi->uplink_seid);\n \tdev_info(&pf->pdev->dev,\n-\t\t \" base_queue = %d, num_queue_pairs = %d, num_desc = %d\\n\",\n-\t\t vsi->base_queue, vsi->num_queue_pairs, vsi->num_desc);\n+\t\t \" base_queue = %d, num_queue_pairs = %d, num_tx_desc = %d, num_rx_desc = %d\\n\",\n+\t\t vsi->base_queue, vsi->num_queue_pairs, vsi->num_tx_desc,\n+\t\t vsi->num_rx_desc);\n \tdev_info(&pf->pdev->dev, \" type = %i\\n\", vsi->type);\n \tif (vsi->type == I40E_VSI_SRIOV)\n \t\tdev_info(&pf->pdev->dev, \" VF ID = %i\\n\", vsi->vf_id);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex bc70b0d581a1..b7f4ac9a423c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1982,6 +1982,8 @@ static int i40e_set_ringparam(struct net_device *netdev,\n \t\t\tif (i40e_enabled_xdp_vsi(vsi))\n \t\t\t\tvsi->xdp_rings[i]->count = new_tx_count;\n \t\t}\n+\t\tvsi->num_tx_desc = new_tx_count;\n+\t\tvsi->num_rx_desc = new_rx_count;\n \t\tgoto done;\n \t}\n \n@@ -2118,6 +2120,8 @@ static int i40e_set_ringparam(struct net_device *netdev,\n \t\trx_rings = NULL;\n \t}\n \n+\tvsi->num_tx_desc = new_tx_count;\n+\tvsi->num_rx_desc = new_rx_count;\n \ti40e_up(vsi);\n \n free_tx:\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 1dd5fcf256ef..fb25e8222fb5 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -10550,8 +10550,12 @@ static int i40e_set_num_rings_in_vsi(struct i40e_vsi *vsi)\n \tswitch (vsi->type) {\n \tcase I40E_VSI_MAIN:\n \t\tvsi->alloc_queue_pairs = pf->num_lan_qps;\n-\t\tvsi->num_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n-\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tif (!vsi->num_tx_desc)\n+\t\t\tvsi->num_tx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n+\t\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tif (!vsi->num_rx_desc)\n+\t\t\tvsi->num_rx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n+\t\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n \t\tif (pf->flags & I40E_FLAG_MSIX_ENABLED)\n \t\t\tvsi->num_q_vectors = pf->num_lan_msix;\n \t\telse\n@@ -10561,22 +10565,32 @@ static int i40e_set_num_rings_in_vsi(struct i40e_vsi *vsi)\n \n \tcase I40E_VSI_FDIR:\n \t\tvsi->alloc_queue_pairs = 1;\n-\t\tvsi->num_desc = ALIGN(I40E_FDIR_RING_COUNT,\n-\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tvsi->num_tx_desc = ALIGN(I40E_FDIR_RING_COUNT,\n+\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tvsi->num_rx_desc = ALIGN(I40E_FDIR_RING_COUNT,\n+\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n \t\tvsi->num_q_vectors = pf->num_fdsb_msix;\n \t\tbreak;\n \n \tcase I40E_VSI_VMDQ2:\n \t\tvsi->alloc_queue_pairs = pf->num_vmdq_qps;\n-\t\tvsi->num_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n-\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tif (!vsi->num_tx_desc)\n+\t\t\tvsi->num_tx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n+\t\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tif (!vsi->num_rx_desc)\n+\t\t\tvsi->num_rx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n+\t\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n \t\tvsi->num_q_vectors = pf->num_vmdq_msix;\n \t\tbreak;\n \n \tcase I40E_VSI_SRIOV:\n \t\tvsi->alloc_queue_pairs = pf->num_vf_qps;\n-\t\tvsi->num_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n-\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tif (!vsi->num_tx_desc)\n+\t\t\tvsi->num_tx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n+\t\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n+\t\tif (!vsi->num_rx_desc)\n+\t\t\tvsi->num_rx_desc = ALIGN(I40E_DEFAULT_NUM_DESCRIPTORS,\n+\t\t\t\t\t\t I40E_REQ_DESCRIPTOR_MULTIPLE);\n \t\tbreak;\n \n \tdefault:\n@@ -10852,7 +10866,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)\n \t\tring->vsi = vsi;\n \t\tring->netdev = vsi->netdev;\n \t\tring->dev = &pf->pdev->dev;\n-\t\tring->count = vsi->num_desc;\n+\t\tring->count = vsi->num_tx_desc;\n \t\tring->size = 0;\n \t\tring->dcb_tc = 0;\n \t\tif (vsi->back->hw_features & I40E_HW_WB_ON_ITR_CAPABLE)\n@@ -10869,7 +10883,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)\n \t\tring->vsi = vsi;\n \t\tring->netdev = NULL;\n \t\tring->dev = &pf->pdev->dev;\n-\t\tring->count = vsi->num_desc;\n+\t\tring->count = vsi->num_tx_desc;\n \t\tring->size = 0;\n \t\tring->dcb_tc = 0;\n \t\tif (vsi->back->hw_features & I40E_HW_WB_ON_ITR_CAPABLE)\n@@ -10885,7 +10899,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)\n \t\tring->vsi = vsi;\n \t\tring->netdev = vsi->netdev;\n \t\tring->dev = &pf->pdev->dev;\n-\t\tring->count = vsi->num_desc;\n+\t\tring->count = vsi->num_rx_desc;\n \t\tring->size = 0;\n \t\tring->dcb_tc = 0;\n \t\tring->itr_setting = pf->rx_itr_default;\n", "prefixes": [ "next", "S6", "6/7" ] }