From nobody Mon Sep 11 22:44:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rl1x542p2z4sZg6; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rl1x537xgz4HYV; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhVhPHXOd+oJN4rUSZHQIMSSJvRsvza5glvBTWXSwJc=; b=cYD+z70czbhcyRMQ+c545zz2dCpHWnvkzgWMlCviBTU5dcBMCFQ4eIqVae4AvMWW0SI1v3 JavH666qXM7dzGSJJrp+31MEYKozlEbxyjQC5PALlbyUrpqBIwZERpfcybCmkQE5B6VWW9 Bx4En6XiCGr1tSZjUz9OB3X7RB5Cu+v21+764slUgeWTrXXdtEFo8rULS8WlaoN/y5ghAe XgLMdXg3Z3/fH7/IUNITrjjwKQppmvVSdBFa1RM9NkO05b6z8dUYg+8XfW3aqul3gYXAPh l5zPQ1RzKN4nzrhJKCmlDetbaYTNw/ax6lGuIEQFpipEiucuCXmfkGIiXm518g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472265; a=rsa-sha256; cv=none; b=VLlZ9g9iqSVtUVTtyegz5HjoB1uYKh4YujOOzdN2RMUL+xvBNjOsNXnhUVCOc2v2QYJc1Z +LE0tp0rQH57txuO62mvPz8bBF/boWA0A84y2ZuJej0YU4jkK8PNQiDD8m9nxXp6N6lbb+ bPTXp6pW90uPOg0g+sJOdyNPWzRrKlK19vjtadeeIU12Cqw776qHbWvQ5Jw+8ijM12zxpF PQs2A6H8rgn+nW4pssnEME8hgpIgtcHPP/cgtJJtaNgXjLKmgMlkCqtw/DpCR8AbAAZdMW IXdaz6DGcQ9L/Dj/84erz5AtUzv0TN7Gpel+vkR/IDSVV6gyLvVHZ1sRU1yoIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhVhPHXOd+oJN4rUSZHQIMSSJvRsvza5glvBTWXSwJc=; b=j0kWQ62c8cV5Bpx/eDErTPEmBpH/mLkxrujUFa7sfmfECZn5zvfKi41KZKjyIRY3pNzMk5 Gbvde4yWcZKXFOdsUOrxZHhOUU80Dw+bstjbzKva0+CKwUvH2uGs3dNk5oY0vbN4mknEfd xz6rCTGQGt7oBh3HLWkr599w+kSfkoZJoiBPFv5lyr17agRWPwyFNXRSWtk27ywZB311le sIPUajLyj3BGXMLQv92AlbRd5vChyfKfhkcdnT9nYLHsstN0Pis0kW0XxQU5ycRUi+D17Q zawWfDIf6itphYisJA+f2ZX5wicB1f2l/HKKrWwispupsCgQK3cbVMXo2TJ8Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rl1x52DBdz16PM; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BMiPBE073930; Mon, 11 Sep 2023 22:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiPLI073927; Mon, 11 Sep 2023 22:44:25 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:25 GMT Message-Id: <202309112244.38BMiPLI073927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: dd70f2b48c9c - stable/13 - hwpmc_arm64: plug memory leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd70f2b48c9c0235e52721c2a6930285c3b6939e Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dd70f2b48c9c0235e52721c2a6930285c3b6939e commit dd70f2b48c9c0235e52721c2a6930285c3b6939e Author: Mitchell Horne AuthorDate: 2023-08-03 14:09:48 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:43:59 +0000 hwpmc_arm64: plug memory leak Free allocated per-CPU structures in the pcpu_fini and finalize methods. While here, add debug trace entries to these methods. Reviewed by: jkoshy, andrew MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41268 (cherry picked from commit 8bdceaecabd91ce5ed23646d91cef878681e19d6) --- sys/dev/hwpmc/hwpmc_arm64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index f0a487cf7d21..65f55108cecb 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -452,7 +452,7 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[arm64,%d] wrong cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP, INI, 1, "arm64-init cpu=%d", cpu); + PMCDBG0(MDP, INI, 1, "arm64-pcpu-init"); arm64_pcpu[cpu] = pac = malloc(sizeof(struct arm64_cpu), M_PMC, M_WAITOK | M_ZERO); @@ -493,10 +493,16 @@ arm64_pcpu_fini(struct pmc_mdep *md, int cpu) { uint32_t pmcr; + PMCDBG0(MDP, INI, 1, "arm64-pcpu-fini"); + pmcr = arm64_pmcr_read(); pmcr &= ~PMCR_E; arm64_pmcr_write(pmcr); + free(arm64_pcpu[cpu]->pc_arm64pmcs, M_PMC); + free(arm64_pcpu[cpu], M_PMC); + arm64_pcpu[cpu] = NULL; + return (0); } @@ -588,5 +594,7 @@ pmc_arm64_initialize(void) void pmc_arm64_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "arm64-finalize"); + free(arm64_pcpu, M_PMC); }