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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9419C19F2D for ; Tue, 9 Aug 2022 16:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244645AbiHIQo3 (ORCPT ); Tue, 9 Aug 2022 12:44:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244627AbiHIQo2 (ORCPT ); Tue, 9 Aug 2022 12:44:28 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E2F81FCC8 for ; Tue, 9 Aug 2022 09:44:27 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id c187-20020a1c35c4000000b003a30d88fe8eso9203264wma.2 for ; Tue, 09 Aug 2022 09:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:from:to:cc; bh=kG73ZFGwpqA9MEsaOhGxOyq0S5W0g/PKck6MJrQJjh4=; b=IjvlDT3GgnKcWar5hWlV3kmPtlMIw3szkL6RRUTSuwPJE7rdHudxhXegyQLbP/fx1M NhNiueI3flr6TSRZBFjxGWtzcrHT0mmP3lo5PnjVx5SsmwuMN8QhC2d/mki5v4qH7HDx 8w91tH2jhqzru340MMXj1N/ZvULmrkBUYw3Is= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:x-gm-message-state:from:to:cc; bh=kG73ZFGwpqA9MEsaOhGxOyq0S5W0g/PKck6MJrQJjh4=; b=OiCnwuEcG0X9rHNaspI2RoljsyAygrTDsnI+RzIf3zbVk8hechJnSBRSkHeKRBeTqM kWsBAwwc3Es7oa9jQfaUQBB79YPYom4lGx6CQbBgw+rt6cCkjSkyHTUK4yXoJVPF1xkZ D2tABOr1PsvXOsZcYeK3h9rci9IppR3EBSp48QcfmVW7eLuMRcrh+OqVFW+eo+XKgMTn 60SZQrODX+I3dRMNCzmyxlgmyL1IppMdWlsKVggTyRBddrwvScn/XjyeqOkSdGzpw6BY X3HHX+HGYgb0QkszcMjcsZ16Vj3uzeauLC1YwUr8Kn1J66AnOCtM8jEOBVCxIMISSW8Z vFLg== X-Gm-Message-State: ACgBeo01TrcX45SpZ8E22GN8PHI32BeCuZBREOif9ilMGaoJvy8VBwbR QfTrDs/xxLWHnpMaAKyVKuST8w== X-Google-Smtp-Source: AA6agR7Mh8M3suAF/jwjxN+ICA7FrHXNw3HuqSciA+CCbg9rxGZ4/Yyg824wTV/ciSBKOP3NeoJYRQ== X-Received: by 2002:a1c:f60f:0:b0:3a0:3e0c:1de1 with SMTP id w15-20020a1cf60f000000b003a03e0c1de1mr21550404wmc.56.1660063465672; Tue, 09 Aug 2022 09:44:25 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id h19-20020a05600c351300b003a501ad8648sm18098101wmq.40.2022.08.09.09.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 09:44:25 -0700 (PDT) Date: Tue, 9 Aug 2022 18:44:22 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: Dmitry Osipenko , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Emil Velikov , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Osipenko , linux-tegra@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: Re: [PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error Message-ID: Mail-Followup-To: Christian =?iso-8859-1?Q?K=F6nig?= , Dmitry Osipenko , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Emil Velikov , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Osipenko , linux-tegra@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org References: <20220701090240.1896131-1-dmitry.osipenko@collabora.com> <20220701090240.1896131-2-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org On Tue, Jul 05, 2022 at 01:33:51PM +0200, Christian König wrote: > Am 01.07.22 um 11:02 schrieb Dmitry Osipenko: > > Use ww_acquire_fini() in the error code paths. Otherwise lockdep > > thinks that lock is held when lock's memory is freed after the > > drm_gem_lock_reservations() error. The ww_acquire_context needs to be > > annotated as "released", which fixes the noisy "WARNING: held lock freed!" > > splat of VirtIO-GPU driver with CONFIG_DEBUG_MUTEXES=y and enabled lockdep. > > > > Cc: stable@vger.kernel.org > > Fixes: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO reservations.") > > Reviewed-by: Thomas Hellström > > Signed-off-by: Dmitry Osipenko > > Reviewed-by: Christian König Also added this r-b tag when merging to drm-misc-next-fixes. -Daniel > > > --- > > drivers/gpu/drm/drm_gem.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > > index eb0c2d041f13..86d670c71286 100644 > > --- a/drivers/gpu/drm/drm_gem.c > > +++ b/drivers/gpu/drm/drm_gem.c > > @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > > ret = dma_resv_lock_slow_interruptible(obj->resv, > > acquire_ctx); > > if (ret) { > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > > @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > > goto retry; > > } > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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 Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 087D1C25B0C for ; Tue, 9 Aug 2022 16:44:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6F66B814BB; Tue, 9 Aug 2022 16:44:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6F66B814BB Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.a=rsa-sha256 header.s=google header.b=IjvlDT3G X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PStJmaK3kkAT; Tue, 9 Aug 2022 16:44:30 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0445580D50; Tue, 9 Aug 2022 16:44:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0445580D50 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B45BAC0033; Tue, 9 Aug 2022 16:44:29 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id A4B44C002D for ; Tue, 9 Aug 2022 16:44:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7EC91813DD for ; Tue, 9 Aug 2022 16:44:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7EC91813DD X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xoLZeEU0DyZN for ; Tue, 9 Aug 2022 16:44:27 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 64EED813AF Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by smtp1.osuosl.org (Postfix) with ESMTPS id 64EED813AF for ; Tue, 9 Aug 2022 16:44:27 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id 186-20020a1c02c3000000b003a34ac64bdfso6935495wmc.1 for ; Tue, 09 Aug 2022 09:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:from:to:cc; bh=kG73ZFGwpqA9MEsaOhGxOyq0S5W0g/PKck6MJrQJjh4=; b=IjvlDT3GgnKcWar5hWlV3kmPtlMIw3szkL6RRUTSuwPJE7rdHudxhXegyQLbP/fx1M NhNiueI3flr6TSRZBFjxGWtzcrHT0mmP3lo5PnjVx5SsmwuMN8QhC2d/mki5v4qH7HDx 8w91tH2jhqzru340MMXj1N/ZvULmrkBUYw3Is= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:x-gm-message-state:from:to:cc; bh=kG73ZFGwpqA9MEsaOhGxOyq0S5W0g/PKck6MJrQJjh4=; b=Zz/CVFfxc/jJE3GTTmClTFqGQD+64xrNjFBcjx1Fxnfe9/8tI+jy3Mmak/eKqHc6Ct F+YzmiLPh8waX+KCd3J2KdiAS4Olpq69y8GtexUlm3MtntlYDGPYkdjU34MjEki2+6IH hyH/5U6dcJh8Njf/8TBrW41CUbtnuHnLo5PFYyU/gh6zyOGrKYV/pPtVXkBYIExINyhx cmHfLGmpLLP8KaAEA3dmQr41DQi55+jL0kv3dL7jRORUH4XzwWriuBsemZE0CC/jXUGQ 1V+f5KCb9x71WHqF5GAzFifVPtSbrWX+v6zU9YTECgEoCXvg81rKnHhb1g5zWw6AErXB +iyw== X-Gm-Message-State: ACgBeo3ta9qjV7pMZZsBB49u2enHjl0E+6ClhMwksuelesZVIQAPAJoa ZryxNQNFsP230m4/ZlWowNOvIQ== X-Google-Smtp-Source: AA6agR7Mh8M3suAF/jwjxN+ICA7FrHXNw3HuqSciA+CCbg9rxGZ4/Yyg824wTV/ciSBKOP3NeoJYRQ== X-Received: by 2002:a1c:f60f:0:b0:3a0:3e0c:1de1 with SMTP id w15-20020a1cf60f000000b003a03e0c1de1mr21550404wmc.56.1660063465672; Tue, 09 Aug 2022 09:44:25 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id h19-20020a05600c351300b003a501ad8648sm18098101wmq.40.2022.08.09.09.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 09:44:25 -0700 (PDT) Date: Tue, 9 Aug 2022 18:44:22 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error Message-ID: Mail-Followup-To: Christian =?iso-8859-1?Q?K=F6nig?= , Dmitry Osipenko , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Emil Velikov , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Osipenko , linux-tegra@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org References: <20220701090240.1896131-1-dmitry.osipenko@collabora.com> <20220701090240.1896131-2-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.0-8-amd64 Cc: dri-devel@lists.freedesktop.org, Dmitry Osipenko , David Airlie , Thomas Zimmermann , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , Maarten Lankhorst , linux-kernel@vger.kernel.org, Maxime Ripard , Gurchetan Singh , Emil Velikov , Daniel Vetter , linux-tegra@vger.kernel.org, Dmitry Osipenko , kernel@collabora.com, virtualization@lists.linux-foundation.org, Chia-I Wu X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Tue, Jul 05, 2022 at 01:33:51PM +0200, Christian K=F6nig wrote: > Am 01.07.22 um 11:02 schrieb Dmitry Osipenko: > > Use ww_acquire_fini() in the error code paths. Otherwise lockdep > > thinks that lock is held when lock's memory is freed after the > > drm_gem_lock_reservations() error. The ww_acquire_context needs to be > > annotated as "released", which fixes the noisy "WARNING: held lock free= d!" > > splat of VirtIO-GPU driver with CONFIG_DEBUG_MUTEXES=3Dy and enabled lo= ckdep. > > = > > Cc: stable@vger.kernel.org > > Fixes: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO rese= rvations.") > > Reviewed-by: Thomas Hellstr=F6m > > Signed-off-by: Dmitry Osipenko > = > Reviewed-by: Christian K=F6nig Also added this r-b tag when merging to drm-misc-next-fixes. -Daniel > = > > --- > > drivers/gpu/drm/drm_gem.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > = > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > > index eb0c2d041f13..86d670c71286 100644 > > --- a/drivers/gpu/drm/drm_gem.c > > +++ b/drivers/gpu/drm/drm_gem.c > > @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object *= *objs, int count, > > ret =3D dma_resv_lock_slow_interruptible(obj->resv, > > acquire_ctx); > > if (ret) { > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > > @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object *= *objs, int count, > > goto retry; > > } > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > = -- = Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0FFFC19F2D for ; Tue, 9 Aug 2022 16:44:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F177B911DF; Tue, 9 Aug 2022 16:44:41 +0000 (UTC) Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10054113521 for ; Tue, 9 Aug 2022 16:44:27 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id r1-20020a05600c35c100b003a326685e7cso801031wmq.1 for ; Tue, 09 Aug 2022 09:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:from:to:cc; bh=kG73ZFGwpqA9MEsaOhGxOyq0S5W0g/PKck6MJrQJjh4=; b=IjvlDT3GgnKcWar5hWlV3kmPtlMIw3szkL6RRUTSuwPJE7rdHudxhXegyQLbP/fx1M NhNiueI3flr6TSRZBFjxGWtzcrHT0mmP3lo5PnjVx5SsmwuMN8QhC2d/mki5v4qH7HDx 8w91tH2jhqzru340MMXj1N/ZvULmrkBUYw3Is= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:x-gm-message-state:from:to:cc; bh=kG73ZFGwpqA9MEsaOhGxOyq0S5W0g/PKck6MJrQJjh4=; b=aFe0ex9BxmlAOTLi19fVMUUPwcG+ivk8KXUA4H+YuC8QRqCm1GJbJfBqNbLkIduG7b rEx4Mjb7paKGiWntkRUxQHMNc6duh01pFW75ChBk66PvjYGWUtSMcjgr6DuqtvzdUjOo gZIKBOWynp4aT5aRj7o1ZR/Lr4uq7di1s7x02vrMlVtPDbTQ3lWTa3x3uSu3NeFiEp/x ZHetzBSdwtZql9OTTFB8s/JA/RVGuYZw1Uo6ub6UEEfZ7xEIz3cZ94lvBScKZk6Uey+i q84PVTHXiyiuAJOFuhsbsuXBTocq12C27Ec1mkwdvCfDKZAN4L0qg0qZKmOqhsC6EbqI ITXw== X-Gm-Message-State: ACgBeo3t1jBOH/XHuQOysV0KbJ/TE3NyyU6ub5+pnQEC9AKYqt0AMcrX KHnQ4Mk1vN0TAgCGn0IXimfAOg== X-Google-Smtp-Source: AA6agR7Mh8M3suAF/jwjxN+ICA7FrHXNw3HuqSciA+CCbg9rxGZ4/Yyg824wTV/ciSBKOP3NeoJYRQ== X-Received: by 2002:a1c:f60f:0:b0:3a0:3e0c:1de1 with SMTP id w15-20020a1cf60f000000b003a03e0c1de1mr21550404wmc.56.1660063465672; Tue, 09 Aug 2022 09:44:25 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id h19-20020a05600c351300b003a501ad8648sm18098101wmq.40.2022.08.09.09.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 09:44:25 -0700 (PDT) Date: Tue, 9 Aug 2022 18:44:22 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error Message-ID: Mail-Followup-To: Christian =?iso-8859-1?Q?K=F6nig?= , Dmitry Osipenko , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Emil Velikov , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Osipenko , linux-tegra@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org References: <20220701090240.1896131-1-dmitry.osipenko@collabora.com> <20220701090240.1896131-2-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 5.10.0-8-amd64 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, Dmitry Osipenko , David Airlie , Thomas Zimmermann , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , linux-kernel@vger.kernel.org, Gurchetan Singh , Emil Velikov , Gerd Hoffmann , linux-tegra@vger.kernel.org, Dmitry Osipenko , kernel@collabora.com, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jul 05, 2022 at 01:33:51PM +0200, Christian König wrote: > Am 01.07.22 um 11:02 schrieb Dmitry Osipenko: > > Use ww_acquire_fini() in the error code paths. Otherwise lockdep > > thinks that lock is held when lock's memory is freed after the > > drm_gem_lock_reservations() error. The ww_acquire_context needs to be > > annotated as "released", which fixes the noisy "WARNING: held lock freed!" > > splat of VirtIO-GPU driver with CONFIG_DEBUG_MUTEXES=y and enabled lockdep. > > > > Cc: stable@vger.kernel.org > > Fixes: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO reservations.") > > Reviewed-by: Thomas Hellström > > Signed-off-by: Dmitry Osipenko > > Reviewed-by: Christian König Also added this r-b tag when merging to drm-misc-next-fixes. -Daniel > > > --- > > drivers/gpu/drm/drm_gem.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > > index eb0c2d041f13..86d670c71286 100644 > > --- a/drivers/gpu/drm/drm_gem.c > > +++ b/drivers/gpu/drm/drm_gem.c > > @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > > ret = dma_resv_lock_slow_interruptible(obj->resv, > > acquire_ctx); > > if (ret) { > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > > @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > > goto retry; > > } > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch