| Message ID | 20240822162127.705879-4-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: xlnx: fix minor memory leaks | expand |
On Thu, Aug 22, 2024 at 05:21:24PM +0100, Peter Maydell wrote: > The TYPE_XLNX_BBRAM 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 0x5641518ca9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 4a6 > 18cb63d57d5a19ed45cfc262b08da47eaafe5) > #1 0x7ff1aab31c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x564151cffc5d in register_init_block hw/core/register.c:248:34 > #3 0x564151d006be in register_init_block32 hw/core/register.c:299:12 > #4 0x56415293df75 in bbram_ctrl_init hw/nvram/xlnx-bbram.c:462:9 > #5 0x564154891dc1 in object_init_with_type qom/object.c:420:9 > #6 0x56415487909b in object_initialize_with_type qom/object.c:562:5 > #7 0x56415487a93d in object_new_with_type qom/object.c:782:5 > #8 0x56415487aa11 in object_new qom/object.c:797:12 > #9 0x56415507883d 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/nvram/xlnx-bbram.h | 1 + > hw/nvram/xlnx-bbram.c | 13 ++++++++++--- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h > index 6fc13f8cc17..bce8e89d905 100644 > --- a/include/hw/nvram/xlnx-bbram.h > +++ b/include/hw/nvram/xlnx-bbram.h > @@ -47,6 +47,7 @@ struct XlnxBBRam { > bool bbram8_wo; > bool blk_ro; > > + RegisterInfoArray *reg_array; > uint32_t regs[RMAX_XLNX_BBRAM]; > RegisterInfo regs_info[RMAX_XLNX_BBRAM]; > }; > diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c > index 09575a77d77..1bc58e90ad0 100644 > --- a/hw/nvram/xlnx-bbram.c > +++ b/hw/nvram/xlnx-bbram.c > @@ -456,9 +456,8 @@ static void bbram_ctrl_init(Object *obj) > { > XlnxBBRam *s = XLNX_BBRAM(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), bbram_ctrl_regs_info, > ARRAY_SIZE(bbram_ctrl_regs_info), > s->regs_info, s->regs, > @@ -466,10 +465,17 @@ static void bbram_ctrl_init(Object *obj) > XLNX_BBRAM_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_bbram); > } > > +static void bbram_ctrl_finalize(Object *obj) > +{ > + XlnxBBRam *s = XLNX_BBRAM(obj); > + > + register_finalize_block(s->reg_array); > +} > + > static void bbram_prop_set_drive(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > @@ -537,6 +543,7 @@ static const TypeInfo bbram_ctrl_info = { > .instance_size = sizeof(XlnxBBRam), > .class_init = bbram_ctrl_class_init, > .instance_init = bbram_ctrl_init, > + .instance_finalize = bbram_ctrl_finalize, > }; > > static void bbram_ctrl_register_types(void) > -- > 2.34.1 >
On Fri, Aug 23, 2024 at 2:22 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > The TYPE_XLNX_BBRAM 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 0x5641518ca9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 4a6 > 18cb63d57d5a19ed45cfc262b08da47eaafe5) > #1 0x7ff1aab31c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x564151cffc5d in register_init_block hw/core/register.c:248:34 > #3 0x564151d006be in register_init_block32 hw/core/register.c:299:12 > #4 0x56415293df75 in bbram_ctrl_init hw/nvram/xlnx-bbram.c:462:9 > #5 0x564154891dc1 in object_init_with_type qom/object.c:420:9 > #6 0x56415487909b in object_initialize_with_type qom/object.c:562:5 > #7 0x56415487a93d in object_new_with_type qom/object.c:782:5 > #8 0x56415487aa11 in object_new qom/object.c:797:12 > #9 0x56415507883d 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/nvram/xlnx-bbram.h | 1 + > hw/nvram/xlnx-bbram.c | 13 ++++++++++--- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h > index 6fc13f8cc17..bce8e89d905 100644 > --- a/include/hw/nvram/xlnx-bbram.h > +++ b/include/hw/nvram/xlnx-bbram.h > @@ -47,6 +47,7 @@ struct XlnxBBRam { > bool bbram8_wo; > bool blk_ro; > > + RegisterInfoArray *reg_array; > uint32_t regs[RMAX_XLNX_BBRAM]; > RegisterInfo regs_info[RMAX_XLNX_BBRAM]; > }; > diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c > index 09575a77d77..1bc58e90ad0 100644 > --- a/hw/nvram/xlnx-bbram.c > +++ b/hw/nvram/xlnx-bbram.c > @@ -456,9 +456,8 @@ static void bbram_ctrl_init(Object *obj) > { > XlnxBBRam *s = XLNX_BBRAM(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), bbram_ctrl_regs_info, > ARRAY_SIZE(bbram_ctrl_regs_info), > s->regs_info, s->regs, > @@ -466,10 +465,17 @@ static void bbram_ctrl_init(Object *obj) > XLNX_BBRAM_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_bbram); > } > > +static void bbram_ctrl_finalize(Object *obj) > +{ > + XlnxBBRam *s = XLNX_BBRAM(obj); > + > + register_finalize_block(s->reg_array); > +} > + > static void bbram_prop_set_drive(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > @@ -537,6 +543,7 @@ static const TypeInfo bbram_ctrl_info = { > .instance_size = sizeof(XlnxBBRam), > .class_init = bbram_ctrl_class_init, > .instance_init = bbram_ctrl_init, > + .instance_finalize = bbram_ctrl_finalize, > }; > > static void bbram_ctrl_register_types(void) > -- > 2.34.1 > >
diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 6fc13f8cc17..bce8e89d905 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -47,6 +47,7 @@ struct XlnxBBRam { bool bbram8_wo; bool blk_ro; + RegisterInfoArray *reg_array; uint32_t regs[RMAX_XLNX_BBRAM]; RegisterInfo regs_info[RMAX_XLNX_BBRAM]; }; diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 09575a77d77..1bc58e90ad0 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -456,9 +456,8 @@ static void bbram_ctrl_init(Object *obj) { XlnxBBRam *s = XLNX_BBRAM(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - RegisterInfoArray *reg_array; - reg_array = + s->reg_array = register_init_block32(DEVICE(obj), bbram_ctrl_regs_info, ARRAY_SIZE(bbram_ctrl_regs_info), s->regs_info, s->regs, @@ -466,10 +465,17 @@ static void bbram_ctrl_init(Object *obj) XLNX_BBRAM_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_bbram); } +static void bbram_ctrl_finalize(Object *obj) +{ + XlnxBBRam *s = XLNX_BBRAM(obj); + + register_finalize_block(s->reg_array); +} + static void bbram_prop_set_drive(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -537,6 +543,7 @@ static const TypeInfo bbram_ctrl_info = { .instance_size = sizeof(XlnxBBRam), .class_init = bbram_ctrl_class_init, .instance_init = bbram_ctrl_init, + .instance_finalize = bbram_ctrl_finalize, }; static void bbram_ctrl_register_types(void)
The TYPE_XLNX_BBRAM 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 0x5641518ca9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 4a6 18cb63d57d5a19ed45cfc262b08da47eaafe5) #1 0x7ff1aab31c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 #2 0x564151cffc5d in register_init_block hw/core/register.c:248:34 #3 0x564151d006be in register_init_block32 hw/core/register.c:299:12 #4 0x56415293df75 in bbram_ctrl_init hw/nvram/xlnx-bbram.c:462:9 #5 0x564154891dc1 in object_init_with_type qom/object.c:420:9 #6 0x56415487909b in object_initialize_with_type qom/object.c:562:5 #7 0x56415487a93d in object_new_with_type qom/object.c:782:5 #8 0x56415487aa11 in object_new qom/object.c:797:12 #9 0x56415507883d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- include/hw/nvram/xlnx-bbram.h | 1 + hw/nvram/xlnx-bbram.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)