Received-SPF: pass (google.com: domain of linux-kernel+bounces-43192-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <261b8a96-cbdf-4c50-9aee-a70d04d99644@amd.com>
Date: Mon, 29 Jan 2024 09:13:33 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH net v2] octeontx2-af: Initialize bitmap arrays.
Content-Language: en-US
To: Ratheesh Kannoth <rkannoth@marvell.com>, netdev@vger.kernel.org,
 linux-kernel@vger.kernel.org
Cc: sgoutham@marvell.com, davem@davemloft.net, edumazet@google.com,
 horms@kernel.org, kuba@kernel.org, pabeni@redhat.com, sbhatta@marvell.com,
 gakula@marvell.com, hkelam@marvell.com, sumang@marvell.com
References: <20240129052319.4093083-1-rkannoth@marvell.com>
From: Brett Creeley <bcreeley@amd.com>
In-Reply-To: <20240129052319.4093083-1-rkannoth@marvell.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?WUpidk5QdlF5aHQzeXdMRWloRHA4M3VoWFFsYjBVRXk4b3hZejlNQWVwRjlX?=
 =?utf-8?B?V3FDNWhHd0lOc3dPRzVsdGpvOTJVSWhIalhMNThEZmljckFqY1V6MDk4REZv?=
 =?utf-8?B?N0ZZazNvSHRZY1BJWGQ2eThrYmVTQzVwU0owV2E5SXlDeXVWYTVXUGhkanJ2?=
 =?utf-8?B?b2pjWlN0MmNPQ0hCaUdEUk8vUDNlbjBkZTlPaHJFM3AxZUJqbFladWRHeGdO?=
 =?utf-8?B?US9oL1UwQnNVbS9FUnErbUVRa201UXI4aDB3Uk56U3VKMkVHZkdzUUFWS0Qv?=
 =?utf-8?B?cmJET0RrZ3Q3YW1zbUdWc0NoblNoa0VEWStuSVBOUWV0RUw3OTUxMlMySHFt?=
 =?utf-8?B?N1dibG8yUXdMQUk3dXUwRUtIVjRQMlJJMHNLbjgwcjFGSzBHdWthaDJaWXhG?=
 =?utf-8?B?L081K3MyTzkzb3ZGeFMveFlKYWY3RjJqTUp2VG50dEpuN2JpWGdPSWIzTzZa?=
 =?utf-8?B?b0hZanQrRWRDUDZxbU1zRjdiU0RKUW0rWlFQS2NNUmY3eWJvN1k3NUZrM2Zz?=
 =?utf-8?B?WVlKQ2VxSEJwVHp2LzlON2dmNzB6ZXdJaVVOaEtTcE1mVjlxaTBxdyswUDRE?=
 =?utf-8?B?a1BOOFNUR3oxQUxHeHllalFaV0VUcTd6dk14Z0h6N1dIcXNzT09QdGljZkhQ?=
 =?utf-8?B?YzJmUEw2WHBLZGk0d05XRXRrN2NzZnpIbGRBOWdKMnJJN1I1NTFhdUFNS1JN?=
 =?utf-8?B?eXZuLzdyT2hkTUMyYW1HUnRhS2RZRkdwUVVMdWJhcUpwTTBLTFgxWEgxNDlu?=
 =?utf-8?B?aGxMUVZQVEtQczR6ajNUeTYxa1JFRlZrWWNTMDJ4bmpubEVjVHFxaTVyZEl5?=
 =?utf-8?B?aW5sK29qWkkrN21GOEEvVzV0WWkrTjc5VTRsU1Z5bEJmNVk4NnowaFY3MWwv?=
 =?utf-8?B?aXc0cXNOOThqZm5FTm5hSk9RdWxoUU5USS83cGhHKy9kVjcyVEo5WHFyWWps?=
 =?utf-8?B?ZE9uZzJmRmtpSjg5L3J5V1FlTzU5aDJTcmI4akxmMU1hcGtEZXB1SlVNQ255?=
 =?utf-8?B?emZpMFYxbUtId211S1UyWkg1NWRwS3Q3YWFkamxqLzUxbDNoODZVRDYrTmYx?=
 =?utf-8?B?a3BZV3pXOUd6a1lBQVJmSEdhU2FBTjYydFB3NlkvSk1ESnd5S3pZVzV1TWVz?=
 =?utf-8?B?cFhTa3VoWjdxYWEvendycXhqSm9EWlJvRWVRcXNjVVJBa3RlOVZYK1NvV3d2?=
 =?utf-8?B?Q1RpMmZsUkVEVko0M0V0S3llcEkyTUcyK0xBY3BEYjBYVSs3TktEbENEdUtF?=
 =?utf-8?B?dzJ2L0lpVGtEMkJBQjRnbUR0NkY2RW1LNTJnbjEwbWM0V0lncVllVDJuK2lY?=
 =?utf-8?B?a2pHaFI3V0VSdWc2c3Q1VXJYQzJPS3pZRmx6T2w3cUh6ZEVwQXB2Q3F0b1BJ?=
 =?utf-8?B?dzlBTVpmOHhhNE9kbUxsQm9BU3ZRQnFYSTREcnVsNFVTNHJNT3dnVTFPcjg2?=
 =?utf-8?B?T3J2NlIwSWNTZnVVTlRaRDJYUjcxOG84T3VEc3l2WTFyTFRXa1NHZ2tRZndw?=
 =?utf-8?B?R2tsWjJobTdxbkV5NVBic1dncTdMcWtpTkpzUWdOcythMkRyRFdPUTFrbjdO?=
 =?utf-8?B?Ym4rakRoWkVTekZQaFNTTHdaS3NpMmo0WkhHUHhGUkU0TzYvNGh5SXkxek5Y?=
 =?utf-8?B?dVNsNlNMWFNVSzB2ekFNYzVLOFhlZFJzZTZycUJWQWlhMkpMRlFOeUZyU0ZP?=
 =?utf-8?B?aFVmRkZXcW8zMFNEQUxpZE5YWUFDMFdCU001KzlBKzlRbUlheFh5KytBSHVy?=
 =?utf-8?B?ZTRiOE1FUGR6cWZ1VFRUSElQNmVEWFhNTE16c0ErZHJPaEhJbnQ4YVBhY28x?=
 =?utf-8?B?dHBTQlRHblFDa2J0MldHUDVTT1M5L0JiRS9nNm5LM0tObkNRb3Y1clgwVWdh?=
 =?utf-8?B?M2M1Rlpkem8xbkw1YUxvbUU3QUhYcDlsNmdZRW9JVzlEM2dYL0V1YXF1dzBZ?=
 =?utf-8?B?ekV2V2hRamZZSVRjM2hqRUk3ZklncGlSUnhUUkh0bVMvL2lkQkVYVGt5dEdH?=
 =?utf-8?B?MmIvQ3JGWGRRTFZtaUpDL21aWUJTUXBuNUVJS1VLVERLeGtINlRsT3hEajQ3?=
 =?utf-8?B?cWhqcDhtUmxLQXN4WVcxMC9TQ3AvL1M1V090TURmbUtudzBoaFhJdGhsUHYx?=
 =?utf-8?Q?SAdOpX903HAFDh9EITIh6PA2o?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 84e110d9-a970-4710-cd2b-08dc20edad31
X-MS-Exchange-CrossTenant-AuthSource: PH0PR12MB7982.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 17:13:56.6222
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /nt6Xzr5ZLR8FFixHN0nbXv+IPv8l0zGYouFuWGt2YXnEBvRioOfrLqMISewjnZKKaANP3Q2znTc5ebGRoYM6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5377


On 1/28/2024 9:23 PM, Ratheesh Kannoth wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
> 
> 
> kmalloc_array() without __GFP_ZERO flag does not initialize
> memory to zero. This causes issues with bitmap.
> Use bitmap_zalloc() API to fix this issue.
> 
> Fixes: dd7842878633 ("octeontx2-af: Add new devlink param to configure maximum usable NIX block LFs")
> Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
> 
> ChangeLogs:
> v1 -> v2: Used bitmap_zalloc() API.
> v0 -> v1: Removed devm_kcalloc()._
> ---
>   .../net/ethernet/marvell/octeontx2/af/rvu.h   | 10 ++--
>   .../ethernet/marvell/octeontx2/af/rvu_npc.c   | 48 ++++++++-----------
>   2 files changed, 26 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
> index 43be37dd1f32..679bd6e87066 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
> @@ -184,11 +184,11 @@ struct npc_mcam {
>          unsigned long   *bmap_reverse;  /* Reverse bitmap, bmap_entries => 0 */
>          u16     bmap_entries;   /* Number of unreserved MCAM entries */
>          u16     bmap_fcnt;      /* MCAM entries free count */
> -       u16     *entry2pfvf_map;
> -       u16     *entry2cntr_map;
> -       u16     *cntr2pfvf_map;
> -       u16     *cntr_refcnt;
> -       u16     *entry2target_pffunc;
> +       unsigned long   *entry2pfvf_map;
> +       unsigned long   *entry2cntr_map;
> +       unsigned long   *cntr2pfvf_map;
> +       unsigned long   *cntr_refcnt;
> +       unsigned long   *entry2target_pffunc;

I'm not sure you want all of these at bitmaps? It was recommended to use 
bitmap_zalloc, but that was specifically for the bitmaps.

>          u8      keysize;        /* MCAM keysize 112/224/448 bits */
>          u8      banks;          /* Number of MCAM banks */
>          u8      banks_per_entry;/* Number of keywords in key */
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
> index 167145bdcb75..367f842e365d 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
> @@ -1850,13 +1850,13 @@ void npc_mcam_rsrcs_deinit(struct rvu *rvu)
>   {
>          struct npc_mcam *mcam = &rvu->hw->mcam;
> 
> -       kfree(mcam->bmap);
> -       kfree(mcam->bmap_reverse);
> -       kfree(mcam->entry2pfvf_map);
> -       kfree(mcam->cntr2pfvf_map);
> -       kfree(mcam->entry2cntr_map);
> -       kfree(mcam->cntr_refcnt);
> -       kfree(mcam->entry2target_pffunc);
> +       bitmap_free(mcam->bmap);
> +       bitmap_free(mcam->bmap_reverse);
> +       bitmap_free(mcam->entry2pfvf_map);
> +       bitmap_free(mcam->cntr2pfvf_map);
> +       bitmap_free(mcam->entry2cntr_map);
> +       bitmap_free(mcam->cntr_refcnt);
> +       bitmap_free(mcam->entry2target_pffunc);
>          kfree(mcam->counters.bmap);
>   }
> 
> @@ -1904,21 +1904,18 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)
>          mcam->pf_offset = mcam->nixlf_offset + nixlf_count;
> 
>          /* Allocate bitmaps for managing MCAM entries */
> -       mcam->bmap = kmalloc_array(BITS_TO_LONGS(mcam->bmap_entries),
> -                                  sizeof(long), GFP_KERNEL);
> +       mcam->bmap = bitmap_zalloc(mcam->bmap_entries, GFP_KERNEL) >          if (!mcam->bmap)
>                  return -ENOMEM;
> 
> -       mcam->bmap_reverse = kmalloc_array(BITS_TO_LONGS(mcam->bmap_entries),
> -                                          sizeof(long), GFP_KERNEL);
> +       mcam->bmap_reverse = bitmap_zalloc(mcam->bmap_entries, GFP_KERNEL);
>          if (!mcam->bmap_reverse)
>                  goto free_bmap;
> 
>          mcam->bmap_fcnt = mcam->bmap_entries;
> 
>          /* Alloc memory for saving entry to RVU PFFUNC allocation mapping */
> -       mcam->entry2pfvf_map = kmalloc_array(mcam->bmap_entries,
> -                                            sizeof(u16), GFP_KERNEL);
> +       mcam->entry2pfvf_map = bitmap_zalloc(mcam->bmap_entries, GFP_KERNEL);

Are you sure you want to use bitmap_zalloc() here?

>          if (!mcam->entry2pfvf_map)
>                  goto free_bmap_reverse;
> 
> @@ -1941,27 +1938,24 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)
>          if (err)
>                  goto free_entry_map;
> 
> -       mcam->cntr2pfvf_map = kmalloc_array(mcam->counters.max,
> -                                           sizeof(u16), GFP_KERNEL);
> +       mcam->cntr2pfvf_map = bitmap_zalloc(mcam->counters.max, GFP_KERNEL);
>          if (!mcam->cntr2pfvf_map)
>                  goto free_cntr_bmap;
> 
>          /* Alloc memory for MCAM entry to counter mapping and for tracking
>           * counter's reference count.
>           */
> -       mcam->entry2cntr_map = kmalloc_array(mcam->bmap_entries,
> -                                            sizeof(u16), GFP_KERNEL);
> +       mcam->entry2cntr_map = bitmap_zalloc(mcam->bmap_entries, GFP_KERNEL);

Are you sure you want to use bitmap_zalloc() here?

>          if (!mcam->entry2cntr_map)
>                  goto free_cntr_map;
> 
> -       mcam->cntr_refcnt = kmalloc_array(mcam->counters.max,
> -                                         sizeof(u16), GFP_KERNEL);
> +       mcam->cntr_refcnt = bitmap_zalloc(mcam->counters.max, GFP_KERNEL);

Are you sure you want to use bitmap_zalloc() here?


>          if (!mcam->cntr_refcnt)
>                  goto free_entry_cntr_map;
> 
>          /* Alloc memory for saving target device of mcam rule */
> -       mcam->entry2target_pffunc = kmalloc_array(mcam->total_entries,
> -                                                 sizeof(u16), GFP_KERNEL);
> +       mcam->entry2target_pffunc = bitmap_zalloc(mcam->total_entries,
> +                                                 GFP_KERNEL);

Are you sure you want to use bitmap_zalloc() here?

>          if (!mcam->entry2target_pffunc)
>                  goto free_cntr_refcnt;
> 
> @@ -1978,19 +1972,19 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)
>          return 0;
> 
>   free_cntr_refcnt:
> -       kfree(mcam->cntr_refcnt);
> +       bitmap_free(mcam->cntr_refcnt);
>   free_entry_cntr_map:
> -       kfree(mcam->entry2cntr_map);
> +       bitmap_free(mcam->entry2cntr_map);
>   free_cntr_map:
> -       kfree(mcam->cntr2pfvf_map);
> +       bitmap_free(mcam->cntr2pfvf_map);
>   free_cntr_bmap:
>          kfree(mcam->counters.bmap);
>   free_entry_map:
> -       kfree(mcam->entry2pfvf_map);
> +       bitmap_free(mcam->entry2pfvf_map);
>   free_bmap_reverse:
> -       kfree(mcam->bmap_reverse);
> +       bitmap_free(mcam->bmap_reverse);
>   free_bmap:
> -       kfree(mcam->bmap);
> +       bitmap_free(mcam->bmap);
> 
>          return -ENOMEM;
>   }
> --
> 2.25.1
>