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 164D7FCB61A for ; Fri, 6 Mar 2026 15:43:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A81210ED6C; Fri, 6 Mar 2026 15:43:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GKNXIg0f"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id A999710ED6A; Fri, 6 Mar 2026 15:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1772811803; x=1804347803; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=+av5cZrq/tj7cwB42vCk7jloSX+rgxaAjOnL+EpwXno=; b=GKNXIg0fzE8ygULKYdoBLTlrWAwPxACqiLOq+GnLDVvnvwb49LXgx4Up 61mrOTQ6EKuZds/xwcdLMDE+5VgXegaUsIlSqODKxVUqaCFEDOSMxZviN ZOrH9m4wfL2jMAMEhW4j1dsW00QU8saOzXMrKTdVNfllpeqC3A0wuw0OM 7mU65JoBW5GyjPMXODVau3Ixah4dXpFRANfoeUoNvGH7+xX3WuYYQV4LZ M+lCIrkMHgFNHrByJSDbKN/UuHSmq2BhlT4UhXQkguett3X5Ot5MubeA0 zC5pXTYRPLqTmDnpMZ3Y3GryfbImZTBl8I4aLyAt5vjh+rX7xpM+473Kp Q==; X-CSE-ConnectionGUID: 5sdOi3cnTqOQtyjIZjlWsQ== X-CSE-MsgGUID: avlGjJGVRqqZJkdUE5i7Bw== X-IronPort-AV: E=McAfee;i="6800,10657,11721"; a="85266397" X-IronPort-AV: E=Sophos;i="6.23,105,1770624000"; d="scan'208";a="85266397" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2026 07:43:23 -0800 X-CSE-ConnectionGUID: a4a7t3ABTtGsYm0+DJEY2g== X-CSE-MsgGUID: prJDx8AxQmWea7uGxiljSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,105,1770624000"; d="scan'208";a="242056400" Received: from dut4086lnl.fm.intel.com ([10.105.10.23]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2026 07:43:22 -0800 From: Jonathan Cavitt To: dri-devel@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com, intel-xe@lists.freedesktop.org, matthew.brost@intel.com, maarten.lankhorst@linux.intel.com, thomas.hellstrom@linux.intel.com Subject: [PATCH v3] drm/pagemap_util: Ensure proper cache lock management on free Date: Fri, 6 Mar 2026 15:43:23 +0000 Message-ID: <20260306154322.60120-2-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Static analysis issue: Though probably unnecessary given the cache is being freed at this step, for the sake of consistency, ensure that the cache lock is always unlocked after drm_pagemap_cache_fini. v2: - Use requested code flow (Maarten) v3: - Clear cache->dpagemap (Matt Brost, Maarten) Fixes: 77f14f2f2d73f ("drm/pagemap: Add a drm_pagemap cache and shrinker") Signed-off-by: Jonathan Cavitt Cc: Thomas Hellstrom Cc: Matthew Brost Cc: Maarten Lankhorst --- drivers/gpu/drm/drm_pagemap_util.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_pagemap_util.c b/drivers/gpu/drm/drm_pagemap_util.c index 14ddb948a32e..6111d90a38e2 100644 --- a/drivers/gpu/drm/drm_pagemap_util.c +++ b/drivers/gpu/drm/drm_pagemap_util.c @@ -65,18 +65,14 @@ static void drm_pagemap_cache_fini(void *arg) drm_dbg(cache->shrinker->drm, "Destroying dpagemap cache.\n"); spin_lock(&cache->lock); dpagemap = cache->dpagemap; - if (!dpagemap) { - spin_unlock(&cache->lock); - goto out; - } + cache->dpagemap = NULL; + if (dpagemap && !drm_pagemap_shrinker_cancel(dpagemap)) + dpagemap = NULL; + spin_unlock(&cache->lock); - if (drm_pagemap_shrinker_cancel(dpagemap)) { - cache->dpagemap = NULL; - spin_unlock(&cache->lock); + if (dpagemap) drm_pagemap_destroy(dpagemap, false); - } -out: mutex_destroy(&cache->lookup_mutex); kfree(cache); } -- 2.43.0