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 7F607C7EE2E for ; Mon, 22 May 2023 16:18:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F28B10E36E; Mon, 22 May 2023 16:18:47 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 448F810E366 for ; Mon, 22 May 2023 16:18:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684772325; x=1716308325; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8kxWwlmi/80BIuZup2tZYksMfZa756JTN+2mwjPbMPM=; b=mkSz0hUNSJDy5MsFDLH6rkYdYhIEKlp+dMvA3HRs2rpIEem4XMkq2AhM qOgBJethCvwt646SBtYU6PluDimdRTAHLLpt7EA6qijm300MxdnOAtfKO /ln3k1u2XRwzAlJeMos+zXaXdlG4qABlB2djvbVmHjvFENhiB6BlmExDN 43xjmKwY6XEJ945JtJMu9ltkw88p1JtSFc9z7sPjC0x/Z80GUEgzNQMB+ sNLI51tj0OfDMHCZD3P/Z1Rh7t/bBeHhLpeol8Ii+M7e6Ja36dNXe7A1E DkbAgpIsbXdG1YWzOHbl+AH/7vb8nOffWokNKhF0/aZzfUncJjKZPkKM7 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="381199202" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="381199202" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 09:15:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="703586509" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="703586509" Received: from amigon-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.249.128.230]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 09:15:50 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Date: Mon, 22 May 2023 17:14:01 +0100 Message-Id: <20230522161403.79731-5-matthew.auld@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522161403.79731-1-matthew.auld@intel.com> References: <20230522161403.79731-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v7 5/7] 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 f986e8218820..e25eb70d44f6 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -90,6 +90,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_gt *gt, struct xe_ggtt *ggtt) { struct xe_device *xe = gt_to_xe(gt); @@ -132,6 +142,7 @@ int xe_ggtt_init_noalloc(struct xe_gt *gt, 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.40.1