From nobody Sun Apr 16 10:57:41 2023 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 4PznFy4Krdz457ZB; Sun, 16 Apr 2023 10:57: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 4PznFx484sz3qBG; Sun, 16 Apr 2023 10:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642661; 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=7WgI7X7w1QDfGmPgqJ7ZILn9RDUqUY8c8YJrlVbnWi4=; b=cZe2ljYC9/CtnFhSIi1umOveAQrRC6VkOfFQys6KaGnY+JDSeRu/gaWexbk0nOPYAwsuI2 Zeqbed+iyau3Gbo0kueU2/zbecRlatP5BKKljV/0LSjoM63oEMl8UqgLSOkeMaSSNUuv/M ywAbDCoF32+2JYD3wFiqLhvukNC8bfhHdUIzz6K1oyHZ5XkBa29CxP7zfsQ9o4NF5QhuV/ BrJslhKnPos/t5ZuFFUaOKeussXvoW07CBQepnWe2nyj14yn3B3J7qyN9vjmVcEfVp+5uB 1EBHxuhHb7fzGlXDv866cSWvCvjz0Y+deYOkC/rOf9dLaVz9XMMkGlfvFGjlMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642661; 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=7WgI7X7w1QDfGmPgqJ7ZILn9RDUqUY8c8YJrlVbnWi4=; b=adgr0m4kcQAZI77EMdmonM4bgQLmAnx43OdUzB5f9SsrzcymsbL+7tQyuh7YttXwH+Z9Za 7iZuezDDLzwL2k7M/W5z3bk5e8cDl9Ac1o5mhZLHdJ6HkSXgxbstYirQDkOiCSp9II3ugt tptMlZhJpDt98El5C68nxjsj5ZoC8FNwG/mU3mguZo8BgiBPUGniiKjy0qX2xY5f8mPyxA timUjH36oH1Rbnsb3ViTGDM1cWh91huoD4lV2t5lupT8dK1wmvajjy+XxJ0O4bM0CW7B2E ceCzIHwjQqP3vnMfVjnFLwrokZPQY23mvRDuV0qZp1emciqGjak1s/ievBFKjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681642661; a=rsa-sha256; cv=none; b=a3K4t0stN8E66tngNte+fTo8SvsQmyapURLcRn9emMouOIW5HDH/NqYITRyaiD2CZfBMV0 1VGFlsoYyibSNw8B4bPZR0O4PZLThFsupItXyZEPP/B7pTGMhgqV15nurgcjYVPpWJsNcF KfqisU51cNf39RzoMoAgqctsaK6gXVSGgaOOL1fgNH+L0okQ6ntIW8wlLHYBpo/C6FLSE6 q/izXqTCgofKftkjrZWksDXoesF1g3gOz5wuYprCc4A8d0Yx6r0MaoqydFa1/7p2+5diT8 /0KUjJfK0dHrATQdbsn/F5gRsXSzcLEN9iWuuU/oxaIcNGTWmE34EnGnhF7qow== 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 4PznFx2vG4zl7F; Sun, 16 Apr 2023 10:57: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 33GAvfNS021536; Sun, 16 Apr 2023 10:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GAvfWV021535; Sun, 16 Apr 2023 10:57:41 GMT (envelope-from git) Date: Sun, 16 Apr 2023 10:57:41 GMT Message-Id: <202304161057.33GAvfWV021535@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: 41959beeae1f - stable/13 - Add witness_is_owned(9) 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 41959beeae1f463ab0421510cb28f6d77e57a61a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41959beeae1f463ab0421510cb28f6d77e57a61a commit 41959beeae1f463ab0421510cb28f6d77e57a61a Author: Konstantin Belousov AuthorDate: 2023-04-10 15:54:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:45:58 +0000 Add witness_is_owned(9) (cherry picked from commit 75fc6f86c38807f1fb305c065c6affcf7617b029) --- sys/kern/subr_witness.c | 58 ++++++++++++++++++++++++++++++++++++++++--------- sys/sys/lock.h | 1 + 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index c849a191bf16..fe2e11c3bea5 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -2425,6 +2425,32 @@ witness_restore(struct lock_object *lock, const char *file, int line) instance->li_line = line; } +static bool +witness_find_instance(const struct lock_object *lock, + struct lock_instance **instance) +{ +#ifdef INVARIANT_SUPPORT + struct lock_class *class; + + if (lock->lo_witness == NULL || witness_watch < 1 || KERNEL_PANICKED()) + return (false); + class = LOCK_CLASS(lock); + if ((class->lc_flags & LC_SLEEPLOCK) != 0) { + *instance = find_instance(curthread->td_sleeplocks, lock); + return (true); + } else if ((class->lc_flags & LC_SPINLOCK) != 0) { + *instance = find_instance(PCPU_GET(spinlocks), lock); + return (true); + } else { + kassert_panic("Lock (%s) %s is not sleep or spin!", + class->lc_name, lock->lo_name); + return (false); + } +#else + return (false); +#endif +} + void witness_assert(const struct lock_object *lock, int flags, const char *file, int line) @@ -2433,18 +2459,9 @@ witness_assert(const struct lock_object *lock, int flags, const char *file, struct lock_instance *instance; struct lock_class *class; - if (lock->lo_witness == NULL || witness_watch < 1 || KERNEL_PANICKED()) + if (!witness_find_instance(lock, &instance)) return; class = LOCK_CLASS(lock); - if ((class->lc_flags & LC_SLEEPLOCK) != 0) - instance = find_instance(curthread->td_sleeplocks, lock); - else if ((class->lc_flags & LC_SPINLOCK) != 0) - instance = find_instance(PCPU_GET(spinlocks), lock); - else { - kassert_panic("Lock (%s) %s is not sleep or spin!", - class->lc_name, lock->lo_name); - return; - } switch (flags) { case LA_UNLOCKED: if (instance != NULL) @@ -2497,6 +2514,27 @@ witness_assert(const struct lock_object *lock, int flags, const char *file, #endif /* INVARIANT_SUPPORT */ } +/* + * Checks the ownership of the lock by curthread, consulting the witness list. + * Returns: + * 0 if witness is disabled or did not work + * -1 if not owned + * 1 if owned + */ +int +witness_is_owned(const struct lock_object *lock) +{ +#ifdef INVARIANT_SUPPORT + struct lock_instance *instance; + + if (!witness_find_instance(lock, &instance)) + return (0); + return (instance == NULL ? -1 : 1); +#else + return (0); +#endif +} + static void witness_setflag(struct lock_object *lock, int flag, int set) { diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 2db38f9df89a..4031f20946c0 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -237,6 +237,7 @@ int witness_list_locks(struct lock_list_entry **, int (*)(const char *, ...)); int witness_warn(int, struct lock_object *, const char *, ...); void witness_assert(const struct lock_object *, int, const char *, int); +int witness_is_owned(const struct lock_object *lock); void witness_display_spinlock(struct lock_object *, struct thread *, int (*)(const char *, ...)); int witness_line(struct lock_object *);