Message ID | 20240822162127.705879-7-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | arm: xlnx: fix minor memory leaks | expand |
On Thu, Aug 22, 2024 at 05:21:27PM +0100, Peter Maydell wrote: > The TYPE_XLNX_VERSAL_EFUSE_CTRL 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 0x55f222b5b9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 420 > 43d49e1139e3f3071b1f22fac1e3e7249c9a6) > #1 0x7fbb10669c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55f222f90c5d in register_init_block hw/core/register.c:248:34 > #3 0x55f222f916be in register_init_block32 hw/core/register.c:299:12 > #4 0x55f223bbdd15 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 > #5 0x55f225b23391 in object_init_with_type qom/object.c:420:9 > #6 0x55f225b0a66b in object_initialize_with_type qom/object.c:562:5 > #7 0x55f225b0bf0d in object_new_with_type qom/object.c:782:5 > #8 0x55f225b0bfe1 in object_new qom/object.c:797:12 > #9 0x55f226309e0d 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-versal-efuse.h | 1 + > hw/nvram/xlnx-versal-efuse-ctrl.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h > index 86e2261b9a3..afa4f4f9960 100644 > --- a/include/hw/nvram/xlnx-versal-efuse.h > +++ b/include/hw/nvram/xlnx-versal-efuse.h > @@ -44,6 +44,7 @@ struct XlnxVersalEFuseCtrl { > void *extra_pg0_lock_spec; /* Opaque property */ > uint32_t extra_pg0_lock_n16; > > + RegisterInfoArray *reg_array; > uint32_t regs[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; > RegisterInfo regs_info[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; > }; > diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c > index def6fe3302b..8252a5cabe0 100644 > --- a/hw/nvram/xlnx-versal-efuse-ctrl.c > +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c > @@ -712,9 +712,8 @@ static void efuse_ctrl_init(Object *obj) > { > XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), efuse_ctrl_regs_info, > ARRAY_SIZE(efuse_ctrl_regs_info), > s->regs_info, s->regs, > @@ -722,7 +721,7 @@ static void efuse_ctrl_init(Object *obj) > XLNX_VERSAL_EFUSE_CTRL_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_efuse_imr); > } > > @@ -730,6 +729,7 @@ static void efuse_ctrl_finalize(Object *obj) > { > XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); > > + register_finalize_block(s->reg_array); > g_free(s->extra_pg0_lock_spec); > } > > -- > 2.34.1 >
On Thu, Aug 22, 2024 at 05:21:27PM +0100, Peter Maydell wrote: > The TYPE_XLNX_VERSAL_EFUSE_CTRL 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 0x55f222b5b9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 420 > 43d49e1139e3f3071b1f22fac1e3e7249c9a6) > #1 0x7fbb10669c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55f222f90c5d in register_init_block hw/core/register.c:248:34 > #3 0x55f222f916be in register_init_block32 hw/core/register.c:299:12 > #4 0x55f223bbdd15 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 > #5 0x55f225b23391 in object_init_with_type qom/object.c:420:9 > #6 0x55f225b0a66b in object_initialize_with_type qom/object.c:562:5 > #7 0x55f225b0bf0d in object_new_with_type qom/object.c:782:5 > #8 0x55f225b0bfe1 in object_new qom/object.c:797:12 > #9 0x55f226309e0d 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-versal-efuse.h | 1 + > hw/nvram/xlnx-versal-efuse-ctrl.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h > index 86e2261b9a3..afa4f4f9960 100644 > --- a/include/hw/nvram/xlnx-versal-efuse.h > +++ b/include/hw/nvram/xlnx-versal-efuse.h > @@ -44,6 +44,7 @@ struct XlnxVersalEFuseCtrl { > void *extra_pg0_lock_spec; /* Opaque property */ > uint32_t extra_pg0_lock_n16; > > + RegisterInfoArray *reg_array; > uint32_t regs[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; > RegisterInfo regs_info[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; > }; > diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c > index def6fe3302b..8252a5cabe0 100644 > --- a/hw/nvram/xlnx-versal-efuse-ctrl.c > +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c > @@ -712,9 +712,8 @@ static void efuse_ctrl_init(Object *obj) > { > XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), efuse_ctrl_regs_info, > ARRAY_SIZE(efuse_ctrl_regs_info), > s->regs_info, s->regs, > @@ -722,7 +721,7 @@ static void efuse_ctrl_init(Object *obj) > XLNX_VERSAL_EFUSE_CTRL_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_efuse_imr); > } > > @@ -730,6 +729,7 @@ static void efuse_ctrl_finalize(Object *obj) > { > XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); > > + register_finalize_block(s->reg_array); > g_free(s->extra_pg0_lock_spec); > } > > -- > 2.34.1 >
On Fri, Aug 23, 2024 at 2:22 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > The TYPE_XLNX_VERSAL_EFUSE_CTRL 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 0x55f222b5b9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 420 > 43d49e1139e3f3071b1f22fac1e3e7249c9a6) > #1 0x7fbb10669c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 > #2 0x55f222f90c5d in register_init_block hw/core/register.c:248:34 > #3 0x55f222f916be in register_init_block32 hw/core/register.c:299:12 > #4 0x55f223bbdd15 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 > #5 0x55f225b23391 in object_init_with_type qom/object.c:420:9 > #6 0x55f225b0a66b in object_initialize_with_type qom/object.c:562:5 > #7 0x55f225b0bf0d in object_new_with_type qom/object.c:782:5 > #8 0x55f225b0bfe1 in object_new qom/object.c:797:12 > #9 0x55f226309e0d 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-versal-efuse.h | 1 + > hw/nvram/xlnx-versal-efuse-ctrl.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h > index 86e2261b9a3..afa4f4f9960 100644 > --- a/include/hw/nvram/xlnx-versal-efuse.h > +++ b/include/hw/nvram/xlnx-versal-efuse.h > @@ -44,6 +44,7 @@ struct XlnxVersalEFuseCtrl { > void *extra_pg0_lock_spec; /* Opaque property */ > uint32_t extra_pg0_lock_n16; > > + RegisterInfoArray *reg_array; > uint32_t regs[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; > RegisterInfo regs_info[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; > }; > diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c > index def6fe3302b..8252a5cabe0 100644 > --- a/hw/nvram/xlnx-versal-efuse-ctrl.c > +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c > @@ -712,9 +712,8 @@ static void efuse_ctrl_init(Object *obj) > { > XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - RegisterInfoArray *reg_array; > > - reg_array = > + s->reg_array = > register_init_block32(DEVICE(obj), efuse_ctrl_regs_info, > ARRAY_SIZE(efuse_ctrl_regs_info), > s->regs_info, s->regs, > @@ -722,7 +721,7 @@ static void efuse_ctrl_init(Object *obj) > XLNX_VERSAL_EFUSE_CTRL_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_efuse_imr); > } > > @@ -730,6 +729,7 @@ static void efuse_ctrl_finalize(Object *obj) > { > XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); > > + register_finalize_block(s->reg_array); > g_free(s->extra_pg0_lock_spec); > } > > -- > 2.34.1 > >
diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h index 86e2261b9a3..afa4f4f9960 100644 --- a/include/hw/nvram/xlnx-versal-efuse.h +++ b/include/hw/nvram/xlnx-versal-efuse.h @@ -44,6 +44,7 @@ struct XlnxVersalEFuseCtrl { void *extra_pg0_lock_spec; /* Opaque property */ uint32_t extra_pg0_lock_n16; + RegisterInfoArray *reg_array; uint32_t regs[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; RegisterInfo regs_info[XLNX_VERSAL_EFUSE_CTRL_R_MAX]; }; diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c index def6fe3302b..8252a5cabe0 100644 --- a/hw/nvram/xlnx-versal-efuse-ctrl.c +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c @@ -712,9 +712,8 @@ static void efuse_ctrl_init(Object *obj) { XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - RegisterInfoArray *reg_array; - reg_array = + s->reg_array = register_init_block32(DEVICE(obj), efuse_ctrl_regs_info, ARRAY_SIZE(efuse_ctrl_regs_info), s->regs_info, s->regs, @@ -722,7 +721,7 @@ static void efuse_ctrl_init(Object *obj) XLNX_VERSAL_EFUSE_CTRL_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_efuse_imr); } @@ -730,6 +729,7 @@ static void efuse_ctrl_finalize(Object *obj) { XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj); + register_finalize_block(s->reg_array); g_free(s->extra_pg0_lock_spec); }
The TYPE_XLNX_VERSAL_EFUSE_CTRL 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 0x55f222b5b9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 420 43d49e1139e3f3071b1f22fac1e3e7249c9a6) #1 0x7fbb10669c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 #2 0x55f222f90c5d in register_init_block hw/core/register.c:248:34 #3 0x55f222f916be in register_init_block32 hw/core/register.c:299:12 #4 0x55f223bbdd15 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 #5 0x55f225b23391 in object_init_with_type qom/object.c:420:9 #6 0x55f225b0a66b in object_initialize_with_type qom/object.c:562:5 #7 0x55f225b0bf0d in object_new_with_type qom/object.c:782:5 #8 0x55f225b0bfe1 in object_new qom/object.c:797:12 #9 0x55f226309e0d 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-versal-efuse.h | 1 + hw/nvram/xlnx-versal-efuse-ctrl.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)