From nobody Tue Mar 7 16:55:40 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 4PWM5S5fgLz3wMrN; Tue, 7 Mar 2023 16:55:40 +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 4PWM5S5B6Kz4JhR; Tue, 7 Mar 2023 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208140; 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=PjWOdRy4WypkAwp+5zjYO2Hz+z3CDxhkNaC85KiEaGE=; b=VVwezTtG5NMy4mdqHv7I/eWMW2dlE+NH+wTIer8c5KZ/ghJzOB9QHDskFf9/yxdMXqa0DM S1VoOwiJApNjrPySpE+RVAC9fjsV90qmN5EQVLvDmvf1QaQUeSzUAM96HwjGN+ogiBVszB FHX84dWeeVO9+qPZEwU+eLsn2tOE/ig7N0B+rglFDNLPWlQ30oj7lgsqsqtZjzVceTEKUT 8GixE7Nbubmauwkev8i5EzAbcL5QwJvtHpeBxmXhyHpmOtYPKTyl8d0w1OKq5JHX33e7ZD 5nxXjRFLSOxn4g/wRRwNAd5RwrqnXKTOUjgfbUTNal6lWExZQoDa0EhTWXzhFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208140; 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=PjWOdRy4WypkAwp+5zjYO2Hz+z3CDxhkNaC85KiEaGE=; b=O0CiqhyK6YoWYQVEZZpf2In6nDSm75AYbbBfjhDSlQy0tpX4zmbbwvlzQoCIgTDbHwCNB2 7cFnAeI4Ed4zAKEfezVdWVHXl5L9dMNOtHD+1cNw5iOmmLIIitJv/j6zJxM7yvP2+ZfriY sSdE7NosAWediq6aWKiAJORh6myA2ZTBlJKZd/+4vuwV9GDOeuQj0K7ExmFt+Rfp4JxA7U +6wVKJ33sa8BcgF1G6G3UHr9aL+S162fzXgIYCMbYLw7cbxF4/KEtFkSDJvXVVlx057AZE 5gjesVdkkuC48qzQQiRKg1+AnpkKYRsicH++qfZ1PU0dg2sk0xH8YPJf1WhqzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208140; a=rsa-sha256; cv=none; b=VGrx0J/qcnEdnCQ9r7AEcPoperlFDa7o6xzonRDjcpRPB9bVn5c7o5jscufVzMcL7gJt48 O6B8wCm6yALbY0FMYRganwVrDo0htWihB0xb+9IB8HpJKCcBTcW5VqsEtaRSXkCLTNYq4y bFqxwAayn1kYp6XBt3WLkYwsvnuwuXSQLIumMjUR0MSG+kmedMKH2yhp9m9f8hUOI1yKob DX4jLkJFGrxKvwhnyZPE/6FfARkf11oJ3d1+zsQ4hePtkScduuT8gWqmC4zVyveU7WixEs udmFhuut0YTBWrlGcOJpxiEDy9lLlQwxs5G9aJFqJopwNVSbIzMMJ1FR3Mar6A== 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 4PWM5S40WczrPb; Tue, 7 Mar 2023 16:55: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 327GteR5022872; Tue, 7 Mar 2023 16:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Gte0u022871; Tue, 7 Mar 2023 16:55:40 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:40 GMT Message-Id: <202303071655.327Gte0u022871@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: 7b37e83e4c8f - stable/13 - lockmgr: upgrade panic return checks 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: 7b37e83e4c8f4e76301834346b2870ef79880d5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7b37e83e4c8f4e76301834346b2870ef79880d5e commit 7b37e83e4c8f4e76301834346b2870ef79880d5e Author: Mitchell Horne AuthorDate: 2023-02-22 15:11:15 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 15:58:28 +0000 lockmgr: upgrade panic return checks We short-circuit lockmgr functions in the face of a kernel panic. Other lock implementations do this with a SCHEDULER_STOPPED() check, which covers the additional case where the debugger is active but the system has not panicked. Update this code to match that behaviour. Reviewed by: mjg, kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38655 (cherry picked from commit 9a7f7c26c5b280924072e2d9947ad39ef4cc022c) --- sys/kern/kern_lock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index e90c55947676..d9713ec06473 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -595,7 +595,7 @@ lockmgr_slock_hard(struct lock *lk, u_int flags, struct lock_object *ilk, #endif struct lock_delay_arg lda; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -781,7 +781,7 @@ lockmgr_xlock_hard(struct lock *lk, u_int flags, struct lock_object *ilk, #endif struct lock_delay_arg lda; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -977,7 +977,7 @@ lockmgr_upgrade(struct lock *lk, u_int flags, struct lock_object *ilk, int error = 0; int op; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -1038,7 +1038,7 @@ lockmgr_lock_flags(struct lock *lk, u_int flags, struct lock_object *ilk, u_int op; bool locked; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return (0); op = flags & LK_TYPE_MASK; @@ -1101,7 +1101,7 @@ lockmgr_sunlock_hard(struct lock *lk, uintptr_t x, u_int flags, struct lock_obje { int wakeup_swapper = 0; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; wakeup_swapper = wakeupshlk(lk, file, line); @@ -1120,7 +1120,7 @@ lockmgr_xunlock_hard(struct lock *lk, uintptr_t x, u_int flags, struct lock_obje u_int realexslp; int queue; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) goto out; tid = (uintptr_t)curthread; @@ -1312,7 +1312,7 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk, int contested = 0; #endif - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return (0); error = 0; @@ -1721,7 +1721,7 @@ _lockmgr_assert(const struct lock *lk, int what, const char *file, int line) { int slocked = 0; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; switch (what) { case KA_SLOCKED: