From patchwork Thu Sep 5 13:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 825631 Delivered-To: patch@linaro.org Received: by 2002:adf:a345:0:b0:367:895a:4699 with SMTP id d5csp285567wrb; Thu, 5 Sep 2024 06:02:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdTqp3N0nkTq1cmRqdE+IH2TVHJf3T6q13xT9xNMeYg84z6h9vvohisTA6MOH1D2A0mk+tig==@linaro.org X-Google-Smtp-Source: AGHT+IHfBAwJ4KaYi7SnAoCJUX0sZmzyY6BbHYGbzfAwY8BNzIikJH07cjPNzx4bPvs3rm1CdFKA X-Received: by 2002:a05:6902:707:b0:e1d:f5c:97d6 with SMTP id 3f1490d57ef6-e1d0f5c9a14mr7515308276.51.1725541323386; Thu, 05 Sep 2024 06:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725541323; cv=none; d=google.com; s=arc-20160816; b=KmASRRWqX7bR6gNHaE0Nzptkgdp7yaVE5OH12k9QgmU6LLcmIXaMREhyCH+/WEStJP jtuhlp7LBSG1z6xHJVeiPx9WzitkmW+ftD3Gr9esPirFaZ2UHd0v9Z9t/uuQzNwaSXie pAio4SEUmhAB2kr30QRBwkTDPVL3lBkBFZ0cpnm1T/ZWTjhc26ZNoFWgLrpggrFtWUDX jimdY68h2UeMzpQEpkccDqL3z8NJgI9ynrvWj+5xP/0mh089J6o9Ft4MIVPNVc1LH1ps ANYWzCER0xMkpnbUyyudifegMPQC34PTdAyf3SlIJDeXVssbc7LGjKQuLi7ubjK66VaR 6hRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=b1yg3Idz1Ekq5+f2VLIMP8Rh4xmuLplWauidI9V+Kp4=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=i3Z1+Ic4RXWb4v7EsSbhf/lQQcPNf3ZuBYG8tAmdflT421OdxtyBNpibiAjZ174c55 4IGLN7pHcMRrR1I5SvAlbPKrlPdnoZL1QgukdfGvfMmTABtESLMtY8xKAa1Aj0ploh66 bnvS2skHKMD9wDdvjVYOuyHdsXRDF9bAVw8u8zDE2ZBpFz7wSEOej+PvYzsq33ntMicf hyg+NcUO2y6hzVJNaFGszy+KrhtMjqxPjzjKe8TVwGbkLDMNubLV6m+58c0wrfghHDGu Pjq9MQWvuRG2m/W6H0TC2z8fIp8K1TqGjRwAge/TdXP/713t1rc247rWvzvRWzsZQPXg 8sxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vKopu4/A"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 3f1490d57ef6-e1a62739c08si11107783276.659.2024.09.05.06.02.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Sep 2024 06:02:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vKopu4/A"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smC7B-0001qr-DN; Thu, 05 Sep 2024 09:01:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smC6y-00018o-Pb for qemu-devel@nongnu.org; Thu, 05 Sep 2024 09:01:20 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smC6t-0001kz-GJ for qemu-devel@nongnu.org; Thu, 05 Sep 2024 09:01:20 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-374bd0da617so430171f8f.3 for ; Thu, 05 Sep 2024 06:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725541274; x=1726146074; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b1yg3Idz1Ekq5+f2VLIMP8Rh4xmuLplWauidI9V+Kp4=; b=vKopu4/Av9UHUN9CDV2p21QGn6+Qzy8BENLQ0YRnjbOMk+tiPp2mOWjRYjBD2Z0pz3 jjo6d6aZ/LogUoLm7X7rpaIvar1fuOerg42fLxy/shztS5ZbECSNfo24eYfrcrR13FE9 FD8GZncwZMv1W/QtDY1+07XBJYfim5/1oMjkV9z93mW+Cr5+1DqJ1f1LWJUvsj2PT4fN Lsftx0cJgaqq8oXRX+p2cGuo9+mMzP8Sw9CzQwTezRQIkoI531J5vdHkpYS9UL1ARbHW HtvQGuDIf5r3dwVlctEEqQP4u5rr5AXf23OCERDXts4xcAeaVJYb8R73aN/TraQg/LRG LQ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725541274; x=1726146074; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b1yg3Idz1Ekq5+f2VLIMP8Rh4xmuLplWauidI9V+Kp4=; b=AlIiaiDlhWJRkChHsnBLo9Y+FWMpw1LN2rv1K4TgBc86aYhFqVhgHRH8np3jO39ZeC nUXDuu40Kpq9epxa7UrQxeAwB0++Y8HGxlBPheg7X/H89qNPYT8c18V/omZgWkchfexC tuwce9kusNQ+hO1q2HBDx9Z6+e4gJDGDz6Nx9V8nbfzYFtXp1Nxl/3poErw6GZoZoba9 zeIzhmIvFdNWxbEkGMKFls2Tdjk6BmSxGpeoWaZqt3XosaCUkc+OfnvNHlym5I1VT6w0 xcdgMlPerb/5L6tPclUx6aJTQOLvVk40qFCa2bHki2Hm3u/+ktI00OcNxDV6gtbFQAVC 1YQg== X-Gm-Message-State: AOJu0YyojD4QSo1twz7vqrkXGe7X5eDZ6AwsJAw8ocYDu2YAo6Qj6Zo5 /N13aW8SbS2UtCuzX60VH6mVIHHf+QTTYfx8KrFLwWLluPKJjt9UACgYATTEQGliV5bq1hkm2rM 1 X-Received: by 2002:adf:e7c7:0:b0:368:633d:f111 with SMTP id ffacd0b85a97d-374bcfe5e99mr12241174f8f.40.1725541273597; Thu, 05 Sep 2024 06:01:13 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42bb6e355dfsm232251365e9.46.2024.09.05.06.01.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 06:01:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/25] hw/nvram/xlnx-bbram: Call register_finalize_block Date: Thu, 5 Sep 2024 14:00:51 +0100 Message-Id: <20240905130100.298768-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240905130100.298768-1-peter.maydell@linaro.org> References: <20240905130100.298768-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The TYPE_XLNX_BBRAM 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 0x5641518ca9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294d9d8) (BuildId: 4a6 18cb63d57d5a19ed45cfc262b08da47eaafe5) #1 0x7ff1aab31c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 #2 0x564151cffc5d in register_init_block hw/core/register.c:248:34 #3 0x564151d006be in register_init_block32 hw/core/register.c:299:12 #4 0x56415293df75 in bbram_ctrl_init hw/nvram/xlnx-bbram.c:462:9 #5 0x564154891dc1 in object_init_with_type qom/object.c:420:9 #6 0x56415487909b in object_initialize_with_type qom/object.c:562:5 #7 0x56415487a93d in object_new_with_type qom/object.c:782:5 #8 0x56415487aa11 in object_new qom/object.c:797:12 #9 0x56415507883d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias Reviewed-by: Alistair Francis Message-id: 20240822162127.705879-4-peter.maydell@linaro.org --- include/hw/nvram/xlnx-bbram.h | 1 + hw/nvram/xlnx-bbram.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 6fc13f8cc17..bce8e89d905 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -47,6 +47,7 @@ struct XlnxBBRam { bool bbram8_wo; bool blk_ro; + RegisterInfoArray *reg_array; uint32_t regs[RMAX_XLNX_BBRAM]; RegisterInfo regs_info[RMAX_XLNX_BBRAM]; }; diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 09575a77d77..1bc58e90ad0 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -456,9 +456,8 @@ static void bbram_ctrl_init(Object *obj) { XlnxBBRam *s = XLNX_BBRAM(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - RegisterInfoArray *reg_array; - reg_array = + s->reg_array = register_init_block32(DEVICE(obj), bbram_ctrl_regs_info, ARRAY_SIZE(bbram_ctrl_regs_info), s->regs_info, s->regs, @@ -466,10 +465,17 @@ static void bbram_ctrl_init(Object *obj) XLNX_BBRAM_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_bbram); } +static void bbram_ctrl_finalize(Object *obj) +{ + XlnxBBRam *s = XLNX_BBRAM(obj); + + register_finalize_block(s->reg_array); +} + static void bbram_prop_set_drive(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -537,6 +543,7 @@ static const TypeInfo bbram_ctrl_info = { .instance_size = sizeof(XlnxBBRam), .class_init = bbram_ctrl_class_init, .instance_init = bbram_ctrl_init, + .instance_finalize = bbram_ctrl_finalize, }; static void bbram_ctrl_register_types(void)