From patchwork Tue Dec 4 13:29:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 152814 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp8069349ljp; Tue, 4 Dec 2018 05:29:58 -0800 (PST) X-Google-Smtp-Source: AFSGD/VJvqNXZlQJthv3JGzInlOuiPtnEj7Ym1zv4da//rXseGBJoA7j4N91K3AYJZebBncr+TNO X-Received: by 2002:a63:f74f:: with SMTP id f15mr16949523pgk.190.1543930198237; Tue, 04 Dec 2018 05:29:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543930198; cv=none; d=google.com; s=arc-20160816; b=wUo5n3a19N3i8YNQ3xq2Hoyk2DTj5lHHuXzav6u3gdS/YTljIxNc7isPKyg+6tcVbF pLFA3iKQzDdJ1gngdi14tx91zo67ru9GBSNdBsQnPjDFh41j65I81NdD0poDt2CnUqQl STl5wijF1/HXSqV75bwKAO1USPMYkkhC4mj0wT28vQHgNfwF9jNSuMjQ2aEmEGQizgoF Kj2pmx3iXlxoqh/nyxD6sg9mldJCYGpKqnSVVS8KD8IDg8U72ksyR/SNMwfQw3kfItCr 5oHA/6E6yCgA79iDcjcRO9QnBXJyzPzxa6GbdQ7uH5PSUB3sL+h3UMZa40+E7oYlIHDA FJOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=tgeGFH4aZVMT8632qLLPuEGDel/p8eo3fIWvMbqVlg4=; b=DKdrIaMDPLvNKqt110uMfnXhYAGqp+fS2epvrbYC138nf2bBWMcHmdc+QW4oCoElne FWO3iiyYS6/6JPxLSljJ8zKxKHJdvKSRO+ne5Vdw9bNHK6SKUNlZg1chEqo1142toueA Z6Z+hoKnvQso6kmLAdaiRLjRyrZEUudShFtqEhPV/jjr7d3MgZr9Ly6wWGPqrjlYufPC PnaJPFEl3uiWcN8aa3GIwdOBAqUytELWLyaeVM+tRYN1nh+0cheEYk0tWUTSRPMVeAft SIGU5llpBmu3aef7oXZQezGeGt4uf76KszgtGAghLdBXt78Z2tzidP9/plWwPBa55iLD NXvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id q14si15449634pgf.47.2018.12.04.05.29.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Dec 2018 05:29:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gUAlt-0008Bm-Iw; Tue, 04 Dec 2018 13:29:53 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 1/5] target/arm: Free name string in ARMCPRegInfo hashtable entries Date: Tue, 4 Dec 2018 13:29:48 +0000 Message-Id: <20181204132952.2601-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204132952.2601-1-peter.maydell@linaro.org> References: <20181204132952.2601-1-peter.maydell@linaro.org> MIME-Version: 1.0 When we add a new entry to the ARMCPRegInfo hash table in add_cpreg_to_hashtable(), we allocate memory for tehe ARMCPRegInfo struct itself, and we also g_strdup() the name string. So the hashtable's value destructor function must free the name string as well as the struct. Spotted by clang's leak sanitizer. The leak here is a small one-off leak at startup, because we don't support CPU hotplug, and so the only time when we destroy hash table entries is for the case where ARM_CP_OVERRIDE means we register a wildcard entry and then override it later. Signed-off-by: Peter Maydell --- target/arm/cpu.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.19.2 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 60411f6bfe0..b84a6c0e678 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -642,6 +642,20 @@ uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz) return (Aff1 << ARM_AFF1_SHIFT) | Aff0; } +static void cpreg_hashtable_data_destroy(gpointer data) +{ + /* + * Destroy function for cpu->cp_regs hashtable data entries. + * We must free the name string because it was g_strdup()ed in + * add_cpreg_to_hashtable(). It's OK to cast away the 'const' + * from r->name because we know we definitely allocated it. + */ + ARMCPRegInfo *r = data; + + g_free((void *)r->name); + g_free(r); +} + static void arm_cpu_initfn(Object *obj) { CPUState *cs = CPU(obj); @@ -649,7 +663,7 @@ static void arm_cpu_initfn(Object *obj) cs->env_ptr = &cpu->env; cpu->cp_regs = g_hash_table_new_full(g_int_hash, g_int_equal, - g_free, g_free); + g_free, cpreg_hashtable_data_destroy); QLIST_INIT(&cpu->pre_el_change_hooks); QLIST_INIT(&cpu->el_change_hooks); From patchwork Tue Dec 4 13:29:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 152810 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp8069269ljp; Tue, 4 Dec 2018 05:29:54 -0800 (PST) X-Google-Smtp-Source: AFSGD/XAwbN0SOIuMw3umF6fBtUur2xGhl07gLVCiP7+/In9RAFcFTLXEtx3DnyrI9mAYz8p9nI9 X-Received: by 2002:a5d:5182:: with SMTP id k2mr17994543wrv.121.1543930194642; Tue, 04 Dec 2018 05:29:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543930194; cv=none; d=google.com; s=arc-20160816; b=Nwu9aRKk3vpUZrlH0/48rPIJmkbMbrsVP/RTSSV5RveQSamFq7UJIagaeXVSLGXnIP nFT/dsyz+Yht0omfw6TUxBnGH6wGA0vOvWIrxRO07Hu8IWhzI/QKjjPUEzg1kfxapXuF V5LPrGW1kXAoyAY1PGdKh0CoFJU4xEHl2i5s8leIkhEoeS7hBWjGKR3ej/JAdJ2nlzZK JPh37a92n2OkqE8Yjjyv0NPuV72AvN/0iwNhBu60MzTIt31mAQS3xwISEnLVVrda1Y/Y 7i2lIuyqY0UpnVx31VvjjIgMsNW6Nc25+HQZPKL5ZpniXrt+9ZvLFBm59TUpIsSkDBri 8boA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=dVUOj6WpfKVEYGsvW2icnxFYs7HyXKfbA4YvqKiZlg0=; b=I5zNOsROF5a9uDTlu9hw0GwT0qnANWLTe5fe467cBqq5hVb1EfPMs48f922N/rvAxj 5BR89H7bFPDebTybsFtxPD4aAQ6hkEMFslP3nJZU5JodbAZg0Br8zoQUMegMTzexOR9B pBbYWX7wuWtRd0dHiLSWv3SwFtBUYRfuIXX6B3/zEAT81L+MeWBIod9586fy4++Iu11G ySzSEr9ygnW9wpW9sRmdfyFuYckfN4HA73JhMNSRNqpMtnqsWRhoQmi/yWaJKWdCAhO0 T6Iat7pl5FDC3Yy4DNcPeXg0mbSr7KQO3jyGERWl1RKQGiGXZgcV7cmjPpjs7wqoYKRl 9+/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id i3si13894812wrh.295.2018.12.04.05.29.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Dec 2018 05:29:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gUAlu-0008C3-3R; Tue, 04 Dec 2018 13:29:54 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 2/5] hw/arm/mps2-tz.c: Free mscname string in make_dma() Date: Tue, 4 Dec 2018 13:29:49 +0000 Message-Id: <20181204132952.2601-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204132952.2601-1-peter.maydell@linaro.org> References: <20181204132952.2601-1-peter.maydell@linaro.org> MIME-Version: 1.0 The clang leak sanitizer spots a (one-off, trivial) memory leak in make_dma() due to a missing free. Signed-off-by: Peter Maydell --- hw/arm/mps2-tz.c | 1 + 1 file changed, 1 insertion(+) -- 2.19.2 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 6dd02ae47e8..82b1d020a58 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -322,6 +322,7 @@ static MemoryRegion *make_dma(MPS2TZMachineState *mms, void *opaque, sysbus_connect_irq(s, 2, qdev_get_gpio_in_named(iotkitdev, "EXP_IRQ", 57 + i * 3)); + g_free(mscname); return sysbus_mmio_get_region(s, 0); } From patchwork Tue Dec 4 13:29:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 152811 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp8069283ljp; Tue, 4 Dec 2018 05:29:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/UBY5mASSspF1l/U/8XvnRGb8X/xJsYaBHkdfCA4OhTRuzQdsIgNeY7CmDoIejZkohAXloU X-Received: by 2002:a1c:d988:: with SMTP id q130mr12927654wmg.41.1543930195162; Tue, 04 Dec 2018 05:29:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543930195; cv=none; d=google.com; s=arc-20160816; b=gH9GBlkvHBew/thhvGodorpsPG2ic1Zvx33pNuNkGbW8FKCNxRhw0XDfi5+KVZt1dj i04aU+48vbtqDAp9IUbf1LGJI6Ko6O+EiVLtSGB2LNXlpBBxiBQ41+o/JMYk+9s2sJMR z8FukM5hbR4w9yoQiVO/RWuz3wDAfeHaH6ljls66ccgtilY/aPmGZvtws0bdiUXJ1sZc BvpLwIdfIbJ1PvAAEeReRQ3gwf3uGkfgClIs+zJ/2GD9eJnxIigYkOJtX57V/Oi+eRNh FbB/cXTbRKPd8HZY/tLzXKwYE6NSJDiuh4zlKzTz6gB8f1YDW5MFCzefTMlCJovTF2Oi zalQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=mamUj2zWB24ciEZclPxo44bBVi9Ux6pp4DxcjmW26iQ=; b=Y3BgPf5bcWiVXUO3V97KejeTccmKsR6jbOqeaZlpOm/uaqKj4YZ3FvSs+cE59o43l+ McSwQtnm5H4PiJrkyDKN9iMiDuphjle3MPklch8qPaAD1HtOgnHLTh9eySTzlG91ZMlu OakDtFmAj+W3ZeM4BaCNXbNPlcxOZVD4h9+MbndVlgi35YDL4DdzD57UHgFNLAoZVAO7 8rY/xIwYHi45h1qX7TF1MOjukUSXIDqlxNFpIU8C/H/9rYv5ZNcI6cErOxgQN1RS4TO3 8g7h+deB6AuRTx5tXqhm8n+7eOuBeBMTvWt1e2XfZdQ2tlFR9oq59tyC9E7JEvQk/46r PCRQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id n25si11425131wra.167.2018.12.04.05.29.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Dec 2018 05:29:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gUAlu-0008CI-Ke; Tue, 04 Dec 2018 13:29:54 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 3/5] hw/sd/sdhci: Don't leak memory region in sdhci_sysbus_realize() Date: Tue, 4 Dec 2018 13:29:50 +0000 Message-Id: <20181204132952.2601-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204132952.2601-1-peter.maydell@linaro.org> References: <20181204132952.2601-1-peter.maydell@linaro.org> MIME-Version: 1.0 In sdhci_sysbus_realize() we override the initialization of s->iomem that sdhci_common_realize() performs. However we don't destroy the old memory region before reinitializing it, which means that the memory allocated for mr->name in memory_region_do_init() is leaked. Since sdhci_initfn() already initializes s->io_ops to &sdhci_mmio_ops, always use that in sdhci_common_realize() and remove the now-unnecessary reinitialization of the MMIO region from sdhci_sysbus_realize(). Spotted by clang's leak sanitizer. Signed-off-by: Peter Maydell --- hw/sd/sdhci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.19.2 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 81bbf032794..83f1574ffdc 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1371,7 +1371,7 @@ static void sdhci_common_realize(SDHCIState *s, Error **errp) s->buf_maxsz = sdhci_get_fifolen(s); s->fifo_buffer = g_malloc0(s->buf_maxsz); - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", + memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci", SDHC_REGISTERS_MAP_SIZE); } @@ -1565,9 +1565,6 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) sysbus_init_irq(sbd, &s->irq); - memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci", - SDHC_REGISTERS_MAP_SIZE); - sysbus_init_mmio(sbd, &s->iomem); } From patchwork Tue Dec 4 13:29:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 152812 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp8069292ljp; Tue, 4 Dec 2018 05:29:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/WbOLfgtj1NVkjfjuMTIUmjwXKqTzUjDi0UlQB1c3icfDAh9nj6Nc1nQSPVkP00a0i78Lcf X-Received: by 2002:adf:e284:: with SMTP id v4mr13408309wri.26.1543930195692; Tue, 04 Dec 2018 05:29:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543930195; cv=none; d=google.com; s=arc-20160816; b=fyr/xHx5nDgWa6407GEesMChUajpAGzglAj8HtEEJNkiR/pIQyxghkky3/43ngQ5W3 G1rIaQYmjuvwUv5O1P3bnROjFzHZgAjsbN2z//JhTW8av5py664DsEb4HblQTCijXx9Z tmxwLatAgDq1TNZL54ofku9/NpfkDuJP1oKg2JWSaKk2wiF41B9V+CQhwaaJU5gNSOPY boYsh848MxQVUZ5Nz6kHi3rtb01E+LIkKKsSC+LPjrdyOzPa7LYlJt5ajnDchRmyumus 1tH/n6+lpgzYDgx8wzvrT26u41hpbCSjPVQ13VOYDLvjRZ/3pzEHAY+tI82k2Mo5N4hY Hw5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=rIVReNg823ar8HdxJcvX3AabuLeORa3G1b8cQmCuJTw=; b=IFrikWwGhI2P4Xh8iYztaEJWm/MT++iU3r/OHFcrFBG/LyDSCWy32nSsf6GImLLqvr xVwecl+x/548MLYn1r6bKTLGHvPspZR1CBK6pJhS5aIWarmlMo6R4gCNFVPn6AqMs7zz iX6MQ3gbVS7XoWc0L2/PoYxKoIwByE+LHSn85Cqj6vLM+rwHK9/9UP0qKuX64fwW5WNS +1H13pGYhQj5dsV1UitrNh7J4oXawXOvQ0zQMvtSMkgtIG5Fq/Wg69zxIFRqEZfNWZoB d4jnAckJWMe+aKBS+6t3FhXUCohTHcTw++bsD7G9mM0xYrMPsvxzOLWwyuxX1p3dOteI FjNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id z1si13565002wrl.110.2018.12.04.05.29.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Dec 2018 05:29:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gUAlv-0008CX-5B; Tue, 04 Dec 2018 13:29:55 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 4/5] tests/test-arm-mptimer: Don't leak string memory Date: Tue, 4 Dec 2018 13:29:51 +0000 Message-Id: <20181204132952.2601-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204132952.2601-1-peter.maydell@linaro.org> References: <20181204132952.2601-1-peter.maydell@linaro.org> MIME-Version: 1.0 The test-arm-mptimer setup creates a lot of test names using g_strdup_printf() and never frees them. This is entirely harmless since it's one-shot test code, but it clutters up the output from clang's LeakSanitizer. Refactor to use a helper function so we can free the memory. Signed-off-by: Peter Maydell --- tests/test-arm-mptimer.c | 153 ++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 84 deletions(-) -- 2.19.2 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/test-arm-mptimer.c b/tests/test-arm-mptimer.c index cb8f2df9141..156a39f50dd 100644 --- a/tests/test-arm-mptimer.c +++ b/tests/test-arm-mptimer.c @@ -991,10 +991,25 @@ static void test_timer_zero_load_nonscaled_periodic_to_prescaled_oneshot(void) g_assert_cmpuint(timer_get_and_clr_int_sts(), ==, 0); } +/* + * Add a qtest test that comes in two versions: one with + * a timer scaler setting, and one with the timer nonscaled. + */ +static void add_scaler_test(const char *str, bool scale, + void (*fn)(const void *)) +{ + char *name; + int *scaler = scale ? &scaled : &nonscaled; + + name = g_strdup_printf("%s=%d", str, *scaler); + qtest_add_data_func(name, scaler, fn); + g_free(name); +} + int main(int argc, char **argv) { - int *scaler = &nonscaled; int ret; + int scale; g_test_init(&argc, &argv, NULL); @@ -1012,89 +1027,59 @@ int main(int argc, char **argv) qtest_add_func("mptimer/prescaler", test_timer_prescaler); qtest_add_func("mptimer/prescaler_on_the_fly", test_timer_prescaler_on_the_fly); -tests_with_prescaler_arg: - qtest_add_data_func( - g_strdup_printf("mptimer/oneshot scaler=%d", *scaler), - scaler, test_timer_oneshot); - qtest_add_data_func( - g_strdup_printf("mptimer/pause scaler=%d", *scaler), - scaler, test_timer_pause); - qtest_add_data_func( - g_strdup_printf("mptimer/reload scaler=%d", *scaler), - scaler, test_timer_reload); - qtest_add_data_func( - g_strdup_printf("mptimer/periodic scaler=%d", *scaler), - scaler, test_timer_periodic); - qtest_add_data_func( - g_strdup_printf("mptimer/oneshot_to_periodic scaler=%d", *scaler), - scaler, test_timer_oneshot_to_periodic); - qtest_add_data_func( - g_strdup_printf("mptimer/periodic_to_oneshot scaler=%d", *scaler), - scaler, test_timer_periodic_to_oneshot); - qtest_add_data_func( - g_strdup_printf("mptimer/set_oneshot_counter_to_0 scaler=%d", *scaler), - scaler, test_timer_set_oneshot_counter_to_0); - qtest_add_data_func( - g_strdup_printf("mptimer/set_periodic_counter_to_0 scaler=%d", *scaler), - scaler, test_timer_set_periodic_counter_to_0); - qtest_add_data_func( - g_strdup_printf("mptimer/noload_oneshot scaler=%d", *scaler), - scaler, test_timer_noload_oneshot); - qtest_add_data_func( - g_strdup_printf("mptimer/noload_periodic scaler=%d", *scaler), - scaler, test_timer_noload_periodic); - qtest_add_data_func( - g_strdup_printf("mptimer/zero_load_oneshot scaler=%d", *scaler), - scaler, test_timer_zero_load_oneshot); - qtest_add_data_func( - g_strdup_printf("mptimer/zero_load_periodic scaler=%d", *scaler), - scaler, test_timer_zero_load_periodic); - qtest_add_data_func( - g_strdup_printf("mptimer/zero_load_oneshot_to_nonzero scaler=%d", *scaler), - scaler, test_timer_zero_load_oneshot_to_nonzero); - qtest_add_data_func( - g_strdup_printf("mptimer/zero_load_periodic_to_nonzero scaler=%d", *scaler), - scaler, test_timer_zero_load_periodic_to_nonzero); - qtest_add_data_func( - g_strdup_printf("mptimer/nonzero_load_oneshot_to_zero scaler=%d", *scaler), - scaler, test_timer_nonzero_load_oneshot_to_zero); - qtest_add_data_func( - g_strdup_printf("mptimer/nonzero_load_periodic_to_zero scaler=%d", *scaler), - scaler, test_timer_nonzero_load_periodic_to_zero); - qtest_add_data_func( - g_strdup_printf("mptimer/set_periodic_counter_on_the_fly scaler=%d", *scaler), - scaler, test_timer_set_periodic_counter_on_the_fly); - qtest_add_data_func( - g_strdup_printf("mptimer/enable_and_set_counter scaler=%d", *scaler), - scaler, test_timer_enable_and_set_counter); - qtest_add_data_func( - g_strdup_printf("mptimer/set_counter_and_enable scaler=%d", *scaler), - scaler, test_timer_set_counter_and_enable); - qtest_add_data_func( - g_strdup_printf("mptimer/oneshot_with_counter_0_on_start scaler=%d", *scaler), - scaler, test_timer_oneshot_with_counter_0_on_start); - qtest_add_data_func( - g_strdup_printf("mptimer/periodic_with_counter_0_on_start scaler=%d", *scaler), - scaler, test_timer_periodic_with_counter_0_on_start); - qtest_add_data_func( - g_strdup_printf("mptimer/periodic_counter scaler=%d", *scaler), - scaler, test_periodic_counter); - qtest_add_data_func( - g_strdup_printf("mptimer/set_counter_periodic_with_zero_load scaler=%d", *scaler), - scaler, test_timer_set_counter_periodic_with_zero_load); - qtest_add_data_func( - g_strdup_printf("mptimer/set_oneshot_load_to_0 scaler=%d", *scaler), - scaler, test_timer_set_oneshot_load_to_0); - qtest_add_data_func( - g_strdup_printf("mptimer/set_periodic_load_to_0 scaler=%d", *scaler), - scaler, test_timer_set_periodic_load_to_0); - qtest_add_data_func( - g_strdup_printf("mptimer/zero_load_mode_switch scaler=%d", *scaler), - scaler, test_timer_zero_load_mode_switch); - - if (scaler == &nonscaled) { - scaler = &scaled; - goto tests_with_prescaler_arg; + for (scale = 0; scale < 2; scale++) { + add_scaler_test("mptimer/oneshot scaler", + scale, test_timer_oneshot); + add_scaler_test("mptimer/pause scaler", + scale, test_timer_pause); + add_scaler_test("mptimer/reload scaler", + scale, test_timer_reload); + add_scaler_test("mptimer/periodic scaler", + scale, test_timer_periodic); + add_scaler_test("mptimer/oneshot_to_periodic scaler", + scale, test_timer_oneshot_to_periodic); + add_scaler_test("mptimer/periodic_to_oneshot scaler", + scale, test_timer_periodic_to_oneshot); + add_scaler_test("mptimer/set_oneshot_counter_to_0 scaler", + scale, test_timer_set_oneshot_counter_to_0); + add_scaler_test("mptimer/set_periodic_counter_to_0 scaler", + scale, test_timer_set_periodic_counter_to_0); + add_scaler_test("mptimer/noload_oneshot scaler", + scale, test_timer_noload_oneshot); + add_scaler_test("mptimer/noload_periodic scaler", + scale, test_timer_noload_periodic); + add_scaler_test("mptimer/zero_load_oneshot scaler", + scale, test_timer_zero_load_oneshot); + add_scaler_test("mptimer/zero_load_periodic scaler", + scale, test_timer_zero_load_periodic); + add_scaler_test("mptimer/zero_load_oneshot_to_nonzero scaler", + scale, test_timer_zero_load_oneshot_to_nonzero); + add_scaler_test("mptimer/zero_load_periodic_to_nonzero scaler", + scale, test_timer_zero_load_periodic_to_nonzero); + add_scaler_test("mptimer/nonzero_load_oneshot_to_zero scaler", + scale, test_timer_nonzero_load_oneshot_to_zero); + add_scaler_test("mptimer/nonzero_load_periodic_to_zero scaler", + scale, test_timer_nonzero_load_periodic_to_zero); + add_scaler_test("mptimer/set_periodic_counter_on_the_fly scaler", + scale, test_timer_set_periodic_counter_on_the_fly); + add_scaler_test("mptimer/enable_and_set_counter scaler", + scale, test_timer_enable_and_set_counter); + add_scaler_test("mptimer/set_counter_and_enable scaler", + scale, test_timer_set_counter_and_enable); + add_scaler_test("mptimer/oneshot_with_counter_0_on_start scaler", + scale, test_timer_oneshot_with_counter_0_on_start); + add_scaler_test("mptimer/periodic_with_counter_0_on_start scaler", + scale, test_timer_periodic_with_counter_0_on_start); + add_scaler_test("mptimer/periodic_counter scaler", + scale, test_periodic_counter); + add_scaler_test("mptimer/set_counter_periodic_with_zero_load scaler", + scale, test_timer_set_counter_periodic_with_zero_load); + add_scaler_test("mptimer/set_oneshot_load_to_0 scaler", + scale, test_timer_set_oneshot_load_to_0); + add_scaler_test("mptimer/set_periodic_load_to_0 scaler", + scale, test_timer_set_periodic_load_to_0); + add_scaler_test("mptimer/zero_load_mode_switch scaler", + scale, test_timer_zero_load_mode_switch); } qtest_start("-machine vexpress-a9"); From patchwork Tue Dec 4 13:29:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 152813 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp8069307ljp; Tue, 4 Dec 2018 05:29:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/VgTKPRUANMSU5D+atnaD68R2vfXJD5jv6kNosIF8dN/77vDicY940tOV6oEXK4Qp6vM6p5 X-Received: by 2002:adf:8464:: with SMTP id 91mr19123371wrf.251.1543930196263; Tue, 04 Dec 2018 05:29:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543930196; cv=none; d=google.com; s=arc-20160816; b=JbQPij+l7boXqv+ZoySz7IknjgIcAjExHEP9f6qqEO+5K40j+IuGUT/ic8+EOXtRzz 2mQF4x8xhM6Jdsk9S8mu//UvQDodOaJTJtlF6BNr+i0PSDHfZCkY4FBPbHWBgM/AFT7x MWuRqLfnLfcsCvLde48oYZkb6+iAgT1AexYMJl4BbTosMnUXH/XKD1UPLi/2gxlbJLxJ Ks1KiYMAx9X+gjVsiUheKnYCnhEd1ixCQldcmDntdch9AV6NjKGzjp+HGNx59ACOp0sa WbM3D8NaEsGkvztHIwatAnMhre42P6JFb5umewW6d0P1YMmVDoOjLeKtDrXPnA8PZZbe wmgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=5ODWp/MEZ7MIgMwbY8al9xKiOHBbFkpkw8heg21DcHc=; b=jK1Tx6125mlWhbQnncu/qJxGVMhQdchAhp6q5PUrH68KMhkf2fVqw5egxwpN9ztOUl TWjs7HpBRxTJmtOOlGzZ1O2NLmc0UfDcKp6LB6IRKOWvCDXQO0nydslkKiP6/zKCK9MP BtS8FJPPJeA1vuJeGSOPPqCwzZJQVJgRlYdxEt2B4vk33Z4tm31b994oIyccKHkZwosv tFV4cXMKz5E+atf/bnu73IA5BFMfVZq7dvP7AnhzA1oD67Xe3OaFPu67Cl14QWkDOlOG gJHOHDS/vtaHrN0kxPBtIlHmSgP44+hwq/ITJTT48B20MlRgPRUyFVwaGR763zaCQe/m 31JQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id j204si8465962wma.169.2018.12.04.05.29.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Dec 2018 05:29:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gUAlv-0008Cn-QU; Tue, 04 Dec 2018 13:29:55 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 5/5] target/arm: Create timers in realize, not init Date: Tue, 4 Dec 2018 13:29:52 +0000 Message-Id: <20181204132952.2601-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204132952.2601-1-peter.maydell@linaro.org> References: <20181204132952.2601-1-peter.maydell@linaro.org> MIME-Version: 1.0 The timer_new() function allocates memory; this means that if we call it in the CPU's init method we would need to provide an instance_finalize method to free it. Defer the timer creation to the realize function instead. This fixes a memory leak spotted by clang LeakSanitizer when a CPU object is created for introspection. Signed-off-by: Peter Maydell --- target/arm/cpu.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) -- 2.19.2 Reviewed-by: Richard Henderson diff --git a/target/arm/cpu.c b/target/arm/cpu.c index b84a6c0e678..0e7138c9bfb 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -679,14 +679,6 @@ static void arm_cpu_initfn(Object *obj) qdev_init_gpio_in(DEVICE(cpu), arm_cpu_set_irq, 4); } - cpu->gt_timer[GTIMER_PHYS] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, - arm_gt_ptimer_cb, cpu); - cpu->gt_timer[GTIMER_VIRT] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, - arm_gt_vtimer_cb, cpu); - cpu->gt_timer[GTIMER_HYP] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, - arm_gt_htimer_cb, cpu); - cpu->gt_timer[GTIMER_SEC] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, - arm_gt_stimer_cb, cpu); qdev_init_gpio_out(DEVICE(cpu), cpu->gt_timer_outputs, ARRAY_SIZE(cpu->gt_timer_outputs)); @@ -882,6 +874,15 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) return; } } + + cpu->gt_timer[GTIMER_PHYS] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, + arm_gt_ptimer_cb, cpu); + cpu->gt_timer[GTIMER_VIRT] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, + arm_gt_vtimer_cb, cpu); + cpu->gt_timer[GTIMER_HYP] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, + arm_gt_htimer_cb, cpu); + cpu->gt_timer[GTIMER_SEC] = timer_new(QEMU_CLOCK_VIRTUAL, GTIMER_SCALE, + arm_gt_stimer_cb, cpu); #endif cpu_exec_realizefn(cs, &local_err);