From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: [PATCH 2/3] lockdep: add might_lock_nested() Date: Fri, 23 Aug 2019 10:49:11 +0200 Message-ID: <20190823084911.GE2369@hirez.programming.kicks-ass.net> References: <20190820081951.25053-1-daniel.vetter@ffwll.ch> <20190820081951.25053-2-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20190820081951.25053-2-daniel.vetter@ffwll.ch> Sender: linux-kernel-owner@vger.kernel.org To: Daniel Vetter Cc: Intel Graphics Development , LKML , Daniel Vetter , Ingo Molnar , Will Deacon List-Id: intel-gfx@lists.freedesktop.org On Tue, Aug 20, 2019 at 10:19:50AM +0200, Daniel Vetter wrote: > Necessary to annotate functions where we might acquire a > mutex_lock_nested() or similar. Needed by i915. > > Signed-off-by: Daniel Vetter > Cc: Peter Zijlstra > Cc: Ingo Molnar > Cc: Will Deacon > Cc: linux-kernel@vger.kernel.org Acked-by: Peter Zijlstra (Intel) > --- > include/linux/lockdep.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h > index 38ea6178df7d..30f6172d6889 100644 > --- a/include/linux/lockdep.h > +++ b/include/linux/lockdep.h > @@ -631,6 +631,13 @@ do { \ > lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_); \ > lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ > } while (0) > +# define might_lock_nested(lock, subclass) \ > +do { \ > + typecheck(struct lockdep_map *, &(lock)->dep_map); \ > + lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL, \ > + _THIS_IP_); \ > + lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ > +} while (0) > > #define lockdep_assert_irqs_enabled() do { \ > WARN_ONCE(debug_locks && !current->lockdep_recursion && \ > @@ -653,6 +660,7 @@ do { \ > #else > # define might_lock(lock) do { } while (0) > # define might_lock_read(lock) do { } while (0) > +# define might_lock_nested(lock, subclass) do { } while (0) > # define lockdep_assert_irqs_enabled() do { } while (0) > # define lockdep_assert_irqs_disabled() do { } while (0) > # define lockdep_assert_in_irq() do { } while (0) > -- > 2.23.0.rc1 >