netdev - Re: [PATCH net-next 3/9] ibmvnic: Use/rename local vars in init_rx

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 31 Aug 2021 18:28:53 -0700
From:   Dany Madden <drt@...ux.ibm.com>
To:     Sukadev Bhattiprolu <sukadev@...ux.ibm.com>
Cc:     netdev@...r.kernel.org, Brian King <brking@...ux.ibm.com>,
        cforno12@...ux.ibm.com, Rick Lindsley <ricklind@...ux.ibm.com>
Subject: Re: [PATCH net-next 3/9] ibmvnic: Use/rename local vars in
 init_rx_pools

On 2021-08-31 17:08, Sukadev Bhattiprolu wrote:
> To make the code more readable, use/rename some local variables.
> Basically we have a set of pools, num_pools. Each pool has a set of
> buffers, pool_size and each buffer is of size buff_size.
> 
> pool_size is a bit ambiguous (whether size in bytes or buffers). Add
> a comment in the header file to make it explicit.
> 
> Signed-off-by: Sukadev Bhattiprolu <sukadev@...ux.ibm.com>
Reviewed-by: Dany Madden <drt@...ux.ibm.com>

> ---
>  drivers/net/ethernet/ibm/ibmvnic.c | 17 +++++++++--------
>  drivers/net/ethernet/ibm/ibmvnic.h |  2 +-
>  2 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c
> b/drivers/net/ethernet/ibm/ibmvnic.c
> index 911315b10731..a611bd3f2539 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -618,14 +618,16 @@ static int init_rx_pools(struct net_device 
> *netdev)
>  	struct ibmvnic_adapter *adapter = netdev_priv(netdev);
>  	struct device *dev = &adapter->vdev->dev;
>  	struct ibmvnic_rx_pool *rx_pool;
> -	int rxadd_subcrqs;
> +	u64 num_pools;
> +	u64 pool_size;		/* # of buffers in one pool */
>  	u64 buff_size;
>  	int i, j;
> 
> -	rxadd_subcrqs = adapter->num_active_rx_scrqs;
> +	num_pools = adapter->num_active_rx_scrqs;
> +	pool_size = adapter->req_rx_add_entries_per_subcrq;
>  	buff_size = adapter->cur_rx_buf_sz;
> 
> -	adapter->rx_pool = kcalloc(rxadd_subcrqs,
> +	adapter->rx_pool = kcalloc(num_pools,
>  				   sizeof(struct ibmvnic_rx_pool),
>  				   GFP_KERNEL);
>  	if (!adapter->rx_pool) {
> @@ -636,17 +638,16 @@ static int init_rx_pools(struct net_device 
> *netdev)
>  	/* Set num_active_rx_pools early. If we fail below after partial
>  	 * allocation, release_rx_pools() will know how many to look for.
>  	 */
> -	adapter->num_active_rx_pools = rxadd_subcrqs;
> +	adapter->num_active_rx_pools = num_pools;
> 
> -	for (i = 0; i < rxadd_subcrqs; i++) {
> +	for (i = 0; i < num_pools; i++) {
>  		rx_pool = &adapter->rx_pool[i];
> 
>  		netdev_dbg(adapter->netdev,
>  			   "Initializing rx_pool[%d], %lld buffs, %lld bytes each\n",
> -			   i, adapter->req_rx_add_entries_per_subcrq,
> -			   buff_size);
> +			   i, pool_size, buff_size);
> 
> -		rx_pool->size = adapter->req_rx_add_entries_per_subcrq;
> +		rx_pool->size = pool_size;
>  		rx_pool->index = i;
>  		rx_pool->buff_size = ALIGN(buff_size, L1_CACHE_BYTES);
>  		rx_pool->active = 1;
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.h
> b/drivers/net/ethernet/ibm/ibmvnic.h
> index 22df602323bc..5652566818fb 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.h
> +++ b/drivers/net/ethernet/ibm/ibmvnic.h
> @@ -827,7 +827,7 @@ struct ibmvnic_rx_buff {
> 
>  struct ibmvnic_rx_pool {
>  	struct ibmvnic_rx_buff *rx_buff;
> -	int size;
> +	int size;			/* # of buffers in the pool */
>  	int index;
>  	int buff_size;
>  	atomic_t available;