From nobody Tue Jan 18 20:15:36 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 363B61966C99; Tue, 18 Jan 2022 20:15:37 +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 4Jdg4m5XbRz57hX; Tue, 18 Jan 2022 20:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642536936; 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=6Oe3xY288sjFMUlLu4XcO0yh/r9UXxQf1UDLGec0IfY=; b=t9zMetkS5kusULFDqmEgn9a3qQrwjPyjcXwGhWpuc8XgQjLw736mysdV0FwjC6LbOmYzZZ 2/0BZBuGcIzm7TKKSBLWUl/AGQg92gavtLWqFgacK/0SjM0tE2xuUtDONWE4QhRxlBBOLk UfbX9EGXcrFN7/ABT09dDvlOaYaFGepQP+xeN/9FDV7F2ro4u5mnRtqVafDZUZ+iJ/IyfO sy7NL06y2TVUYH7PNWY4vByabgx3fxh7JdAEzad/biJQa0bPAkkSk/0ln6GvyD6LIjapWP zXafzOfB/SXC08x9heB5q9zlNLwdPTGQWHp7NS3Kt4lJ+aAUrtg6zoF4uv9WhQ== 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 8D51F27765; Tue, 18 Jan 2022 20:15:36 +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 20IKFasd053943; Tue, 18 Jan 2022 20:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IKFaWL053942; Tue, 18 Jan 2022 20:15:36 GMT (envelope-from git) Date: Tue, 18 Jan 2022 20:15:36 GMT Message-Id: <202201182015.20IKFaWL053942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 02ea6033020e - main - LinuxKPI: Allow spin_lock_irqsave to be called within a critical section 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02ea6033020e11afec6472bf560b0ddebd0fa97a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642536936; 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=6Oe3xY288sjFMUlLu4XcO0yh/r9UXxQf1UDLGec0IfY=; b=Yqay7WHq25w9k2p8Swd7+rjpg/x2W8mgiyZtANgoG59yMiCsaVDWWYbLwwUaOkczdSRRtX UfObKZbVCCiiiNQw4d5pnp7ReEIDuMRIhquvM5vT+byU4jGtFAqlXEuKpD7vmqdWQN+FBF sBymDgt52fvrUu8AVAM+cPn3VNshl56cjCD9llUI42wSd1++nQXCFglVOAxSX0BxWLXxw5 F9RDa8FoPPMYp3Triyh07GsXytuKZDgTtX4iGX08JxRJviUoMnXOhMfI8BWXJ2BV0bCbSZ +NtUzm+mIWK1N75RWUNkQ9mHujjTtckL5U4IgmMIgbBc7xiHWbYadruE9yDYSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642536936; a=rsa-sha256; cv=none; b=xE9wSBk117SlTSoyYbwtH4XxXyAkRe9LMmWs1BPbCHXQrM33DOBe0XgtJdv0CDtUG32gFp j/66uZ6m+PGl0yiBZQIjwv4gbhIv8aXX0YZkB5MZo+/dvDe2Csny7ODXlyM7Jx9NmnensE KgzUM4yQh9mAdEC7Wl3+uMf0OvXmqs6ynGlP0WxckFZPJj22E8Gf2sdFEim/ggr97HPeYe OLaCTN3/RmcsHweu4NKPcVirGNZTDeMgYuQ6RtujHm37N2LEjPJGcmbQ+IjBwer1S1B1yP VX9ubd4dxPAEvaVtUo66T8zM6vl57x8vUYbsRlTxWi6ueeqquf9EqHMyfuaNjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=02ea6033020e11afec6472bf560b0ddebd0fa97a commit 02ea6033020e11afec6472bf560b0ddebd0fa97a Author: Vladimir Kondratyev AuthorDate: 2022-01-18 20:14:12 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-18 20:14:12 +0000 LinuxKPI: Allow spin_lock_irqsave to be called within a critical section with spinning on spin_trylock. dma-buf part of drm-kmod depends on this property and absence of it support results in "mi_switch: switch in a critical section" assertions [1][2]. [1] https://github.com/freebsd/drm-kmod/issues/116 [2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261166 MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D33887 --- .../linuxkpi/common/include/linux/spinlock.h | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h index a87cb7180b28..31d47fa73986 100644 --- a/sys/compat/linuxkpi/common/include/linux/spinlock.h +++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -117,14 +118,32 @@ typedef struct { local_bh_disable(); \ } while (0) -#define spin_lock_irqsave(_l, flags) do { \ - (flags) = 0; \ - spin_lock(_l); \ +#define __spin_trylock_nested(_l, _n) ({ \ + int __ret; \ + if (SPIN_SKIP()) { \ + __ret = 1; \ + } else { \ + __ret = mtx_trylock_flags(&(_l)->m, MTX_DUPOK); \ + if (likely(__ret != 0)) \ + local_bh_disable(); \ + } \ + __ret; \ +}) + +#define spin_lock_irqsave(_l, flags) do { \ + (flags) = 0; \ + if (unlikely(curthread->td_critnest != 0)) \ + while (!spin_trylock(_l)) {} \ + else \ + spin_lock(_l); \ } while (0) #define spin_lock_irqsave_nested(_l, flags, _n) do { \ (flags) = 0; \ - spin_lock_nested(_l, _n); \ + if (unlikely(curthread->td_critnest != 0)) \ + while (!__spin_trylock_nested(_l, _n)) {} \ + else \ + spin_lock_nested(_l, _n); \ } while (0) #define spin_unlock_irqrestore(_l, flags) do { \