| Message ID | 2ebb28e9de76d35b75c137f9944c2dfd893d34fa.1656150559.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/xive: Fix some incorrect memory allocation | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 23 jobs. |
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 7 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
Hello Christophe, On 6/25/22 11:49, Christophe JAILLET wrote: > 'xibm->count' really looks like a number of bits (see how it is used in > __xive_irq_bitmap_alloc()), so use the bitmap API to allocate and free this > bitmap. > > This improves semantic and potentially avoids some over memory allocation. This is correct and > Fixes: eac1e731b59e ("powerpc/xive: guest exploitation of the XIVE interrupt controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > I don't cross compile, so this patch is NOT compile-tested. Nathan provided a fix for it already : http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20220623182509.3985625-1-nathanl@linux.ibm.com/ Thanks, C. > --- > arch/powerpc/sysdev/xive/spapr.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c > index 7d5128676e83..fdbebb14b7de 100644 > --- a/arch/powerpc/sysdev/xive/spapr.c > +++ b/arch/powerpc/sysdev/xive/spapr.c > @@ -57,7 +57,7 @@ static int __init xive_irq_bitmap_add(int base, int count) > spin_lock_init(&xibm->lock); > xibm->base = base; > xibm->count = count; > - xibm->bitmap = kzalloc(xibm->count, GFP_KERNEL); > + xibm->bitmap = bitmap_zalloc(xibm->count, GFP_KERNEL); > if (!xibm->bitmap) { > kfree(xibm); > return -ENOMEM; > @@ -75,7 +75,7 @@ static void xive_irq_bitmap_remove_all(void) > > list_for_each_entry_safe(xibm, tmp, &xive_irq_bitmaps, list) { > list_del(&xibm->list); > - kfree(xibm->bitmap); > + bitmap_free(xibm->bitmap); > kfree(xibm); > } > }
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c index 7d5128676e83..fdbebb14b7de 100644 --- a/arch/powerpc/sysdev/xive/spapr.c +++ b/arch/powerpc/sysdev/xive/spapr.c @@ -57,7 +57,7 @@ static int __init xive_irq_bitmap_add(int base, int count) spin_lock_init(&xibm->lock); xibm->base = base; xibm->count = count; - xibm->bitmap = kzalloc(xibm->count, GFP_KERNEL); + xibm->bitmap = bitmap_zalloc(xibm->count, GFP_KERNEL); if (!xibm->bitmap) { kfree(xibm); return -ENOMEM; @@ -75,7 +75,7 @@ static void xive_irq_bitmap_remove_all(void) list_for_each_entry_safe(xibm, tmp, &xive_irq_bitmaps, list) { list_del(&xibm->list); - kfree(xibm->bitmap); + bitmap_free(xibm->bitmap); kfree(xibm); } }
'xibm->count' really looks like a number of bits (see how it is used in __xive_irq_bitmap_alloc()), so use the bitmap API to allocate and free this bitmap. This improves semantic and potentially avoids some over memory allocation. Fixes: eac1e731b59e ("powerpc/xive: guest exploitation of the XIVE interrupt controller") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- I don't cross compile, so this patch is NOT compile-tested. --- arch/powerpc/sysdev/xive/spapr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)