KVM: arm64: Use the bitmap API to allocate bitmaps

tititiou36 · Marc Zyngier · commit a00e9e4319c2 · 2023-04-20T09:10:28.000+01:00
Use bitmap_zalloc()/bitmap_free() instead of hand-writing them. It is less verbose and it improves the semantic. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/3c5043731db4d3635383e9326bc7e98e25de3288.1681854412.git.christophe.jaillet@wanadoo.fr
diff --git a/arch/arm64/kvm/vmid.c b/arch/arm64/kvm/vmid.c
@@ -182,8 +182,7 @@ int __init kvm_arm_vmid_alloc_init(void)
 	 */
 	WARN_ON(NUM_USER_VMIDS - 1 <= num_possible_cpus());
 	atomic64_set(&vmid_generation, VMID_FIRST_VERSION);
-	vmid_map = kcalloc(BITS_TO_LONGS(NUM_USER_VMIDS),
-			   sizeof(*vmid_map), GFP_KERNEL);
+	vmid_map = bitmap_zalloc(NUM_USER_VMIDS, GFP_KERNEL);
 	if (!vmid_map)
 		return -ENOMEM;
 
@@ -192,5 +191,5 @@ int __init kvm_arm_vmid_alloc_init(void)
 
 void __init kvm_arm_vmid_alloc_free(void)
 {
-	kfree(vmid_map);
+	bitmap_free(vmid_map);
 }

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,7 @@ int __init kvm_arm_vmid_alloc_init(void)`
`182`	`182`	`*/`
`183`	`183`	`WARN_ON(NUM_USER_VMIDS - 1 <= num_possible_cpus());`
`184`	`184`	`atomic64_set(&vmid_generation, VMID_FIRST_VERSION);`
`185`		`- vmid_map = kcalloc(BITS_TO_LONGS(NUM_USER_VMIDS),`
`186`		`- sizeof(*vmid_map), GFP_KERNEL);`
	`185`	`+ vmid_map = bitmap_zalloc(NUM_USER_VMIDS, GFP_KERNEL);`
`187`	`186`	`if (!vmid_map)`
`188`	`187`	`return -ENOMEM;`
`189`	`188`
`@@ -192,5 +191,5 @@ int __init kvm_arm_vmid_alloc_init(void)`
`192`	`191`
`193`	`192`	`void __init kvm_arm_vmid_alloc_free(void)`
`194`	`193`	`{`
`195`		`- kfree(vmid_map);`
	`194`	`+ bitmap_free(vmid_map);`
`196`	`195`	`}`