From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: Alistair Francis <alistair@alistair23.me>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
Francisco Iglesias <francisco.iglesias@amd.com>
Subject: [PATCH for-9.2 1/6] hw/misc/xlnx-versal-cfu: destroy fifo in finalize
Date: Thu, 22 Aug 2024 17:21:22 +0100 [thread overview]
Message-ID: <20240822162127.705879-2-peter.maydell@linaro.org> (raw)
In-Reply-To: <20240822162127.705879-1-peter.maydell@linaro.org>
Since the TYPE_XNLX_VERSAL_CFU_FDRO device creates a FIFO in its
instance_init method, we must destroy the FIFO in instance_finalize
to avoid a memory leak for the QOM introspection
"instantiate-examine-finalize" cycle:
Direct leak of 8192 byte(s) in 1 object(s) allocated from:
#0 0x55ec89eae7ee in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d7ee) (BuildId: 6d508874816cc47d17c8dd775e8f809ae520e8cb)
#1 0x7f697018f738 in g_malloc debian/build/deb/../../../glib/gmem.c:128:13
#2 0x55ec8d98d98d in fifo8_create util/fifo8.c:27:18
#3 0x55ec8aa2a624 in fifo32_create /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/qemu/fifo32.h:35:5
#4 0x55ec8aa2a33c in cfu_fdro_init hw/misc/xlnx-versal-cfu.c:397:5
#5 0x55ec8ce75da1 in object_init_with_type qom/object.c:420:9
#6 0x55ec8ce5d07b in object_initialize_with_type qom/object.c:562:5
#7 0x55ec8ce5e91d in object_new_with_type qom/object.c:782:5
#8 0x55ec8ce5e9f1 in object_new qom/object.c:797:12
#9 0x55ec8d65c81d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/misc/xlnx-versal-cfu.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c
index 6bb82e51c15..2284b407eab 100644
--- a/hw/misc/xlnx-versal-cfu.c
+++ b/hw/misc/xlnx-versal-cfu.c
@@ -397,6 +397,13 @@ static void cfu_fdro_init(Object *obj)
fifo32_create(&s->fdro_data, 8 * KiB / sizeof(uint32_t));
}
+static void cfu_fdro_finalize(Object *obj)
+{
+ XlnxVersalCFUFDRO *s = XLNX_VERSAL_CFU_FDRO(obj);
+
+ fifo32_destroy(&s->fdro_data);
+}
+
static void cfu_fdro_reset_enter(Object *obj, ResetType type)
{
XlnxVersalCFUFDRO *s = XLNX_VERSAL_CFU_FDRO(obj);
@@ -539,6 +546,7 @@ static const TypeInfo cfu_fdro_info = {
.instance_size = sizeof(XlnxVersalCFUFDRO),
.class_init = cfu_fdro_class_init,
.instance_init = cfu_fdro_init,
+ .instance_finalize = cfu_fdro_finalize,
.interfaces = (InterfaceInfo[]) {
{ TYPE_XLNX_CFI_IF },
{ }
--
2.34.1
next prev parent reply other threads:[~2024-08-22 16:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-22 16:21 [PATCH for-9.2 0/6] arm: xlnx: fix minor memory leaks Peter Maydell
2024-08-22 16:21 ` Peter Maydell [this message]
2024-08-23 10:13 ` [PATCH for-9.2 1/6] hw/misc/xlnx-versal-cfu: destroy fifo in finalize Francisco Iglesias
2024-08-26 0:04 ` Alistair Francis
2024-08-22 16:21 ` [PATCH for-9.2 2/6] hw/misc/xlnx-versal-trng: Free s->prng in finalize, not unrealize Peter Maydell
2024-08-26 0:04 ` Alistair Francis
2024-08-22 16:21 ` [PATCH for-9.2 3/6] hw/nvram/xlnx-bbram: Call register_finalize_block Peter Maydell
2024-08-23 16:23 ` Francisco Iglesias
2024-08-26 0:06 ` Alistair Francis
2024-08-22 16:21 ` [PATCH for-9.2 4/6] hw/nvram/xlnx-zynqmp-efuse: " Peter Maydell
2024-08-23 16:23 ` Francisco Iglesias
2024-08-26 0:06 ` Alistair Francis
2024-08-22 16:21 ` [PATCH for-9.2 5/6] hw/misc/xlnx-versal-trng: " Peter Maydell
2024-08-23 16:24 ` Francisco Iglesias
2024-08-26 0:06 ` Alistair Francis
2024-08-22 16:21 ` [PATCH for-9.2 6/6] hm/nvram/xlnx-versal-efuse-ctrl: " Peter Maydell
2024-08-23 10:14 ` Francisco Iglesias
2024-08-23 16:25 ` Francisco Iglesias
2024-08-26 0:07 ` Alistair Francis
2024-08-23 10:02 ` [PATCH for-9.2 0/6] arm: xlnx: fix minor memory leaks Edgar E. Iglesias
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240822162127.705879-2-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=francisco.iglesias@amd.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).