From nobody Tue Feb 15 23:16:32 2022 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 985FA19C10D7; Tue, 15 Feb 2022 23:16:32 +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 4Jyxmc3pf4z3pQR; Tue, 15 Feb 2022 23:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644966992; 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=tj4ec+eEkwK7PyHHNJXVpvKNpOKU/4QQida8mUbC7HM=; b=jYpBzimlNsR1vNjQU8cseDaT24KSQrWZE0/S44AzHfDhwitydKwJA1tUC/9wY+EAW8iq8Y l53XbXcp9FHINHBS0BYfVbwHG4Oo06BKLP442bDMV3prEzj/YVmRpSXbKz6I1plYSM0M8y sERN380osZagXj0TRqGrKLxOOSGHWlo3S/S6A5PkHf+KxWCNnYUZTUkxbeIczs299j3zYM XlYY5ZT+Rfs+q0Fl7L/G/KM3M7BcKpUrMNuzXAIDaeCZgGI4LMATCJyLDDDKrEqxZjcv7V bpM9PDLy8oQ83nVx+fp5CFBpvKdU5ETP9vtlgDtPYmwFJNO6gs9cviHoNA+QvQ== 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 6324033E0; Tue, 15 Feb 2022 23:16:32 +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 21FNGWMh049864; Tue, 15 Feb 2022 23:16:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FNGWZu049863; Tue, 15 Feb 2022 23:16:32 GMT (envelope-from git) Date: Tue, 15 Feb 2022 23:16:32 GMT Message-Id: <202202152316.21FNGWZu049863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 064c110f4b55 - main - LinuxKPI: lockdep add lockdep_assert_not_held() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 064c110f4b551cbf3f2ef6f567736005c2d7007a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644966992; 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=tj4ec+eEkwK7PyHHNJXVpvKNpOKU/4QQida8mUbC7HM=; b=WOWZgcryMa7973g4TObNoc1ysII8+3gTNDgPGV2RQ4RVzpnuRSJuWxmJGZiBISHEd+0j7m 7614gsIffsJz6Rg3LXzOKW0B3FBZBuPJ7KEk/bldcftSvWvPBUzxHomok9OEiIMG8tCYaP jZJAqbxkMKf1UJIS4fk5P1LA05sF4pC7tnra+5Vhky/6hHD59fI4TbDziTFSgFcKlxnzyW j4Qc+l5IxYXH0nS2GjxUJMmw67e82psqO9UF2aGIZ5ZxLto/qiph2qMV1IKOiGLXs1Vq4H ak/dcb2PpYWtOOjJrXHpm3c8DOxz5GpIa/DMGa1AQiTk9JJOCptOJ1btZ/939g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644966992; a=rsa-sha256; cv=none; b=PYAsW6BRv5z5jihPe+/Oq1jTTj8pkvwIeRIeiFDDhrG5EEAnyBqU+eShL7hgAyOHX6aTF2 wUrqiARMZLqNLGbjFe30lueeRqwxXXlWyf4/HQOVpCkgkarZXmOdGu1PMYuTpeFUpnrJYY P+0SlYeulji/XFmtDUe4xae5QYBLy8U+ocF+JAf9lh8A7m+n9jy05eYfyRSDvCywoTO7Z6 gT/zb/U5YjO2GJgcpQQkvMCatTrkE3n5YVcdhDd49aTsVel+jGHJ66zm9oEb9fQqDI2nvJ 6mbSImf9M2yKTskccC7+XYyemRr01TRHJ4W0l0XSaQDWpKgeTSBFBd2l69rfRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=064c110f4b551cbf3f2ef6f567736005c2d7007a commit 064c110f4b551cbf3f2ef6f567736005c2d7007a Author: Bjoern A. Zeeb AuthorDate: 2022-02-09 12:01:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-15 23:15:00 +0000 LinuxKPI: lockdep add lockdep_assert_not_held() Add lockdep_assert_not_held() asserting LA_UNLOCKED as needed by a driver. MFC after: 3 days Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D34232 --- sys/compat/linuxkpi/common/include/linux/lockdep.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h b/sys/compat/linuxkpi/common/include/linux/lockdep.h index 142ca3e52b25..2289db7756d4 100644 --- a/sys/compat/linuxkpi/common/include/linux/lockdep.h +++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h @@ -50,6 +50,11 @@ struct pin_cookie { #define lockdep_init_map(_map, _name, _key, _x) do { } while(0) #ifdef INVARIANTS +#define lockdep_assert_not_held(m) do { \ + struct lock_object *__lock = (struct lock_object *)(m); \ + LOCK_CLASS(__lock)->lc_assert(__lock, LA_UNLOCKED); \ +} while (0) + #define lockdep_assert_held(m) do { \ struct lock_object *__lock = (struct lock_object *)(m); \ LOCK_CLASS(__lock)->lc_assert(__lock, LA_LOCKED); \ @@ -72,6 +77,7 @@ lockdep_is_held(void *__m) #define lockdep_is_held_type(_m, _t) lockdep_is_held(_m) #else +#define lockdep_assert_not_held(m) do { (void)(m); } while (0) #define lockdep_assert_held(m) do { (void)(m); } while (0) #define lockdep_assert_held_once(m) do { (void)(m); } while (0)