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 0E463C88CB4 for ; Mon, 12 Jun 2023 17:14:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DAD8110E0C7; Mon, 12 Jun 2023 17:14:53 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4192B10E2BF for ; Mon, 12 Jun 2023 17:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686590091; x=1718126091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d5LcZz/Z4HccwkUWllRMKtcuZH5/+Rh7RfCxoruWgXQ=; b=I5JE1t3nsYkhY9HowYsF/p5ylM+i+X3LXWfiQMjeZAAkSnKa/1y3HJWK 4xh/F7vGOdvktD4TLrcsrRuUwDxkkK7FJG3IHqCroFI0fHVD++HryZTxd VWMTgS36/7EzC+QgqWMTN4F4G3kJB38nMMvMj7gNYPVUIg4ZBXuM0Gugr YZFOj4+ROz8hYdLklMrl2NnZNXnOuhv8uaQ1/w09qTc5jhIEuM5OxMqKh QR4vbkNfndsHrEU924qAb7zN/4gvm29MU4Qd38feZkGV3VQbxZKDwOA7M +OrOCBbs2OaBQDgohTy9wOrmyuNyhbjWu0LRxjotH9Dmu3h9TnuQppfAc g==; X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="342792815" X-IronPort-AV: E=Sophos;i="6.00,236,1681196400"; d="scan'208";a="342792815" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 10:14:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="688715258" X-IronPort-AV: E=Sophos;i="6.00,236,1681196400"; d="scan'208";a="688715258" Received: from mgutier2-mobl1.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.22.12]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 10:14:49 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Date: Mon, 12 Jun 2023 18:12:23 +0100 Message-Id: <20230612171225.88689-11-matthew.auld@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612171225.88689-1-matthew.auld@intel.com> References: <20230612171225.88689-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v11 10/12] 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 bae9f66a33cb..576267e9ad65 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_ggtt *ggtt) { struct xe_device *xe = tile_to_xe(ggtt->tile); @@ -128,6 +138,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.40.1