From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5435EC11D0B for ; Thu, 20 Feb 2020 16:02:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 206AF20658 for ; Thu, 20 Feb 2020 16:02:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eFYYAW/k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 206AF20658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4oHe-0002EZ-65 for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 11:02:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4oGP-0000Wr-T2 for qemu-devel@nongnu.org; Thu, 20 Feb 2020 11:01:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4oGN-00013H-Lr for qemu-devel@nongnu.org; Thu, 20 Feb 2020 11:01:21 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:58266 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4oGN-000115-Em for qemu-devel@nongnu.org; Thu, 20 Feb 2020 11:01:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hA16nPl+49HiOdFBPnY9n1Whv8KJgMTlRcxocdVI9FI=; b=eFYYAW/k/AJ3eDRvDlT7zkg6nMsGNQzZEGLe00LfEdLcHWAesmUekNEjbj4HbT2qdBMGIt vLkaGi2gtt2BXRuFR/l45N6deJ3ooGzQqh/rdRkGn5U27CGDp9ENyqcEgk2KIHCH+MPtSH LKFObcHpgNNidFz4CEiRwP1oN8AMX6A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-bMJMWJydN02WqKkr9H_uoQ-1; Thu, 20 Feb 2020 11:01:09 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B26FF1005510; Thu, 20 Feb 2020 16:01:06 +0000 (UTC) Received: from gondolin (ovpn-205-37.brq.redhat.com [10.40.205.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D79287B0A; Thu, 20 Feb 2020 16:01:02 +0000 (UTC) Date: Thu, 20 Feb 2020 16:59:50 +0100 From: Cornelia Huck To: Subject: Re: [PATCH v2 1/2] s390x: fix memleaks in cpu_finalize Message-ID: <20200220165950.3a5ec74a.cohuck@redhat.com> In-Reply-To: <20200217032127.46508-2-pannengyuan@huawei.com> References: <20200217032127.46508-1-pannengyuan@huawei.com> <20200217032127.46508-2-pannengyuan@huawei.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: bMJMWJydN02WqKkr9H_uoQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, zhang.zhanghailiang@huawei.com, alistair@alistair23.me, qemu-devel@nongnu.org, mav2-rk.cave-ayland@ilande.co.uk, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, euler.robot@huawei.com, edgar.iglesias@gmail.com, Richard Henderson , david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 17 Feb 2020 11:21:26 +0800 wrote: > From: Pan Nengyuan > > 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 > Signed-off-by: Pan Nengyuan > Cc: Richard Henderson > Cc: Cornelia Huck > --- > Changes v2 to v1: > - Similarly to other cleanups, move timer_new into realize, then do > timer_del in unrealize. > --- > target/s390x/cpu.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index cf84d307c6..f18dbc6fe4 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -170,7 +170,12 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > S390CPUClass *scc = S390_CPU_GET_CLASS(dev); > #if !defined(CONFIG_USER_ONLY) > S390CPU *cpu = S390_CPU(dev); > + cpu->env.tod_timer = > + timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu); > + cpu->env.cpu_timer = > + timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); I may be missing something, but what cleans up the timers if we fail further down in this function? I don't think the unrealize callback is invoked by the core in case of error? Also, as a matter of personal preference, I think it would be better to initialize the timers in the !CONFIG_USER_ONLY section further below, rather than in the variable declaration section. > #endif > + > Error *err = NULL; > > /* the model has to be realized before qemu_init_vcpu() due to kvm */