From nobody Mon Aug 28 00:28:21 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 4RYrxx3Brlz4rpt7; Mon, 28 Aug 2023 00:28: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 4RYrxx2Xwbz3Xr8; Mon, 28 Aug 2023 00:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182501; 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=sSpu6TIaIXxllmbTLyAmIdJVD6bRWLi1t24HOlHbSzY=; b=TA6TMM4vFJxvS+uRmXDl/EOqo2det4/BeWpcxhMFsFnJgp9yy7BCvz0IMWnWr5i6sJsswR u5rFFtYwUmcKAmQ1IF2982R5sWDs7wSvlJIkS4CniuBAT5LnjUWCBq4uJ0ruce92NeEAi6 02e00mh3Ep2WZdSsa/+QnEQgT+X9BwY+kAgelLugcU62c5j3wJW+rtMFbesUrhTohYz7Fg 7nJr0ElvTYG5cy0CZhSQ1JYM19fjGBit3AseorvJCopu/A7ciQdxBFrl/18fS5r/GY7mbY O4/Abt9j7208XQ9QdInt86XE8s8WDawuf7Eag12UadbZV1RAZvu7+o/rR4PLaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182501; 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=sSpu6TIaIXxllmbTLyAmIdJVD6bRWLi1t24HOlHbSzY=; b=VOhBY5LQhOlbdq4Q3SjD5hjtXdzC+OegXZkY2SYbz4RCatdU6sGDmLXsFZz7zv6yj6U/Un Bv4uabxSLNAN1a6hsYcVE73fhWSJ8zKpl99TqjY5cmn+0S4+MzHqD6imfuBaF0L6H/KGDR o0zhig66fT4PXmRIiS2+MdbQIeXWKB/S7eFqH3ljPwCG7UoqYK0S9/geygU2N8O1bzZ3NN V0W/9Iw3HrPfigkU54+hYKeTXQvKXDY9NWlX3qc+JccroAPoQ/W0z4qeauz5FbPvnJN5cn IpZZ3EjAENn4L8E9P/foO6YXIIO0Pqo4jFHXnUaND4kogD3RVurN8BOQf4eZug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693182501; a=rsa-sha256; cv=none; b=OE44TR/wmWFxGOxkxpMcmBkGiAD4/C7kyacrsLroWyMSSSgyoBZCUzKlgKTjpY3e1GIpbL LztWCdnUTxAjxisjECfUoR9lEe+NTC/h4AMjQRrKA969FhjgdFUViJXnmeM4d0F20HejD5 Xq1harmX4qMk6Yy+9LagR1p2qxnTkFI0OwqJUkRn83JRDa6Nsw3gixUUaiLA8CwYXqshAm jjrbqflVmIPQLnbNhLT433BZykkEMYxX4X5ErG+FbDLuT1RzyJ2zUggO8uAj5NI4PQxGm6 HuBWnL9l0k63zlhkecxL3DjTLojS0B4jEngPZIYcsKWK3vX+H/N0n5NVkfd1+g== 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 4RYrxx1bSMznjX; Mon, 28 Aug 2023 00:28: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 37S0SLkl069651; Mon, 28 Aug 2023 00:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37S0SLt4069648; Mon, 28 Aug 2023 00:28:21 GMT (envelope-from git) Date: Mon, 28 Aug 2023 00:28:21 GMT Message-Id: <202308280028.37S0SLt4069648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b03535a3b559 - stable/13 - hwpmc: on process exit, ensure that the owned log is closed 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b03535a3b5591f460fe49256aa28313c9e17b37b Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b03535a3b5591f460fe49256aa28313c9e17b37b commit b03535a3b5591f460fe49256aa28313c9e17b37b Author: Konstantin Belousov AuthorDate: 2023-08-13 13:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-28 00:27:48 +0000 hwpmc: on process exit, ensure that the owned log is closed (cherry picked from commit 3c872a70b883e4e2b38135bd6bd114ac9d2ea579) --- sys/dev/hwpmc/hwpmc_mod.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 714e1f550144..c402c764d0a9 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -5078,13 +5078,13 @@ pmc_process_exit(void *arg __unused, struct proc *p) pmclog_process_sysexit(po, p->p_pid); PMC_EPOCH_EXIT(); - if (!is_using_hwpmcs) - return; - PMC_GET_SX_XLOCK(); PMCDBG3(PRC,EXT,1,"process-exit proc=%p (%d, %s)", p, p->p_pid, p->p_comm); + if (!is_using_hwpmcs) + goto out; + /* * Since this code is invoked by the last thread in an exiting * process, we would have context switched IN at some prior @@ -5222,6 +5222,8 @@ pmc_process_exit(void *arg __unused, struct proc *p) * memory. */ if ((po = pmc_find_owner_descriptor(p)) != NULL) { + if ((po->po_flags & PMC_PO_OWNS_LOGFILE) != 0) + pmclog_close(po); pmc_remove_owner(po); pmc_destroy_owner_descriptor(po); }