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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 0734BC43381 for ; Tue, 2 Feb 2021 15:50:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB0C264F5E for ; Tue, 2 Feb 2021 15:50:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235728AbhBBPuI (ORCPT ); Tue, 2 Feb 2021 10:50:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235718AbhBBPrm (ORCPT ); Tue, 2 Feb 2021 10:47:42 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08860C06174A for ; Tue, 2 Feb 2021 07:47:01 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id y187so2719533wmd.3 for ; Tue, 02 Feb 2021 07:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=f8qxGPcRh9HAR8Xi8fDP2DL2jLjx52coGhpEuMS0fJI=; b=FNqLZbndjzFWU2NyGwDReOjQfkL1OUgvOv5ZeR1Nb/JpNeBwq8aNlfRhy0PWJBTmi+ ZRKNKC0kcTKRZB4/2Ud02HFebrv+Qpy5JJvxbDm7YMeOqXj52HqymPxpjQ+hJP6KGhk8 SOJOuY99UyXKHU8ar69nSb0bdBJZr9O15C6X0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=f8qxGPcRh9HAR8Xi8fDP2DL2jLjx52coGhpEuMS0fJI=; b=f1tSiTzZ1toqxJ+B2Xj+LHK0A2O07CF2OK1yC6pPSp/9H8GdPvRgdvFGUxHQZiwOaB /0A5X/wTyvT5orbzRLsNVMlwy8PqHa4Xaf0+F6IiowjVCElybfKH+vPzRAHI14EnLLd+ JoXya2/bC7D0RAu6cCmMsKWuYTiwpy3Pl781TZEPitZDxV6yO6GmqpE3D6UgXhmchfxw kg5fi7hWm0paSaLQMpUVdg0DpMAG/lC9eyTnlRyY7XyVXPWqUtZPfrXpC+qnMAdKFP32 Niig8xfabGmv7VvWKDMvQQSXIOwvHoF7aN8tVjorIRnrQu0dVkLhyocPdSLjESW2EoYt vBew== X-Gm-Message-State: AOAM531KSEu+B/R+7cqnDA+C4AESryosKbFg5SP08awHSLhVkQdLM1ok gsjCrjpePdE4Yakzq+cack9gCg== X-Google-Smtp-Source: ABdhPJzGDcfEbXLu5zWgOTaJHCrtUgCi8vnt5G/ag2pejaSfAJI0aWalNdwwTM/uYA2FjMPfL/MkHQ== X-Received: by 2002:a1c:2905:: with SMTP id p5mr4175635wmp.156.1612280819590; Tue, 02 Feb 2021 07:46:59 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id b13sm31067041wrt.31.2021.02.02.07.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 07:46:58 -0800 (PST) Date: Tue, 2 Feb 2021 16:46:56 +0100 From: Daniel Vetter To: Stephen Boyd Cc: Rob Clark , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Krishna Manikandan Subject: Re: [PATCH] drm/msm/kms: Make a lock_class_key for each crtc mutex Message-ID: Mail-Followup-To: Stephen Boyd , Rob Clark , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Krishna Manikandan References: <20210125234901.2730699-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210125234901.2730699-1-swboyd@chromium.org> X-Operating-System: Linux phenom 5.7.0-1-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Mon, Jan 25, 2021 at 03:49:01PM -0800, Stephen Boyd wrote: > Lockdep complains about an AA deadlock when rebooting the device. > > ============================================ > WARNING: possible recursive locking detected > 5.4.91 #1 Not tainted > -------------------------------------------- > reboot/5213 is trying to acquire lock: > ffffff80d13391b0 (&kms->commit_lock[i]){+.+.}, at: lock_crtcs+0x60/0xa4 > > but task is already holding lock: > ffffff80d1339110 (&kms->commit_lock[i]){+.+.}, at: lock_crtcs+0x60/0xa4 > > other info that might help us debug this: > Possible unsafe locking scenario: > > CPU0 > ---- > lock(&kms->commit_lock[i]); > lock(&kms->commit_lock[i]); > > *** DEADLOCK *** > > May be due to missing lock nesting notation > > 6 locks held by reboot/5213: > __arm64_sys_reboot+0x148/0x2a0 > device_shutdown+0x10c/0x2c4 > drm_atomic_helper_shutdown+0x48/0xfc > modeset_lock+0x120/0x24c > lock_crtcs+0x60/0xa4 > > stack backtrace: > CPU: 4 PID: 5213 Comm: reboot Not tainted 5.4.91 #1 > Hardware name: Google Pompom (rev1) with LTE (DT) > Call trace: > dump_backtrace+0x0/0x1dc > show_stack+0x24/0x30 > dump_stack+0xfc/0x1a8 > __lock_acquire+0xcd0/0x22b8 > lock_acquire+0x1ec/0x240 > __mutex_lock_common+0xe0/0xc84 > mutex_lock_nested+0x48/0x58 > lock_crtcs+0x60/0xa4 > msm_atomic_commit_tail+0x348/0x570 > commit_tail+0xdc/0x178 > drm_atomic_helper_commit+0x160/0x168 > drm_atomic_commit+0x68/0x80 > > This is because lockdep thinks all the locks taken in lock_crtcs() are > the same lock, when they actually aren't. That's because we call > mutex_init() in msm_kms_init() and that assigns on static key for every > lock initialized in this loop. Let's allocate a dynamic number of > lock_class_keys and assign them to each lock so that lockdep can figure > out an AA deadlock isn't possible here. > > Fixes: b3d91800d9ac ("drm/msm: Fix race condition in msm driver with async layer updates") > Cc: Krishna Manikandan > Signed-off-by: Stephen Boyd This smells like throwing more bad after initial bad code ... First a rant: https://blog.ffwll.ch/2020/08/lockdep-false-positives.html Yes I know the locking you're doing here is correct, but that goes to the second issue: Why is this needed? atomic_async_update helpers are supposed to take care of ordering fun like this, if they're not, we need to address things there. The problem that commit b3d91800d9ac35014e0349292273a6fa7938d402 Author: Krishna Manikandan Date: Fri Oct 16 19:40:43 2020 +0530 drm/msm: Fix race condition in msm driver with async layer updates is _the_ reason we have drm_crtc_commit to track stuff, and Maxime has recently rolled out a pile of changes to vc4 to use these things correctly. Hacking some glorious hand-rolled locking for synchronization of updates really should be the exception for kms drivers, not the rule. And this one here doesn't look like an exception by far (the one legit I know of is the locking issues amdgpu has between atomic_commit_tail and gpu reset, and that one is really nasty, so not going to get fixed in helpers, ever). Cheers, Daniel > --- > drivers/gpu/drm/msm/msm_kms.h | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h > index d8151a89e163..4735251a394d 100644 > --- a/drivers/gpu/drm/msm/msm_kms.h > +++ b/drivers/gpu/drm/msm/msm_kms.h > @@ -157,6 +157,7 @@ struct msm_kms { > * from the crtc's pending_timer close to end of the frame: > */ > struct mutex commit_lock[MAX_CRTCS]; > + struct lock_class_key commit_lock_keys[MAX_CRTCS]; > unsigned pending_crtc_mask; > struct msm_pending_timer pending_timers[MAX_CRTCS]; > }; > @@ -166,8 +167,11 @@ static inline int msm_kms_init(struct msm_kms *kms, > { > unsigned i, ret; > > - for (i = 0; i < ARRAY_SIZE(kms->commit_lock); i++) > - mutex_init(&kms->commit_lock[i]); > + for (i = 0; i < ARRAY_SIZE(kms->commit_lock); i++) { > + lockdep_register_key(&kms->commit_lock_keys[i]); > + __mutex_init(&kms->commit_lock[i], "&kms->commit_lock[i]", > + &kms->commit_lock_keys[i]); > + } > > kms->funcs = funcs; > > > base-commit: 19c329f6808995b142b3966301f217c831e7cf31 > -- > https://chromeos.dev > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch