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 6037AC001DF for ; Thu, 13 Jul 2023 13:23:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3893110E6E1; Thu, 13 Jul 2023 13:23:24 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id A14C310E6E1 for ; Thu, 13 Jul 2023 13:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689254601; x=1720790601; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/Tsn8oQ7tTSjfxTe/W1AjrZBQiuMsVlMG9lB1VUyMQU=; b=EcDC8T8VQZ1yx8NIUTuxBLLIDjChhZLh27yCjqcI4bL47OCNDt0FTmZn 0T6nCMFbN3DRqlxDfqRBGW4y6Xf6qyJmXQsCUSo1ib5fDHOeqpX9HUuvn BPmxq04N/lVO7TaQSlpSeSJW4nfITffb+bhSIohLn9bTfyyGfALvgiJOS 8dQ2rjA1KaNx34CZ8cz5sTb78UOvqRnymL9+nli2M6fkZb6by2emDn4/6 4x0tK2Tj2Zt5FVkdoJTLa4mUFhk+TJXO6X2agVuEZcNqXZRqWCk24W4rP LKj4NaUOJUjCfMGculZQIzNgXJuQ19vLE8NIzk+o18UhfMR/YcWK5Gea1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="345497979" X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="345497979" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2023 06:23:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="787455337" X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="787455337" Received: from rossdevx-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.28.133]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2023 06:23:20 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Date: Thu, 13 Jul 2023 14:22:53 +0100 Message-ID: <20230713132244.459605-20-matthew.auld@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230713132244.459605-12-matthew.auld@intel.com> References: <20230713132244.459605-12-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v13 08/10] drm/xe/ggtt: prime ggtt->lock against FS_RECLAIM X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rodrigo Vivi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Increase the sensitivity of the ggtt->lock by priming it against FS_RECLAIM, such that allocating memory while holding will result in lockdep splats. Signed-off-by: Matthew Auld Cc: Thomas Hellström Cc: Rodrigo Vivi Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_ggtt.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c index 7588fbc2f278..e1b84bc25375 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -93,6 +93,16 @@ static void ggtt_fini_noalloc(struct drm_device *drm, void *arg) xe_bo_unpin_map_no_vm(ggtt->scratch); } +static void primelockdep(struct xe_ggtt *ggtt) +{ + if (!IS_ENABLED(CONFIG_LOCKDEP)) + return; + + fs_reclaim_acquire(GFP_KERNEL); + might_lock(&ggtt->lock); + fs_reclaim_release(GFP_KERNEL); +} + int xe_ggtt_init_noalloc(struct xe_ggtt *ggtt) { struct xe_device *xe = tile_to_xe(ggtt->tile); @@ -140,6 +150,7 @@ int xe_ggtt_init_noalloc(struct xe_ggtt *ggtt) drm_mm_init(&ggtt->mm, xe_wopcm_size(xe), ggtt->size - xe_wopcm_size(xe)); mutex_init(&ggtt->lock); + primelockdep(ggtt); return drmm_add_action_or_reset(&xe->drm, ggtt_fini_noalloc, ggtt); } -- 2.41.0