From nobody Sun Mar 30 04:01:29 2025 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 4ZQLDB4w82z5rPZG; Sun, 30 Mar 2025 04:01:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZQLDB13DRz3hf8; Sun, 30 Mar 2025 04:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743307290; 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=3I517b3COzJf7nj6KFqLxfSadjFp+5y+ZALpo+CRxjY=; b=oOofNi29x6bFn6aRHc1+JJZXHdO5W6ZdqO7TmWIdPzbt5GH6RpwVutJxK2iNAPkr25eKsW Ere+RGBzDQw+w+PRg5lUmrfpThT5mFgisvddrBXTTIkBwDtxaZVir8fk/GKdMdN/O99hj3 /PTZy7hRdRTOxW490U/f5a+OVegDKhSfglnyWz7kAFQMe4b5sVIgi9JAytKJqskHAvpCBA UgZ4Pnmk1viiXqR3HHLPRADpkiyinSsZabKLAh6pNtyk5QpLYcFwZ9jsxKdotGKz6QuE7x iBR5EVjn31WePC3RwHtx0SSl/9crxg3RPQ7adNYfjoQgzKQAIoxNj+IDdmjXvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743307290; a=rsa-sha256; cv=none; b=WN6PDkyDmnj6SFqDI/ApnXPuVCX2ERn2otHfVoRp+nKdPZMF6Y7KBbHmYVrpuTG7lHdVlB KyJEIVrFQNiDyQj++ii/n+yaPrk6lr6E/CbcWu6gjOgw4jb1YSRjrRLySVh08dRS0X39pJ nDUmACmHYe1ETsFUtjhPmYux+zPozaQvMSboZYxzRS0UgdQyp9NF96GOj990wPxuSmnYQg AzgjQmjyZC4WuSj2TGapDKeO/uzE0qLm12kKm6Mm4CiDTLACy/7RuRVT7amuQtDGvSXEHU SBU2b1CYpYyNaW/BkfORegZq4NR7kI+FQx4sSVs2SNevV7gIP29S5NqaBvshqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743307290; 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=3I517b3COzJf7nj6KFqLxfSadjFp+5y+ZALpo+CRxjY=; b=WpXTQKZ9GIdefyfAUW+vAkiG7WSLR3QzHTZFpzbdK0lt9K2aRKqUAJRK/IT1irLH2YtRN2 qH02sRdYY8Ckbu5/yyRtghgGaefLk1L+g4o5yWuLKxcrgaxXULbWH8wdMI+P5XgM/vEAJJ fkBbnu4PFDL/1q5OLHJCRhbhCxV5h0hD9lPHKEYQdT4SrCpP1OtLueRj2HugKklAQn8EhN 9vOiphYyY4nnkI5L+/kejExFnHvYqXkrJMcXHmhpIQmftoQOc0CD+FJMBqo0oIOnj6hXUc B9XAkh/tpxt2MkzpjuGyoJLz4UlzErjyiweWA4OXBXvj/n+oeQGoPdlHIHTYiw== 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 4ZQLDB0cnhzy6m; Sun, 30 Mar 2025 04:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52U41The021642; Sun, 30 Mar 2025 04:01:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52U41TKf021639; Sun, 30 Mar 2025 04:01:29 GMT (envelope-from git) Date: Sun, 30 Mar 2025 04:01:29 GMT Message-Id: <202503300401.52U41TKf021639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 83d13d836b32 - main - locks: run the extra NULL check only with INVARIANTS 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83d13d836b32af86bba62ddf86c2ef78389d13fd Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=83d13d836b32af86bba62ddf86c2ef78389d13fd commit 83d13d836b32af86bba62ddf86c2ef78389d13fd Author: Gleb Smirnoff AuthorDate: 2025-03-30 03:55:31 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-30 03:56:05 +0000 locks: run the extra NULL check only with INVARIANTS This reverts commit 73da0265c29c79641dab3e6b98452bd5afca01fb. This reverts commit 87ee63bac69dc49291f55590b8baa57cad6c7d85. Discussed with: mjg --- sys/kern/kern_mutex.c | 4 +--- sys/kern/kern_rwlock.c | 16 ++++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index d52f7e1eebd1..f952b3fc8805 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -1073,9 +1073,7 @@ __mtx_unlock_sleep(volatile uintptr_t *c, uintptr_t v) turnstile_chain_lock(&m->lock_object); _mtx_release_lock_quick(m); ts = turnstile_lookup(&m->lock_object); - if (__predict_false(ts == NULL)) { - panic("got NULL turnstile on mutex %p v %p", m, (void *)v); - } + MPASS(ts != NULL); if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_unlock_sleep: %p contested", m); turnstile_broadcast(ts, TS_EXCLUSIVE_QUEUE); diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index ed6ca75bc7a5..e182d1fe9baf 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -784,12 +784,11 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v LOCK_FILE_LINE_ARG_DEF) { struct turnstile *ts; - uintptr_t setv, passedv, queue; + uintptr_t setv, queue; if (SCHEDULER_STOPPED()) return; - passedv = v; if (__rw_runlock_try(rw, td, &v)) goto out_lockstat; @@ -842,10 +841,7 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v * release the lock. */ ts = turnstile_lookup(&rw->lock_object); - if (__predict_false(ts == NULL)) { - panic("got NULL turnstile on rwlock %p passedv %p v %p", - rw, (void *)passedv, (void *)v); - } + MPASS(ts != NULL); turnstile_broadcast(ts, queue); turnstile_unpend(ts); td->td_rw_rlocks--; @@ -1223,7 +1219,7 @@ __rw_wunlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF) { struct rwlock *rw; struct turnstile *ts; - uintptr_t tid, setv, passedv; + uintptr_t tid, setv; int queue; tid = (uintptr_t)curthread; @@ -1271,7 +1267,6 @@ __rw_wunlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF) * of waiters or doing some complicated lock handoff gymnastics. */ setv = RW_UNLOCKED; - passedv = v; v = RW_READ_VALUE(rw); queue = TS_SHARED_QUEUE; if (v & RW_LOCK_WRITE_WAITERS) { @@ -1286,10 +1281,7 @@ __rw_wunlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF) queue == TS_SHARED_QUEUE ? "read" : "write"); ts = turnstile_lookup(&rw->lock_object); - if (__predict_false(ts == NULL)) { - panic("got NULL turnstile on rwlock %p passedv %p v %p", rw, - (void *)passedv, (void *)v); - } + MPASS(ts != NULL); turnstile_broadcast(ts, queue); turnstile_unpend(ts); turnstile_chain_unlock(&rw->lock_object);