From: Dany Madden <drt@linux•ibm.com>
To: Sukadev Bhattiprolu <sukadev@linux•ibm.com>
Cc: netdev@vger•kernel.org, Brian King <brking@linux•ibm.com>,
cforno12@linux•ibm.com, Rick Lindsley <ricklind@linux•ibm.com>
Subject: Re: [PATCH net-next 4/9] ibmvnic: Use/rename local vars in init_tx_pools
Date: Tue, 31 Aug 2021 18:30:14 -0700 [thread overview]
Message-ID: <c79c0aed675aa2997866f4fe519fe561@imap.linux.ibm.com> (raw)
In-Reply-To: <20210901000812.120968-5-sukadev@linux.ibm.com>
On 2021-08-31 17:08, Sukadev Bhattiprolu wrote:
> Use/rename local variables in init_tx_pools() for consistency with
> init_rx_pools() and for readability. Also add some comments
>
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux•ibm.com>
Reviewed-by: Dany Madden <drt@linux•ibm.com>
> ---
> drivers/net/ethernet/ibm/ibmvnic.c | 30 ++++++++++++++++--------------
> 1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c
> b/drivers/net/ethernet/ibm/ibmvnic.c
> index a611bd3f2539..4c6739b250df 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -777,31 +777,31 @@ static void release_tx_pools(struct
> ibmvnic_adapter *adapter)
>
> static int init_one_tx_pool(struct net_device *netdev,
> struct ibmvnic_tx_pool *tx_pool,
> - int num_entries, int buf_size)
> + int pool_size, int buf_size)
> {
> struct ibmvnic_adapter *adapter = netdev_priv(netdev);
> int i;
>
> - tx_pool->tx_buff = kcalloc(num_entries,
> + tx_pool->tx_buff = kcalloc(pool_size,
> sizeof(struct ibmvnic_tx_buff),
> GFP_KERNEL);
> if (!tx_pool->tx_buff)
> return -1;
>
> if (alloc_long_term_buff(adapter, &tx_pool->long_term_buff,
> - num_entries * buf_size))
> + pool_size * buf_size))
> return -1;
>
> - tx_pool->free_map = kcalloc(num_entries, sizeof(int), GFP_KERNEL);
> + tx_pool->free_map = kcalloc(pool_size, sizeof(int), GFP_KERNEL);
> if (!tx_pool->free_map)
> return -1;
>
> - for (i = 0; i < num_entries; i++)
> + for (i = 0; i < pool_size; i++)
> tx_pool->free_map[i] = i;
>
> tx_pool->consumer_index = 0;
> tx_pool->producer_index = 0;
> - tx_pool->num_buffers = num_entries;
> + tx_pool->num_buffers = pool_size;
> tx_pool->buf_size = buf_size;
>
> return 0;
> @@ -811,17 +811,20 @@ static int init_tx_pools(struct net_device
> *netdev)
> {
> struct ibmvnic_adapter *adapter = netdev_priv(netdev);
> struct device *dev = &adapter->vdev->dev;
> - int tx_subcrqs;
> + int num_pools;
> + u64 pool_size; /* # of buffers in pool */
> u64 buff_size;
> int i, rc;
>
> - tx_subcrqs = adapter->num_active_tx_scrqs;
> - adapter->tx_pool = kcalloc(tx_subcrqs,
> + pool_size = adapter->req_tx_entries_per_subcrq;
> + num_pools = adapter->num_active_tx_scrqs;
> +
> + adapter->tx_pool = kcalloc(num_pools,
> sizeof(struct ibmvnic_tx_pool), GFP_KERNEL);
> if (!adapter->tx_pool)
> return -1;
>
> - adapter->tso_pool = kcalloc(tx_subcrqs,
> + adapter->tso_pool = kcalloc(num_pools,
> sizeof(struct ibmvnic_tx_pool), GFP_KERNEL);
> /* To simplify release_tx_pools() ensure that ->tx_pool and
> * ->tso_pool are either both NULL or both non-NULL.
> @@ -835,9 +838,9 @@ static int init_tx_pools(struct net_device *netdev)
> /* Set num_active_tx_pools early. If we fail below after partial
> * allocation, release_tx_pools() will know how many to look for.
> */
> - adapter->num_active_tx_pools = tx_subcrqs;
> + adapter->num_active_tx_pools = num_pools;
>
> - for (i = 0; i < tx_subcrqs; i++) {
> + for (i = 0; i < num_pools; i++) {
> buff_size = adapter->req_mtu + VLAN_HLEN;
> buff_size = ALIGN(buff_size, L1_CACHE_BYTES);
>
> @@ -845,8 +848,7 @@ static int init_tx_pools(struct net_device *netdev)
> i, adapter->req_tx_entries_per_subcrq, buff_size);
>
> rc = init_one_tx_pool(netdev, &adapter->tx_pool[i],
> - adapter->req_tx_entries_per_subcrq,
> - buff_size);
> + pool_size, buff_size);
> if (rc) {
> release_tx_pools(adapter);
> return rc;
next prev parent reply other threads:[~2021-09-01 1:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 0:08 [PATCH net-next 0/9] ibmvnic: Reuse ltb, rx, tx pools Sukadev Bhattiprolu
2021-09-01 0:08 ` [PATCH net-next 1/9] ibmvnic: Consolidate code in replenish_rx_pool() Sukadev Bhattiprolu
2021-09-01 1:26 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 2/9] ibmvnic: Fix up some comments and messages Sukadev Bhattiprolu
2021-09-01 1:28 ` Dany Madden
2021-09-01 8:58 ` kernel test robot
2021-09-01 0:08 ` [PATCH net-next 3/9] ibmvnic: Use/rename local vars in init_rx_pools Sukadev Bhattiprolu
2021-09-01 1:28 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 4/9] ibmvnic: Use/rename local vars in init_tx_pools Sukadev Bhattiprolu
2021-09-01 1:30 ` Dany Madden [this message]
2021-09-01 0:08 ` [PATCH net-next 5/9] ibmvnic: init_tx_pools move loop-invariant code out Sukadev Bhattiprolu
2021-09-01 1:32 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 6/9] ibmvnic: Use bitmap for LTB map_ids Sukadev Bhattiprolu
2021-09-01 1:33 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 7/9] ibmvnic: Reuse LTB when possible Sukadev Bhattiprolu
2021-09-01 1:34 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 8/9] ibmvnic: Reuse rx pools " Sukadev Bhattiprolu
2021-09-01 1:35 ` Dany Madden
2021-09-01 0:08 ` [PATCH net-next 9/9] ibmvnic: Reuse tx " Sukadev Bhattiprolu
2021-09-01 1:36 ` Dany Madden
2021-09-01 1:21 ` [PATCH net-next 0/9] ibmvnic: Reuse ltb, rx, tx pools Rick Lindsley
2021-09-01 2:35 ` Jakub Kicinski
2021-09-01 18:07 ` Sukadev Bhattiprolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c79c0aed675aa2997866f4fe519fe561@imap.linux.ibm.com \
--to=drt@linux$(echo .)ibm.com \
--cc=brking@linux$(echo .)ibm.com \
--cc=cforno12@linux$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ricklind@linux$(echo .)ibm.com \
--cc=sukadev@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox