| Message ID | 20240822162127.705879-6-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: xlnx: fix minor memory leaks | expand |
On Thu, Aug 22, 2024 at 05:21:26PM +0100, Peter Maydell wrote: > The TYPE_XLNX_VERSAL_TRNG device creates a register block with > register_init_block32() in its instance_init method; we must > therefore destroy it in our instance_finalize method to avoid a leak > in the QOM introspection "init-inspect-finalize" lifecycle: > > Direct leak of 304 byte(s) in 1 object(s) allocated from: > #0 0x55842ec799d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 47496e53f3e779f1c7e9b82cbea07407152b498b) > #1 0x7fe793c75c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55842f0aec5d in register_init_block hw/core/register.c:248:34 > #3 0x55842f0af6be in register_init_block32 hw/core/register.c:299:12 > #4 0x55842f801588 in trng_init hw/misc/xlnx-versal-trng.c:614:9 > #5 0x558431c411a1 in object_init_with_type qom/object.c:420:9 > #6 0x558431c2847b in object_initialize_with_type qom/object.c:562:5 > #7 0x558431c29d1d in object_new_with_type qom/object.c:782:5 > #8 0x558431c29df1 in object_new qom/object.c:797:12 > #9 0x558432427c1d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com> > --- > include/hw/misc/xlnx-versal-trng.h | 1 + > hw/misc/xlnx-versal-trng.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-versal-trng.h > index 0bcef8a6132..d96f8f9eff3 100644 > --- a/include/hw/misc/xlnx-versal-trng.h > +++ b/include/hw/misc/xlnx-versal-trng.h > @@ -50,6 +50,7 @@ typedef struct XlnxVersalTRng { > uint64_t forced_prng_count; > uint64_t tst_seed[2]; > > + RegisterInfoArray *reg_array; > uint32_t regs[RMAX_XLNX_VERSAL_TRNG]; > RegisterInfo regs_info[RMAX_XLNX_VERSAL_TRNG]; > } XlnxVersalTRng; > diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c > index c0d1dde8708..86905479b8f 100644 > --- a/hw/misc/xlnx-versal-trng.c > +++ b/hw/misc/xlnx-versal-trng.c > @@ -608,9 +608,8 @@ static void trng_init(Object *obj) > { > XlnxVersalTRng *s = XLNX_VERSAL_TRNG(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), trng_regs_info, > ARRAY_SIZE(trng_regs_info), > s->regs_info, s->regs, > @@ -618,7 +617,7 @@ static void trng_init(Object *obj) > XLNX_VERSAL_TRNG_ERR_DEBUG, > R_MAX * 4); > > - sysbus_init_mmio(sbd, ®_array->mem); > + sysbus_init_mmio(sbd, &s->reg_array->mem); > sysbus_init_irq(sbd, &s->irq); > > s->prng = g_rand_new(); > @@ -628,6 +627,7 @@ static void trng_finalize(Object *obj) > { > XlnxVersalTRng *s = XLNX_VERSAL_TRNG(obj); > > + register_finalize_block(s->reg_array); > g_rand_free(s->prng); > s->prng = NULL; > } > -- > 2.34.1 >
On Fri, Aug 23, 2024 at 2:22 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > The TYPE_XLNX_VERSAL_TRNG device creates a register block with > register_init_block32() in its instance_init method; we must > therefore destroy it in our instance_finalize method to avoid a leak > in the QOM introspection "init-inspect-finalize" lifecycle: > > Direct leak of 304 byte(s) in 1 object(s) allocated from: > #0 0x55842ec799d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 47496e53f3e779f1c7e9b82cbea07407152b498b) > #1 0x7fe793c75c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55842f0aec5d in register_init_block hw/core/register.c:248:34 > #3 0x55842f0af6be in register_init_block32 hw/core/register.c:299:12 > #4 0x55842f801588 in trng_init hw/misc/xlnx-versal-trng.c:614:9 > #5 0x558431c411a1 in object_init_with_type qom/object.c:420:9 > #6 0x558431c2847b in object_initialize_with_type qom/object.c:562:5 > #7 0x558431c29d1d in object_new_with_type qom/object.c:782:5 > #8 0x558431c29df1 in object_new qom/object.c:797:12 > #9 0x558432427c1d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > include/hw/misc/xlnx-versal-trng.h | 1 + > hw/misc/xlnx-versal-trng.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-versal-trng.h > index 0bcef8a6132..d96f8f9eff3 100644 > --- a/include/hw/misc/xlnx-versal-trng.h > +++ b/include/hw/misc/xlnx-versal-trng.h > @@ -50,6 +50,7 @@ typedef struct XlnxVersalTRng { > uint64_t forced_prng_count; > uint64_t tst_seed[2]; > > + RegisterInfoArray *reg_array; > uint32_t regs[RMAX_XLNX_VERSAL_TRNG]; > RegisterInfo regs_info[RMAX_XLNX_VERSAL_TRNG]; > } XlnxVersalTRng; > diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c > index c0d1dde8708..86905479b8f 100644 > --- a/hw/misc/xlnx-versal-trng.c > +++ b/hw/misc/xlnx-versal-trng.c > @@ -608,9 +608,8 @@ static void trng_init(Object *obj) > { > XlnxVersalTRng *s = XLNX_VERSAL_TRNG(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), trng_regs_info, > ARRAY_SIZE(trng_regs_info), > s->regs_info, s->regs, > @@ -618,7 +617,7 @@ static void trng_init(Object *obj) > XLNX_VERSAL_TRNG_ERR_DEBUG, > R_MAX * 4); > > - sysbus_init_mmio(sbd, ®_array->mem); > + sysbus_init_mmio(sbd, &s->reg_array->mem); > sysbus_init_irq(sbd, &s->irq); > > s->prng = g_rand_new(); > @@ -628,6 +627,7 @@ static void trng_finalize(Object *obj) > { > XlnxVersalTRng *s = XLNX_VERSAL_TRNG(obj); > > + register_finalize_block(s->reg_array); > g_rand_free(s->prng); > s->prng = NULL; > } > -- > 2.34.1 > >
diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-versal-trng.h index 0bcef8a6132..d96f8f9eff3 100644 --- a/include/hw/misc/xlnx-versal-trng.h +++ b/include/hw/misc/xlnx-versal-trng.h @@ -50,6 +50,7 @@ typedef struct XlnxVersalTRng { uint64_t forced_prng_count; uint64_t tst_seed[2]; + RegisterInfoArray *reg_array; uint32_t regs[RMAX_XLNX_VERSAL_TRNG]; RegisterInfo regs_info[RMAX_XLNX_VERSAL_TRNG]; } XlnxVersalTRng; diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index c0d1dde8708..86905479b8f 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -608,9 +608,8 @@ static void trng_init(Object *obj) { XlnxVersalTRng *s = XLNX_VERSAL_TRNG(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - RegisterInfoArray *reg_array; - reg_array = + s->reg_array = register_init_block32(DEVICE(obj), trng_regs_info, ARRAY_SIZE(trng_regs_info), s->regs_info, s->regs, @@ -618,7 +617,7 @@ static void trng_init(Object *obj) XLNX_VERSAL_TRNG_ERR_DEBUG, R_MAX * 4); - sysbus_init_mmio(sbd, ®_array->mem); + sysbus_init_mmio(sbd, &s->reg_array->mem); sysbus_init_irq(sbd, &s->irq); s->prng = g_rand_new(); @@ -628,6 +627,7 @@ static void trng_finalize(Object *obj) { XlnxVersalTRng *s = XLNX_VERSAL_TRNG(obj); + register_finalize_block(s->reg_array); g_rand_free(s->prng); s->prng = NULL; }
The TYPE_XLNX_VERSAL_TRNG device creates a register block with register_init_block32() in its instance_init method; we must therefore destroy it in our instance_finalize method to avoid a leak in the QOM introspection "init-inspect-finalize" lifecycle: Direct leak of 304 byte(s) in 1 object(s) allocated from: #0 0x55842ec799d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 47496e53f3e779f1c7e9b82cbea07407152b498b) #1 0x7fe793c75c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 #2 0x55842f0aec5d in register_init_block hw/core/register.c:248:34 #3 0x55842f0af6be in register_init_block32 hw/core/register.c:299:12 #4 0x55842f801588 in trng_init hw/misc/xlnx-versal-trng.c:614:9 #5 0x558431c411a1 in object_init_with_type qom/object.c:420:9 #6 0x558431c2847b in object_initialize_with_type qom/object.c:562:5 #7 0x558431c29d1d in object_new_with_type qom/object.c:782:5 #8 0x558431c29df1 in object_new qom/object.c:797:12 #9 0x558432427c1d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- include/hw/misc/xlnx-versal-trng.h | 1 + hw/misc/xlnx-versal-trng.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)