From nobody Tue Mar 15 16:26:41 2022 X-Original-To: dev-commits-src-branches@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 598E31A2818C; Tue, 15 Mar 2022 16:26:42 +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 4KHzLp0X4zz4mDr; Tue, 15 Mar 2022 16:26:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647361602; 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=4dSNJCxIpeN4iybo05T6DOCJ9c2NQp8lw78GAYWLiNk=; b=Vu3LdPpnovsAkoc0kQ7bA/kGvfavmiPy+g81epP+HFvn2iRG0Xl5dfvd2S7IqKOn6eDbG+ NkBqzv4LCrGa4K5tciUrEFbLGetks15sKCSNbMapNUb3FrZFAdy0oHw5Z6OHFLb79DRgHg CpucDgKupEbXp+tr60IN5e3D5RB9rVF40LsZHuo1aAWh22nGHly6bY98IM50yq8TfCOYd0 IJBB3uLl1bJ2TGEtEi1H6Rkitsss3zWwTSCXoj0pOp/6zDiUBE1QZPWONRzHH+PHKaP7K6 jS7VyUoIc9hesXCVZP/SLoEamaTMqi8YYqZzWqdPHcncsX8JvKoHo2XPv5b6hQ== 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 C925D2522E; Tue, 15 Mar 2022 16:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FGQfFQ024842; Tue, 15 Mar 2022 16:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FGQf6Y024841; Tue, 15 Mar 2022 16:26:41 GMT (envelope-from git) Date: Tue, 15 Mar 2022 16:26:41 GMT Message-Id: <202203151626.22FGQf6Y024841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 87e1a4346d90 - stable/13 - fasttrap: Assert that fasttrap_fork() successfully unmaps scratch space List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 87e1a4346d908b3d4cd1fc93f97968197ab80240 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647361602; 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=4dSNJCxIpeN4iybo05T6DOCJ9c2NQp8lw78GAYWLiNk=; b=aHKLvuyWEjwdC3pj+6pi1VIsGkZHCvm+Vtm6fQdmdUvUCydvS7QdsEnWsSPBowq3xJq/1h 6rd2rekEzEPn2Z0gawS4LoWxKwbxF45D97MwL3jq4kbIo6K7NErn4TlYjIP8IRunpzbirl dVMgOhqmvoRFKJDGZ9ERSqLvpNveyxxL3bpTLujtoax6B30Sy7J58QrXzt66rJvB9cvAq4 inGmPxndrTu7kMYSPRQKehiGTYwoWnPwpzQ+4fIG4Ym0RgpeoIB7ftQFH0SA8OX3IKD9ui DxUaMQJQJPGTXvswolmWTAaNCEMiqZ8dqZ89EW/A0nkLwA3aUQMaU/vmJ+CJyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647361602; a=rsa-sha256; cv=none; b=iXghAZYFeS+RuNsKrZTRBqvpGUZ8Ydx/0ExHy3ce3UVIAMET7GcDQeHFPa3gp1g3yvqvpz WZWeuF6YnlVwEJZiAkL1T2LufYVgyeHoo2ff39hBgqT0tO2gkw6N54JEzlmvR2iiYs8YkF jTyi7D5kKSVYM2x2pJqlMGo+rul3sVGb0xokc7BFjxp/RlvzurRm+Vxpe0URNQRhywI1xo 9kjMNt5pI+J7ZtDTAdnOLfwJMdVYkc0olx3jmGp1Z9EZOuCPLypzE/jjMO6KYyGO+aYUNd QuEs8q75ok6QXFrWxst0TRLla0fp4C+VcUBLUjQC/6Qg/oDR8tGaU9p+vu4sHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87e1a4346d908b3d4cd1fc93f97968197ab80240 commit 87e1a4346d908b3d4cd1fc93f97968197ab80240 Author: Mark Johnston AuthorDate: 2022-03-01 16:52:39 +0000 Commit: Mark Johnston CommitDate: 2022-03-15 15:40:36 +0000 fasttrap: Assert that fasttrap_fork() successfully unmaps scratch space No functional change intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit 83958173eb7d3f9d402e6dc81e66d179a808dd63) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c index 4771a67a9f09..d96d3f44182e 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c @@ -588,7 +588,7 @@ fasttrap_fork(proc_t *p, proc_t *cp) fasttrap_proc_t *fprc = NULL; #endif pid_t ppid = p->p_pid; - int i; + int error, i; ASSERT(curproc == p); #ifdef illumos @@ -678,9 +678,10 @@ fasttrap_fork(proc_t *p, proc_t *cp) if (fprc != NULL) { mutex_enter(&fprc->ftpc_mtx); LIST_FOREACH(scrblk, &fprc->ftpc_scrblks, ftsb_next) { - vm_map_remove(&cp->p_vmspace->vm_map, + error = vm_map_remove(&cp->p_vmspace->vm_map, scrblk->ftsb_addr, scrblk->ftsb_addr + FASTTRAP_SCRBLOCK_SIZE); + ASSERT(error == KERN_SUCCESS); } mutex_exit(&fprc->ftpc_mtx); }