Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/536391/?format=api
{ "id": 536391, "url": "http://patchwork.ozlabs.org/api/patches/536391/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445903081-155893-15-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": "<1445903081-155893-15-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-26T23:44:40", "name": "[next,S20,14/15] i40evf: allocate ring structs dynamically", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f3be4c408cd2784b0826be6f41f570d087be9da7", "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/1445903081-155893-15-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/536391/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/536391/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id D3795141333\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 27 Oct 2015 10:46:03 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1F7B9329CA;\n\tMon, 26 Oct 2015 23:46:03 +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 8feDBIL-8mhg; Mon, 26 Oct 2015 23:45:59 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id EEC3231BBF;\n\tMon, 26 Oct 2015 23:45:57 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id F1DEC1CEEC7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:56 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E791288BB5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:56 +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 yP8L24PYniTe for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:55 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D2B108C293\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 26 Oct 2015 23:45:55 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga101.jf.intel.com with ESMTP; 26 Oct 2015 16:45:41 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 26 Oct 2015 16:45:42 -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.20,202,1444719600\"; d=\"scan'208\";a=\"588532696\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 26 Oct 2015 19:44:40 -0400", "Message-Id": "<1445903081-155893-15-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1445903081-155893-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1445903081-155893-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S20 14/15] i40evf: allocate ring\n\tstructs dynamically", "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: Mitch Williams <mitch.a.williams@intel.com>\n\nInstead of awkwardly keeping a fixed array of pointers in the adapter\nstruct and then allocating ring structs individually, just keep a single\npointer and allocate a single blob for the arrays. This simplifies code,\nshrinks the adapter structure, and future-proofs the driver by not\nlimiting the number of rings we can handle.\n\nSigned-off-by: Mitch Williams <mitch.a.williams@intel.com>\nChange-ID: I31334ff911a6474954232cfe4bc98ccca3c769ff\n\n---\nTesting-hints: Ensure the driver loads and passes traffic, and unloads\nproperly.\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +-\n drivers/net/ethernet/intel/i40evf/i40evf.h | 4 +-\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 8 +--\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 57 +++++++++++-----------\n .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 10 ++--\n 5 files changed, 40 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 35fc721..3725744 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -2064,7 +2064,7 @@ out_drop:\n netdev_tx_t i40evf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)\n {\n \tstruct i40evf_adapter *adapter = netdev_priv(netdev);\n-\tstruct i40e_ring *tx_ring = adapter->tx_rings[skb->queue_mapping];\n+\tstruct i40e_ring *tx_ring = &adapter->tx_rings[skb->queue_mapping];\n \n \t/* hardware can't handle really short frames, hardware padding works\n \t * beyond this point\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex bd185ad..a6318c4 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -196,13 +196,13 @@ struct i40evf_adapter {\n \tint num_active_queues;\n \n \t/* TX */\n-\tstruct i40e_ring *tx_rings[I40E_MAX_VSI_QP];\n+\tstruct i40e_ring *tx_rings;\n \tu32 tx_timeout_count;\n \tstruct list_head mac_filter_list;\n \tu32 tx_desc_count;\n \n \t/* RX */\n-\tstruct i40e_ring *rx_rings[I40E_MAX_VSI_QP];\n+\tstruct i40e_ring *rx_rings;\n \tu64 hw_csum_rx_error;\n \tu32 rx_desc_count;\n \tint num_msix_vectors;\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\nindex ec059b3..2e5c940 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -121,12 +121,12 @@ static void i40evf_get_ethtool_stats(struct net_device *netdev,\n \t\tdata[i] = *(u64 *)p;\n \t}\n \tfor (j = 0; j < adapter->num_active_queues; j++) {\n-\t\tdata[i++] = adapter->tx_rings[j]->stats.packets;\n-\t\tdata[i++] = adapter->tx_rings[j]->stats.bytes;\n+\t\tdata[i++] = adapter->tx_rings[j].stats.packets;\n+\t\tdata[i++] = adapter->tx_rings[j].stats.bytes;\n \t}\n \tfor (j = 0; j < adapter->num_active_queues; j++) {\n-\t\tdata[i++] = adapter->rx_rings[j]->stats.packets;\n-\t\tdata[i++] = adapter->rx_rings[j]->stats.bytes;\n+\t\tdata[i++] = adapter->rx_rings[j].stats.packets;\n+\t\tdata[i++] = adapter->rx_rings[j].stats.bytes;\n \t}\n }\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex d12bd56..67a2b47 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -348,7 +348,7 @@ static void\n i40evf_map_vector_to_rxq(struct i40evf_adapter *adapter, int v_idx, int r_idx)\n {\n \tstruct i40e_q_vector *q_vector = &adapter->q_vectors[v_idx];\n-\tstruct i40e_ring *rx_ring = adapter->rx_rings[r_idx];\n+\tstruct i40e_ring *rx_ring = &adapter->rx_rings[r_idx];\n \n \trx_ring->q_vector = q_vector;\n \trx_ring->next = q_vector->rx.ring;\n@@ -369,7 +369,7 @@ static void\n i40evf_map_vector_to_txq(struct i40evf_adapter *adapter, int v_idx, int t_idx)\n {\n \tstruct i40e_q_vector *q_vector = &adapter->q_vectors[v_idx];\n-\tstruct i40e_ring *tx_ring = adapter->tx_rings[t_idx];\n+\tstruct i40e_ring *tx_ring = &adapter->tx_rings[t_idx];\n \n \ttx_ring->q_vector = q_vector;\n \ttx_ring->next = q_vector->tx.ring;\n@@ -610,7 +610,7 @@ static void i40evf_configure_tx(struct i40evf_adapter *adapter)\n \tint i;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++)\n-\t\tadapter->tx_rings[i]->tail = hw->hw_addr + I40E_QTX_TAIL1(i);\n+\t\tadapter->tx_rings[i].tail = hw->hw_addr + I40E_QTX_TAIL1(i);\n }\n \n /**\n@@ -655,8 +655,8 @@ static void i40evf_configure_rx(struct i40evf_adapter *adapter)\n \t}\n \n \tfor (i = 0; i < adapter->num_active_queues; i++) {\n-\t\tadapter->rx_rings[i]->tail = hw->hw_addr + I40E_QRX_TAIL1(i);\n-\t\tadapter->rx_rings[i]->rx_buf_len = rx_buf_len;\n+\t\tadapter->rx_rings[i].tail = hw->hw_addr + I40E_QRX_TAIL1(i);\n+\t\tadapter->rx_rings[i].rx_buf_len = rx_buf_len;\n \t}\n }\n \n@@ -991,7 +991,7 @@ static void i40evf_configure(struct i40evf_adapter *adapter)\n \tadapter->aq_required |= I40EVF_FLAG_AQ_CONFIGURE_QUEUES;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++) {\n-\t\tstruct i40e_ring *ring = adapter->rx_rings[i];\n+\t\tstruct i40e_ring *ring = &adapter->rx_rings[i];\n \n \t\ti40evf_alloc_rx_buffers_1buf(ring, ring->count);\n \t\tring->next_to_use = ring->count - 1;\n@@ -1111,16 +1111,10 @@ i40evf_acquire_msix_vectors(struct i40evf_adapter *adapter, int vectors)\n **/\n static void i40evf_free_queues(struct i40evf_adapter *adapter)\n {\n-\tint i;\n-\n \tif (!adapter->vsi_res)\n \t\treturn;\n-\tfor (i = 0; i < adapter->num_active_queues; i++) {\n-\t\tif (adapter->tx_rings[i])\n-\t\t\tkfree_rcu(adapter->tx_rings[i], rcu);\n-\t\tadapter->tx_rings[i] = NULL;\n-\t\tadapter->rx_rings[i] = NULL;\n-\t}\n+\tkfree(adapter->tx_rings);\n+\tkfree(adapter->rx_rings);\n }\n \n /**\n@@ -1135,13 +1129,20 @@ static int i40evf_alloc_queues(struct i40evf_adapter *adapter)\n {\n \tint i;\n \n+\tadapter->tx_rings = kcalloc(adapter->num_active_queues,\n+\t\t\t\t sizeof(struct i40e_ring), GFP_KERNEL);\n+\tif (!adapter->tx_rings)\n+\t\tgoto err_out;\n+\tadapter->rx_rings = kcalloc(adapter->num_active_queues,\n+\t\t\t\t sizeof(struct i40e_ring), GFP_KERNEL);\n+\tif (!adapter->rx_rings)\n+\t\tgoto err_out;\n+\n \tfor (i = 0; i < adapter->num_active_queues; i++) {\n \t\tstruct i40e_ring *tx_ring;\n \t\tstruct i40e_ring *rx_ring;\n \n-\t\ttx_ring = kzalloc(sizeof(*tx_ring) * 2, GFP_KERNEL);\n-\t\tif (!tx_ring)\n-\t\t\tgoto err_out;\n+\t\ttx_ring = &adapter->tx_rings[i];\n \n \t\ttx_ring->queue_index = i;\n \t\ttx_ring->netdev = adapter->netdev;\n@@ -1149,14 +1150,12 @@ static int i40evf_alloc_queues(struct i40evf_adapter *adapter)\n \t\ttx_ring->count = adapter->tx_desc_count;\n \t\tif (adapter->flags & I40E_FLAG_WB_ON_ITR_CAPABLE)\n \t\t\ttx_ring->flags |= I40E_TXR_FLAGS_WB_ON_ITR;\n-\t\tadapter->tx_rings[i] = tx_ring;\n \n-\t\trx_ring = &tx_ring[1];\n+\t\trx_ring = &adapter->rx_rings[i];\n \t\trx_ring->queue_index = i;\n \t\trx_ring->netdev = adapter->netdev;\n \t\trx_ring->dev = &adapter->pdev->dev;\n \t\trx_ring->count = adapter->rx_desc_count;\n-\t\tadapter->rx_rings[i] = rx_ring;\n \t}\n \n \treturn 0;\n@@ -1487,7 +1486,7 @@ static int i40evf_alloc_q_vectors(struct i40evf_adapter *adapter)\n \tstruct i40e_q_vector *q_vector;\n \n \tnum_q_vectors = adapter->num_msix_vectors - NONQ_VECS;\n-\tadapter->q_vectors = kzalloc(sizeof(*q_vector) * num_q_vectors,\n+\tadapter->q_vectors = kcalloc(num_q_vectors, sizeof(*q_vector),\n \t\t\t\t GFP_KERNEL);\n \tif (!adapter->q_vectors)\n \t\tgoto err_out;\n@@ -2035,8 +2034,8 @@ void i40evf_free_all_tx_resources(struct i40evf_adapter *adapter)\n \tint i;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++)\n-\t\tif (adapter->tx_rings[i]->desc)\n-\t\t\ti40evf_free_tx_resources(adapter->tx_rings[i]);\n+\t\tif (adapter->tx_rings[i].desc)\n+\t\t\ti40evf_free_tx_resources(&adapter->tx_rings[i]);\n }\n \n /**\n@@ -2054,8 +2053,8 @@ static int i40evf_setup_all_tx_resources(struct i40evf_adapter *adapter)\n \tint i, err = 0;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++) {\n-\t\tadapter->tx_rings[i]->count = adapter->tx_desc_count;\n-\t\terr = i40evf_setup_tx_descriptors(adapter->tx_rings[i]);\n+\t\tadapter->tx_rings[i].count = adapter->tx_desc_count;\n+\t\terr = i40evf_setup_tx_descriptors(&adapter->tx_rings[i]);\n \t\tif (!err)\n \t\t\tcontinue;\n \t\tdev_err(&adapter->pdev->dev,\n@@ -2081,8 +2080,8 @@ static int i40evf_setup_all_rx_resources(struct i40evf_adapter *adapter)\n \tint i, err = 0;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++) {\n-\t\tadapter->rx_rings[i]->count = adapter->rx_desc_count;\n-\t\terr = i40evf_setup_rx_descriptors(adapter->rx_rings[i]);\n+\t\tadapter->rx_rings[i].count = adapter->rx_desc_count;\n+\t\terr = i40evf_setup_rx_descriptors(&adapter->rx_rings[i]);\n \t\tif (!err)\n \t\t\tcontinue;\n \t\tdev_err(&adapter->pdev->dev,\n@@ -2103,8 +2102,8 @@ void i40evf_free_all_rx_resources(struct i40evf_adapter *adapter)\n \tint i;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++)\n-\t\tif (adapter->rx_rings[i]->desc)\n-\t\t\ti40evf_free_rx_resources(adapter->rx_rings[i]);\n+\t\tif (adapter->rx_rings[i].desc)\n+\t\t\ti40evf_free_rx_resources(&adapter->rx_rings[i]);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\nindex 24b3af3..9b55576 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\n@@ -255,19 +255,19 @@ void i40evf_configure_queues(struct i40evf_adapter *adapter)\n \tfor (i = 0; i < pairs; i++) {\n \t\tvqpi->txq.vsi_id = vqci->vsi_id;\n \t\tvqpi->txq.queue_id = i;\n-\t\tvqpi->txq.ring_len = adapter->tx_rings[i]->count;\n-\t\tvqpi->txq.dma_ring_addr = adapter->tx_rings[i]->dma;\n+\t\tvqpi->txq.ring_len = adapter->tx_rings[i].count;\n+\t\tvqpi->txq.dma_ring_addr = adapter->tx_rings[i].dma;\n \t\tvqpi->txq.headwb_enabled = 1;\n \t\tvqpi->txq.dma_headwb_addr = vqpi->txq.dma_ring_addr +\n \t\t (vqpi->txq.ring_len * sizeof(struct i40e_tx_desc));\n \n \t\tvqpi->rxq.vsi_id = vqci->vsi_id;\n \t\tvqpi->rxq.queue_id = i;\n-\t\tvqpi->rxq.ring_len = adapter->rx_rings[i]->count;\n-\t\tvqpi->rxq.dma_ring_addr = adapter->rx_rings[i]->dma;\n+\t\tvqpi->rxq.ring_len = adapter->rx_rings[i].count;\n+\t\tvqpi->rxq.dma_ring_addr = adapter->rx_rings[i].dma;\n \t\tvqpi->rxq.max_pkt_size = adapter->netdev->mtu\n \t\t\t\t\t+ ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;\n-\t\tvqpi->rxq.databuffer_size = adapter->rx_rings[i]->rx_buf_len;\n+\t\tvqpi->rxq.databuffer_size = adapter->rx_rings[i].rx_buf_len;\n \t\tvqpi++;\n \t}\n \n", "prefixes": [ "next", "S20", "14/15" ] }