From patchwork Fri Aug 4 18:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 131342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp84779vqr; Fri, 4 Aug 2023 13:31:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrPAiJ8xoL1QhTXWaZPpnQ2WFniWeRVQc0j7bVoFp68invA+0b6C9X1EBswCU5KFr4F6Np X-Received: by 2002:a17:906:208:b0:99b:ea8f:9003 with SMTP id 8-20020a170906020800b0099bea8f9003mr2579377ejd.50.1691181064674; Fri, 04 Aug 2023 13:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691181064; cv=none; d=google.com; s=arc-20160816; b=YN0sohkSSavXpeeb1ibV8b8am6lsHgLduB6c7hAvkLAoIFSY9ButTbv6XXNz/Yeqaa oc5Y0CbPdDCM1bU4P3Fxd5bzXpopJuNFVj8HqHE54NJr3Hwb0tjklMijk60DZFxkT9Jl qu/aYrZ9+CyqjOC647w9pOLKmZW0d5VLLLCNDq0C5tNiNl954vWItDJe0WujP2eIhfln HE0+vr9iDcOIdLoyvsN+3IG+DRx5ASwvatUdcHtD36dhusy2G7ZgvWq/OLKKRqHArEMJ C/qUhz7/xDfQ1HZodr9W9o6quA1gcAGwg31diniV53Ew1rVIcnjHOQkhG1rUry6TGJpd fDwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NfuUlvOtQCcgIWDDGRTDaO97w4Wpv+IQfrkVs47IV0U=; fh=K2z4qF9vBIeudG+FAsbdmtc7khu/mu2nGw/y5mnZTR0=; b=FAKV3lUGcj3Q5TXWVHvl/KXYOt5lb5lq3Pfs6NBOMSy/9uYdOhNxq9T33Vlv9NESDP NMDoVOT+8aYBvSen77tb6/qnSMHhlD6aWKyGxcFHThP8nSl4UDJsIOxnP75OEbCil7a9 KSJ9nfS9DK9S1X9/2wR/RNcR4UD+g34wQ+GE/LLjtOdxflH9A7gxvnm3B4RiSHUokFie 55oYsMcTsFqCv5lWUmBpFXrDD5OoJ7PIzTZhOpkmpNvT7OxlctEkpThXDe9Q4QCzNNJO k173D38kpWXxrEUV00qwnS0vYdHUzrbzBuyFJ5NeLmngpv0AvmUx3qDvjOaFSNtHnIgh BbEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LGn0YbsK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n21-20020a17090625d500b0098e417a0c3bsi2083436ejb.109.2023.08.04.13.30.11; Fri, 04 Aug 2023 13:31:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LGn0YbsK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231220AbjHDSZj (ORCPT + 99 others); Fri, 4 Aug 2023 14:25:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231296AbjHDSZK (ORCPT ); Fri, 4 Aug 2023 14:25:10 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB00046B2 for ; Fri, 4 Aug 2023 11:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691173459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NfuUlvOtQCcgIWDDGRTDaO97w4Wpv+IQfrkVs47IV0U=; b=LGn0YbsKiXH3qYOKga0YXHC9gqvW0Dji/6+Isv/OSlhKiGg55ZbZmbj7msanbp8esOJKEn 3QqaDdW0epGekl4dlgvxKJCVuqiV8SotCz9VIUVX3DpvmcxkhkoRG2K7akefnotu0Z6gjt GZ7S4V2cI4W6TttQ716TlSX1EBCGnho= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-133-Ua_LPelZMfuco0t_r3qniQ-1; Fri, 04 Aug 2023 14:24:17 -0400 X-MC-Unique: Ua_LPelZMfuco0t_r3qniQ-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-522e6bcde75so1568432a12.2 for ; Fri, 04 Aug 2023 11:24:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691173456; x=1691778256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NfuUlvOtQCcgIWDDGRTDaO97w4Wpv+IQfrkVs47IV0U=; b=EB+A8PeoHSzPQoNUPQ2fOtuyGGu/CHXo41iW6J1xy0fJzy8qHeyhcr52/F9J0xaxI4 XR8fVh73AZ455N4hlu8iy5oQgQ1E7KfXAz9UStitaeteUryLYc9wrH9odXP4RVliQNnY w8Gq+q74TfapFeemknfVIUnZGYvMm8OrmcGgHASDfu960hSGlvoKWnA8/65mEhvT8Sfu OVU6oKHOdalU58MvbtBNLBanvjzx9A0o/wP5qZa5+jp9DnUt5euDwp3wkX/v3RuIji6q w/q8Ct7f6ddim5pPgLyGOeO2/FbrWbOyAiyq14+wnJ24GJgeq2X/zDiq3sfAUbsoyOwj tabg== X-Gm-Message-State: AOJu0YzSVBvSYSM5b4yTzZC/t/HBa73TtTU5n9HdTr9Tt4KAlF/DTcOu KkRq+zQfb6icADcDabZEVwFZ5Xq3YKMHACQGDlI2pBsnm91f5acJEJttVxiHwc84QvcA1yzeduT egIa+qje6peIzR7zEjFWT6Tdp X-Received: by 2002:aa7:db44:0:b0:522:3c32:fd2e with SMTP id n4-20020aa7db44000000b005223c32fd2emr2223765edt.24.1691173456653; Fri, 04 Aug 2023 11:24:16 -0700 (PDT) X-Received: by 2002:aa7:db44:0:b0:522:3c32:fd2e with SMTP id n4-20020aa7db44000000b005223c32fd2emr2223746edt.24.1691173456342; Fri, 04 Aug 2023 11:24:16 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id d12-20020aa7ce0c000000b005230724b2b1sm1581545edv.45.2023.08.04.11.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 11:24:15 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, tzimmermann@suse.de, mripard@kernel.org, corbet@lwn.net, christian.koenig@amd.com, bskeggs@redhat.com, Liam.Howlett@oracle.com, matthew.brost@intel.com, boris.brezillon@collabora.com, alexdeucher@gmail.com, ogabbay@kernel.org, bagasdotme@gmail.com, willy@infradead.org, jason@jlekstrand.net, donald.robson@imgtec.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich , Dave Airlie Subject: [PATCH drm-misc-next v10 01/12] drm/gem: fix lockdep check for dma-resv lock Date: Fri, 4 Aug 2023 20:23:41 +0200 Message-ID: <20230804182406.5222-2-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230804182406.5222-1-dakr@redhat.com> References: <20230804182406.5222-1-dakr@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773331875982384399 X-GMAIL-MSGID: 1773331875982384399 When no custom lock is set to protect a GEMs GPUVA list, lockdep checks should fall back to the GEM objects dma-resv lock. With the current implementation we're setting the lock_dep_map of the GEM objects 'resv' pointer (in case no custom lock_dep_map is set yet) on drm_gem_private_object_init(). However, the GEM objects 'resv' pointer might still change after drm_gem_private_object_init() is called, e.g. through ttm_bo_init_reserved(). This can result in the wrong lock being tracked. To fix this, call dma_resv_held() directly from drm_gem_gpuva_assert_lock_held() and fall back to the GEMs lock_dep_map pointer only if an actual custom lock is set. Fixes: e6303f323b1a ("drm: manager to keep track of GPUs VA mappings") Reviewed-by: Dave Airlie Signed-off-by: Danilo Krummrich --- include/drm/drm_gem.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index c0b13c43b459..bc9f6aa2f3fe 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -551,15 +551,17 @@ int drm_gem_evict(struct drm_gem_object *obj); * @lock: the lock used to protect the gpuva list. The locking primitive * must contain a dep_map field. * - * Call this if you're not proctecting access to the gpuva list - * with the dma-resv lock, otherwise, drm_gem_gpuva_init() takes care - * of initializing lock_dep_map for you. + * Call this if you're not proctecting access to the gpuva list with the + * dma-resv lock, but with a custom lock. */ #define drm_gem_gpuva_set_lock(obj, lock) \ - if (!(obj)->gpuva.lock_dep_map) \ + if (!WARN((obj)->gpuva.lock_dep_map, \ + "GEM GPUVA lock should be set only once.")) \ (obj)->gpuva.lock_dep_map = &(lock)->dep_map #define drm_gem_gpuva_assert_lock_held(obj) \ - lockdep_assert(lock_is_held((obj)->gpuva.lock_dep_map)) + lockdep_assert((obj)->gpuva.lock_dep_map ? \ + lock_is_held((obj)->gpuva.lock_dep_map) : \ + dma_resv_held((obj)->resv)) #else #define drm_gem_gpuva_set_lock(obj, lock) do {} while (0) #define drm_gem_gpuva_assert_lock_held(obj) do {} while (0) @@ -573,11 +575,12 @@ int drm_gem_evict(struct drm_gem_object *obj); * * Calling this function is only necessary for drivers intending to support the * &drm_driver_feature DRIVER_GEM_GPUVA. + * + * See also drm_gem_gpuva_set_lock(). */ static inline void drm_gem_gpuva_init(struct drm_gem_object *obj) { INIT_LIST_HEAD(&obj->gpuva.list); - drm_gem_gpuva_set_lock(obj, &obj->resv->lock.base); } /**