From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: pannengyuan@huawei.com, cohuck@redhat.com, rth@twiddle.net,
david@redhat.com
Cc: zhang.zhanghailiang@huawei.com, qemu-s390x@nongnu.org,
qemu-devel@nongnu.org, euler.robot@huawei.com
Subject: Re: [PATCH 1/2] s390x: fix memleaks in cpu_finalize
Date: Sat, 15 Feb 2020 11:28:35 +0100 [thread overview]
Message-ID: <0d92b8d7-907f-2969-55f3-2ee5746edf68@redhat.com> (raw)
In-Reply-To: <20200215083203.5064-1-pannengyuan@huawei.com>
Hi Pan,
On 2/15/20 9:32 AM, pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
>
> This patch fix memleaks when we call tests/qtest/cpu-plug-test on s390x. The leak stack is as follow:
>
> Direct leak of 48 byte(s) in 1 object(s) allocated from:
> #0 0x7fb43c7cd970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970)
> #1 0x7fb43be2149d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d)
> #2 0x558ba96da716 in timer_new_full /mnt/sdb/qemu-new/qemu/include/qemu/timer.h:530
> #3 0x558ba96da716 in timer_new /mnt/sdb/qemu-new/qemu/include/qemu/timer.h:551
> #4 0x558ba96da716 in timer_new_ns /mnt/sdb/qemu-new/qemu/include/qemu/timer.h:569
> #5 0x558ba96da716 in s390_cpu_initfn /mnt/sdb/qemu-new/qemu/target/s390x/cpu.c:285
> #6 0x558ba9c969ab in object_init_with_type /mnt/sdb/qemu-new/qemu/qom/object.c:372
> #7 0x558ba9c9eb5f in object_initialize_with_type /mnt/sdb/qemu-new/qemu/qom/object.c:516
> #8 0x558ba9c9f053 in object_new_with_type /mnt/sdb/qemu-new/qemu/qom/object.c:684
> #9 0x558ba967ede6 in s390x_new_cpu /mnt/sdb/qemu-new/qemu/hw/s390x/s390-virtio-ccw.c:64
> #10 0x558ba99764b3 in hmp_cpu_add /mnt/sdb/qemu-new/qemu/hw/core/machine-hmp-cmds.c:57
> #11 0x558ba9b1c27f in handle_hmp_command /mnt/sdb/qemu-new/qemu/monitor/hmp.c:1082
> #12 0x558ba96c1b02 in qmp_human_monitor_command /mnt/sdb/qemu-new/qemu/monitor/misc.c:142
>
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> ---
> target/s390x/cpu.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index cf84d307c6..fff793a4eb 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -294,6 +294,10 @@ static void s390_cpu_finalize(Object *obj)
>
> qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu);
> g_free(cpu->irqstate);
> + timer_del(cpu->env.tod_timer);
> + timer_del(cpu->env.cpu_timer);
Similarly to your other cleanups, shouldn't we move the timer_new_ns()
into a realize() function, then do the timer_del() in unrealize()?
> + timer_free(cpu->env.tod_timer);
> + timer_free(cpu->env.cpu_timer);
The timer_free() is correct.
> #endif
> }
>
>
next prev parent reply other threads:[~2020-02-15 10:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-15 8:32 [PATCH 1/2] s390x: fix memleaks in cpu_finalize pannengyuan
2020-02-15 8:27 ` Pan Nengyuan
2020-02-15 10:28 ` Philippe Mathieu-Daudé [this message]
2020-02-15 10:42 ` Pan Nengyuan
2020-02-17 8:10 ` David Hildenbrand
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=0d92b8d7-907f-2969-55f3-2ee5746edf68@redhat.com \
--to=philmd@redhat.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=euler.robot@huawei.com \
--cc=pannengyuan@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=zhang.zhanghailiang@huawei.com \
/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).