From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF94AC3A59E for ; Tue, 20 Aug 2019 08:20:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A56F323B16 for ; Tue, 20 Aug 2019 08:20:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="IpD4KcUW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729529AbfHTIUA (ORCPT ); Tue, 20 Aug 2019 04:20:00 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:35651 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729312AbfHTIT7 (ORCPT ); Tue, 20 Aug 2019 04:19:59 -0400 Received: by mail-ed1-f66.google.com with SMTP id t50so2379473edd.2 for ; Tue, 20 Aug 2019 01:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EfuXWDGKyoQ+utA9DObLdBzgNQ7PmRM7y9+Md6RChRo=; b=IpD4KcUWdJJzGYciCrUh7Bv8uXRwVIsqc9WDxDjSY8vgC4bD1MqnLoFtEJ3WKlW7x2 rkEWO8mJXsbLYBcZ+swGGgyCtnXjR2zgHpDjOKk71pTR3TdV0ToLIe4lyHCOZjpEPdUf mEs4X/epqWonM/u4BgTxkPW+QH5Xg2F1UbKI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EfuXWDGKyoQ+utA9DObLdBzgNQ7PmRM7y9+Md6RChRo=; b=MxTDgREtrRCTKc6ihXI36Q92JW/4J+ELzBqOhw4CrpAxbvv5FEoPUKHshIgr1mWdWd XyZHYDrKTOoI/LIYih5NJshj8ru+wHvs8WD3uEKiqZT3gWgLPaLeVcSoUJkcRMjp9lSK /43Gl1Rtp8PbGhYQCiXzXL8nPgDwjM3S1DFgTtDQE6Wq/ajqFgVMIyYe3EiYuFVaRscU V/63Jd3sRUblVecrzsuAEYj3zg8VSsGAq6pli9ePcqacxF7F4sipWerVgatVxQ0bVcOJ e29d1s/NQDMFxWPwmT2qGde7sELlpV27cpReZdkNH7xFu+W4YoLZ7c5grKmRxnc00bvs +sVg== X-Gm-Message-State: APjAAAUpMXz6Yh7GNl4viqU9kqeY131wc9CBkgRpqGO7CXUNIgGx+CWz gIg5SEH5IWmztZAc0y1TmmXb0A== X-Google-Smtp-Source: APXvYqwslvZPG/vQIrSy/z3Y4BVivFQjmK/hYGPsHbZyAilMU+rn5KrbwxywGPMgCi4TSq7L+XqPhA== X-Received: by 2002:aa7:c353:: with SMTP id j19mr30023854edr.292.1566289197967; Tue, 20 Aug 2019 01:19:57 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id i4sm2467705ejs.39.2019.08.20.01.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 01:19:57 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Cc: LKML , Daniel Vetter , Daniel Vetter , Peter Zijlstra , Ingo Molnar , Will Deacon Subject: [PATCH 2/3] lockdep: add might_lock_nested() Date: Tue, 20 Aug 2019 10:19:50 +0200 Message-Id: <20190820081951.25053-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190820081951.25053-1-daniel.vetter@ffwll.ch> References: <20190820081951.25053-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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