| Message ID | 20240822162127.705879-5-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: xlnx: fix minor memory leaks | expand |
On Thu, Aug 22, 2024 at 05:21:25PM +0100, Peter Maydell wrote: > The TYPE_XLNX_ZYNQMP_EFUSE 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 0x55f3ff5839d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 23cf931c66865a71b6cc4da95156d03bc106fa72) > #1 0x7f3f31c6bc50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55f3ff9b8c5d in register_init_block hw/core/register.c:248:34 > #3 0x55f3ff9b96be in register_init_block32 hw/core/register.c:299:12 > #4 0x55f4005e5b25 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 > #5 0x55f40254afb1 in object_init_with_type qom/object.c:420:9 > #6 0x55f40253228b in object_initialize_with_type qom/object.c:562:5 > #7 0x55f402533b2d in object_new_with_type qom/object.c:782:5 > #8 0x55f402533c01 in object_new qom/object.c:797:12 > #9 0x55f402d31a2d 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-zynqmp-efuse.h | 1 + > hw/nvram/xlnx-zynqmp-efuse.c | 13 ++++++++++--- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h > index f5beacc2e6a..7fb12df3fbb 100644 > --- a/include/hw/nvram/xlnx-zynqmp-efuse.h > +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h > @@ -37,6 +37,7 @@ struct XlnxZynqMPEFuse { > qemu_irq irq; > > XlnxEFuse *efuse; > + RegisterInfoArray *reg_array; > uint32_t regs[XLNX_ZYNQMP_EFUSE_R_MAX]; > RegisterInfo regs_info[XLNX_ZYNQMP_EFUSE_R_MAX]; > }; > diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c > index 2d465f0fc6a..4e2d1b9d1e7 100644 > --- a/hw/nvram/xlnx-zynqmp-efuse.c > +++ b/hw/nvram/xlnx-zynqmp-efuse.c > @@ -803,9 +803,8 @@ static void zynqmp_efuse_init(Object *obj) > { > XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), zynqmp_efuse_regs_info, > ARRAY_SIZE(zynqmp_efuse_regs_info), > s->regs_info, s->regs, > @@ -813,10 +812,17 @@ static void zynqmp_efuse_init(Object *obj) > ZYNQMP_EFUSE_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); > } > > +static void zynqmp_efuse_finalize(Object *obj) > +{ > + XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); > + > + register_finalize_block(s->reg_array); > +} > + > static const VMStateDescription vmstate_efuse = { > .name = TYPE_XLNX_ZYNQMP_EFUSE, > .version_id = 1, > @@ -853,6 +859,7 @@ static const TypeInfo efuse_info = { > .instance_size = sizeof(XlnxZynqMPEFuse), > .class_init = zynqmp_efuse_class_init, > .instance_init = zynqmp_efuse_init, > + .instance_finalize = zynqmp_efuse_finalize, > }; > > static void efuse_register_types(void) > -- > 2.34.1 >
On Fri, Aug 23, 2024 at 2:23 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > The TYPE_XLNX_ZYNQMP_EFUSE 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 0x55f3ff5839d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 23cf931c66865a71b6cc4da95156d03bc106fa72) > #1 0x7f3f31c6bc50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55f3ff9b8c5d in register_init_block hw/core/register.c:248:34 > #3 0x55f3ff9b96be in register_init_block32 hw/core/register.c:299:12 > #4 0x55f4005e5b25 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 > #5 0x55f40254afb1 in object_init_with_type qom/object.c:420:9 > #6 0x55f40253228b in object_initialize_with_type qom/object.c:562:5 > #7 0x55f402533b2d in object_new_with_type qom/object.c:782:5 > #8 0x55f402533c01 in object_new qom/object.c:797:12 > #9 0x55f402d31a2d 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-zynqmp-efuse.h | 1 + > hw/nvram/xlnx-zynqmp-efuse.c | 13 ++++++++++--- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h > index f5beacc2e6a..7fb12df3fbb 100644 > --- a/include/hw/nvram/xlnx-zynqmp-efuse.h > +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h > @@ -37,6 +37,7 @@ struct XlnxZynqMPEFuse { > qemu_irq irq; > > XlnxEFuse *efuse; > + RegisterInfoArray *reg_array; > uint32_t regs[XLNX_ZYNQMP_EFUSE_R_MAX]; > RegisterInfo regs_info[XLNX_ZYNQMP_EFUSE_R_MAX]; > }; > diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c > index 2d465f0fc6a..4e2d1b9d1e7 100644 > --- a/hw/nvram/xlnx-zynqmp-efuse.c > +++ b/hw/nvram/xlnx-zynqmp-efuse.c > @@ -803,9 +803,8 @@ static void zynqmp_efuse_init(Object *obj) > { > XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), zynqmp_efuse_regs_info, > ARRAY_SIZE(zynqmp_efuse_regs_info), > s->regs_info, s->regs, > @@ -813,10 +812,17 @@ static void zynqmp_efuse_init(Object *obj) > ZYNQMP_EFUSE_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); > } > > +static void zynqmp_efuse_finalize(Object *obj) > +{ > + XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); > + > + register_finalize_block(s->reg_array); > +} > + > static const VMStateDescription vmstate_efuse = { > .name = TYPE_XLNX_ZYNQMP_EFUSE, > .version_id = 1, > @@ -853,6 +859,7 @@ static const TypeInfo efuse_info = { > .instance_size = sizeof(XlnxZynqMPEFuse), > .class_init = zynqmp_efuse_class_init, > .instance_init = zynqmp_efuse_init, > + .instance_finalize = zynqmp_efuse_finalize, > }; > > static void efuse_register_types(void) > -- > 2.34.1 > >
diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h index f5beacc2e6a..7fb12df3fbb 100644 --- a/include/hw/nvram/xlnx-zynqmp-efuse.h +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h @@ -37,6 +37,7 @@ struct XlnxZynqMPEFuse { qemu_irq irq; XlnxEFuse *efuse; + RegisterInfoArray *reg_array; uint32_t regs[XLNX_ZYNQMP_EFUSE_R_MAX]; RegisterInfo regs_info[XLNX_ZYNQMP_EFUSE_R_MAX]; }; diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c index 2d465f0fc6a..4e2d1b9d1e7 100644 --- a/hw/nvram/xlnx-zynqmp-efuse.c +++ b/hw/nvram/xlnx-zynqmp-efuse.c @@ -803,9 +803,8 @@ static void zynqmp_efuse_init(Object *obj) { XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - RegisterInfoArray *reg_array; - reg_array = + s->reg_array = register_init_block32(DEVICE(obj), zynqmp_efuse_regs_info, ARRAY_SIZE(zynqmp_efuse_regs_info), s->regs_info, s->regs, @@ -813,10 +812,17 @@ static void zynqmp_efuse_init(Object *obj) ZYNQMP_EFUSE_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); } +static void zynqmp_efuse_finalize(Object *obj) +{ + XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(obj); + + register_finalize_block(s->reg_array); +} + static const VMStateDescription vmstate_efuse = { .name = TYPE_XLNX_ZYNQMP_EFUSE, .version_id = 1, @@ -853,6 +859,7 @@ static const TypeInfo efuse_info = { .instance_size = sizeof(XlnxZynqMPEFuse), .class_init = zynqmp_efuse_class_init, .instance_init = zynqmp_efuse_init, + .instance_finalize = zynqmp_efuse_finalize, }; static void efuse_register_types(void)
The TYPE_XLNX_ZYNQMP_EFUSE 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 0x55f3ff5839d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 23cf931c66865a71b6cc4da95156d03bc106fa72) #1 0x7f3f31c6bc50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 #2 0x55f3ff9b8c5d in register_init_block hw/core/register.c:248:34 #3 0x55f3ff9b96be in register_init_block32 hw/core/register.c:299:12 #4 0x55f4005e5b25 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 #5 0x55f40254afb1 in object_init_with_type qom/object.c:420:9 #6 0x55f40253228b in object_initialize_with_type qom/object.c:562:5 #7 0x55f402533b2d in object_new_with_type qom/object.c:782:5 #8 0x55f402533c01 in object_new qom/object.c:797:12 #9 0x55f402d31a2d 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-zynqmp-efuse.h | 1 + hw/nvram/xlnx-zynqmp-efuse.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)