From nobody Thu Aug 3 14:13:21 2023 X-Original-To: dev-commits-src-main@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 4RGrRP4fp2z2tvlK; Thu, 3 Aug 2023 14:13:21 +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 4RGrRP4CHzz4Gk2; Thu, 3 Aug 2023 14:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072001; 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=Gr+MalKw32rRtQ/pWQAkWAj6BG/tLJmyVNJgBJQ1gPc=; b=v1STJHhyYdGICOeBHlUJ4M8eXjDi5Xr7A85fIzeE77Xa2uhEUzPW5co+29ktqvqQcxJXe6 2a79B2B0Dw+kp+4HCyC6AOEqLIsWvRoEnpXXKWVrHy+OAeAmvL/htT90epUDZhVTS1YPsl dhkkrYazW92Y9631RhbuBkOrpOHykk+GbdjirJ8Hpca6A/wr4ZmHxW8JQOHKH+MiKgVqT+ sjUJ4CK+3N79iShxD5huS78IxdUiDkZGuU/NASpjGgeQzh7l3rXwGls/mQw8svLB98PnqZ a+C9t6awQvqpVwXqzr3KOynW7qFdcoqKzNzN1OWYgaPas0KfapL8sZ1ngA8e7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691072001; 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=Gr+MalKw32rRtQ/pWQAkWAj6BG/tLJmyVNJgBJQ1gPc=; b=OQHY/sq7EUm8JFo19KIpMzAh4t/66xNQzjW1IwKhL+Hol/C3r6z/vQQ9duE72MmrRmywX5 vsXtX95atJxjNI99knCx7teotaXlaGyEskG0kGdekOLm+ZovzcL4Ck/f4sphP9tE+xCqPb cT0M8blYmckMYeANnUkXu+rfGbS+2o7nzIh9KbMOtWEtwwZ6TvQ8CYklPIkMIpylGDckim Ki1RM46/RsQ5jjtQjQ3054A4wLmvc19/19VEBhfkND45uCe4/QHyI3nJ61S1CyyHmBS+98 rmKUpEZMmSLxD1cMyGSs/GkR8PFbsr96Dw+xjzWxVgDM8S0toMLVB7P2l3WRXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691072001; a=rsa-sha256; cv=none; b=hNwKSVpRDyN3QPnP5WcQvHaiZ58CrqicMxAFMZnt9f7KEmdoRHAJTTCl6y+52O2BMmdDa4 VMnSPxsVYS9PW5Szp248Pfme13ewdrkTkI24jeLyuskkfD+rKwibU1Ig754c/7aBW7pfog IfWkd/kvVgYPUZD075eqFlol9DflGvrTgEozWfHH2T2ry0U/MyCq0qWMkrv/gx6IKTJ335 A5uynLDhqmy2SIaarvl5IeC4yh1ODAqVXepaQBiTVxETMH3Kc7ZChHAxsI4rTgkbvF6eye 547mFv0pyCLS4R6mnpmILSMDqMvlYU2wyrQ4DrMO4a+Q9P8PKpgGvkkjy/mVpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RGrRP3GyTz8By; Thu, 3 Aug 2023 14:13:21 +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 373EDLE9007577; Thu, 3 Aug 2023 14:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373EDLRJ007576; Thu, 3 Aug 2023 14:13:21 GMT (envelope-from git) Date: Thu, 3 Aug 2023 14:13:21 GMT Message-Id: <202308031413.373EDLRJ007576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8bdceaecabd9 - main - hwpmc_arm64: plug memory leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8bdceaecabd91ce5ed23646d91cef878681e19d6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8bdceaecabd91ce5ed23646d91cef878681e19d6 commit 8bdceaecabd91ce5ed23646d91cef878681e19d6 Author: Mitchell Horne AuthorDate: 2023-08-03 14:09:48 +0000 Commit: Mitchell Horne CommitDate: 2023-08-03 14:13:03 +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 --- 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 bbd3edf84ea0..90a35456feb7 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -450,7 +450,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); @@ -491,10 +491,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); } @@ -605,5 +611,7 @@ pmc_arm64_initialize(void) void pmc_arm64_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "arm64-finalize"); + free(arm64_pcpu, M_PMC); }