From nobody Tue Mar 15 16:26:40 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 026F01A27F3A; Tue, 15 Mar 2022 16:26:41 +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 4KHzLm6ClZz4lpd; Tue, 15 Mar 2022 16:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647361600; 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=ovIqyLwnXeMJCpfv4/P/2eZenXp3Ca/x0z42bmphYws=; b=bQpCy6wk1dA+dC4R8OfNDq2hXHxHe7UZ684RsTtlx9Urv6ycGtyVJlyAxiPQmC1uJO7aKk lfhSJ00gD1wxkWpnVu8eEiwcTjYdziZB7UHtG5GuZYvccei9fTNCDvpmw6T7X9baXoqBlq Bds635hRjTUWo/Vl+RX0r0ZOzjSC8sh5riipZ5dsck5C0Qq2Ipa5r9o4T2gbc24PD0btCe 4XyFAchUqkGqJY1ivPSufp2iL7wjUFi/PQOHs7dRFFYd9oVn/Uky405OBzyHH8W4oDxmdk pfhQXTrvA7h6sDBi71ycctH8f5XQc3LDQAMtNivMI+BrKlYkig6MT6R/XEC31g== 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 A095724DAC; Tue, 15 Mar 2022 16:26:40 +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 22FGQemA024818; Tue, 15 Mar 2022 16:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FGQeYB024817; Tue, 15 Mar 2022 16:26:40 GMT (envelope-from git) Date: Tue, 15 Mar 2022 16:26:40 GMT Message-Id: <202203151626.22FGQeYB024817@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: 7c27fee0ea16 - stable/13 - proc: Remove assertion that P_WEXIT is not set in proc_rwmem() 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: 7c27fee0ea1690445b98e29c12c8939983257c84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647361600; 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=ovIqyLwnXeMJCpfv4/P/2eZenXp3Ca/x0z42bmphYws=; b=RQUYtVmEvfoIN5m5bE6Agaklw34U3rgwkAhR5eBpjV6iGj0MIYF6G+LSLuE7TsOe3jnvOz 7MMpPBC1vynDx9PDMdEoOk3qq6GOaSTtq1v0E6DyPWbaEaqCp3cj8/DVjWeTVLjfmr1LkA Xk14YR2JaqZSFkenZW/rpn/I//5Zv1CkCpBZIhgODjLjigFYIm6Ep2m26CD+zmG2Rsb63b X/umQeGLsY6GYpJomNtg3/e2jISGcYSJxF75fetUUTq4jy6Z1HCqEemqOSWX7TBdRNsWde 8RGdR7ySzan+bZcBlXMqpgGiuiOh9gaMqiXmTtTt5BagD6uiMEGDwpgRYtRCyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647361600; a=rsa-sha256; cv=none; b=HjzeZhDc3J2FKjuC74d+SDATmsh/qY+2PXeaa9M9iYBXMyXO/0jjWGqo7+TP4boOXHOfzo kh1zo43xngDrAlv0r4nLc1N/DYuic+NkwrqPy+Hoqr0XS7fmJ4ozzjgCPGJsQISbw1DPv6 29tcX6iGcW7vBEuFZiCLMLKqbsFl08zk6aE32RsnPuWSagElDnKnhcMO3BmWpAZPMhp8wc Kba7ib1YyHgi4/3zsiI9npS81EPdRp5WiZePNZxaLs9kztThlQjfgwwvd3PSSaqP+yVXh/ fM9j2vqt54rk0ATaoroCIBn7qW8nKus4e+f4xvhoKu+S3zoqqY7OIrLCJHo8vA== 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=7c27fee0ea1690445b98e29c12c8939983257c84 commit 7c27fee0ea1690445b98e29c12c8939983257c84 Author: Mark Johnston AuthorDate: 2022-03-01 20:08:25 +0000 Commit: Mark Johnston CommitDate: 2022-03-15 15:40:22 +0000 proc: Remove assertion that P_WEXIT is not set in proc_rwmem() exit1() sets P_WEXIT before waiting for holding threads to finish, rather than after, so this assertion is racy. Fixes: 12fb39ec3e6b ("proc: Relax proc_rwmem()'s assertion on the process hold count") Reported by: Jenkins (cherry picked from commit 879b0604a8940f575f03bde5457bcf13e64c1ae8) --- sys/kern/sys_process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 273adca19a0d..267ffc3d8d50 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -219,8 +219,6 @@ proc_rwmem(struct proc *p, struct uio *uio) */ if (p != curproc) PROC_ASSERT_HELD(p); - KASSERT((p->p_flag & P_WEXIT) == 0, - ("%s: process %p is exiting", __func__, p)); PROC_LOCK_ASSERT(p, MA_NOTOWNED); /*