From nobody Thu Nov 28 08:39:57 2024 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0941B1D0141 for ; Wed, 2 Oct 2024 12:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727873787; cv=none; b=P+kxmbLntKoXXsqrPuEOIhH7KqHOcL+8f/eClUW7p/2I2AJ2mj6nTrn7lmPjPMUKvAScBdPNVZ1aI7fuF0tjktccaMPn/Lcqt5in1ypg70NvzIb/HL4u88Fr00N2n/PXM5uOfwPafv1xcXRAhbeWH2toThlsBaYi3vgY/QDTUro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727873787; c=relaxed/simple; bh=lqndgK+Bip48JJMg29r8nJU9XhSePStkQyq7yzexUU0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=i5Wc+RKpF7+L8Fk3SyRIGXNF7Us3dgcT3q929O75fOjq07R5ONYx2XsmTT214O63MESKAi5nd7T3JOZNAScetiG28QSiC7n/muljmfMs1NqMivd0HmJF5Zt6odYitAAXa7FGgw5Giv4OaRJwzIefLDqc0SPMYaCAodSzlfVVig0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=e3OVpase; arc=none smtp.client-ip=198.175.65.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="e3OVpase" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727873786; x=1759409786; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lqndgK+Bip48JJMg29r8nJU9XhSePStkQyq7yzexUU0=; b=e3OVpase9Y9+VQbgoavhbayVR6dQg/HiDvQqmyFZK+/etejtj5uHEpj8 JALU/LqDsDbfxnjWbU6BBh6Rj/mzX0xvrvx005bJoLsHdPOhNemS1VX0b LS81/8urdkmIeliaYeK+ZM4BeYiVTxVHEaDr8dp2Uz6SvTwq6H0pxPp38 vCcaAvsZqF5tXKdwIPSFWL/22H/TM5eq8uYhchLWdAF0E/9dwxFwH0dxY tZ1lMfbGLyFtlFAFV/HJJNQqt0MZD7FOGI3dtKMwwKqEYfOH3XPETaG/A IenQ2TlSk0suExM8K3u6ROUR/Z5L+/1C79nNKNO7MlSFgETk3p/SmmOq9 g==; X-CSE-ConnectionGUID: GJZrlyz/Q2u+lXFaD82PTw== X-CSE-MsgGUID: +AMzmhfcSGOgVL1wUMoIEg== X-IronPort-AV: E=McAfee;i="6700,10204,11213"; a="26832006" X-IronPort-AV: E=Sophos;i="6.11,171,1725346800"; d="scan'208";a="26832006" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2024 05:56:25 -0700 X-CSE-ConnectionGUID: zQWIBAapSAuTf6RIGphfrw== X-CSE-MsgGUID: kL2x7bjmSEiP4IUh7/T4bA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,171,1725346800"; d="scan'208";a="111462316" Received: from oandoniu-mobl3.ger.corp.intel.com (HELO fedora..) ([10.245.244.67]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2024 05:56:23 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Maarten Lankhorst , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND] locking/ww_mutex: Adjust to lockdep nest_lock requirements Date: Wed, 2 Oct 2024 14:56:11 +0200 Message-ID: <20241002125611.361001-1-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.46.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When using mutex_acquire_nest() with a nest_lock, lockdep refcounts the number of acquired lockdep_maps of mutexes of the same class, and also keeps a pointer to the first acquired lockdep_map of a class. That pointer is then used for various comparison-, printing- and checking purposes, but there is no mechanism to actively ensure that lockdep_map stays in memory. Instead, a warning is printed if the lockdep_map is freed and there are still held locks of the same lock class, even if the lockdep_map itself has been released. In the context of WW/WD transactions that means that if a user unlocks and frees a ww_mutex from within an ongoing ww transaction, and that mutex happens to be the first ww_mutex grabbed in the transaction, such a warning is printed and there might be a risk of a UAF. Note that this is only problem when lockdep is enabled and affects only dereferences of struct lockdep_map. Adjust to this by adding a fake lockdep_map to the acquired context and make sure it is the first acquired lockdep map of the associated ww_mutex class. Then hold it for the duration of the WW/WD transaction. This has the side effect that trying to lock a ww mutex *without* a ww_acquire_context but where a such context has been acquire, we'd see a lockdep splat. The test-ww_mutex.c selftest attempts to do that, so modify that particular test to not acquire a ww_acquire_context if it is not going to be used. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Will Deacon Cc: Waiman Long Cc: Boqun Feng Cc: Maarten Lankhorst Cc: Christian K=C3=B6nig Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Thomas Hellstr=C3=B6m Acked-by: Maarten Lankhorst --- include/linux/ww_mutex.h | 14 ++++++++++++++ kernel/locking/test-ww_mutex.c | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h index bb763085479a..a401a2f31a77 100644 --- a/include/linux/ww_mutex.h +++ b/include/linux/ww_mutex.h @@ -65,6 +65,16 @@ struct ww_acquire_ctx { #endif #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lockdep_map dep_map; + /** + * @first_lock_dep_map: fake lockdep_map for first locked ww_mutex. + * + * lockdep requires the lockdep_map for the first locked ww_mutex + * in a ww transaction to remain in memory until all ww_mutexes of + * the transaction have been unlocked. Ensure this by keeping a + * fake locked ww_mutex lockdep map between ww_acquire_init() and + * ww_acquire_fini(). + */ + struct lockdep_map first_lock_dep_map; #endif #ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH unsigned int deadlock_inject_interval; @@ -146,7 +156,10 @@ static inline void ww_acquire_init(struct ww_acquire_c= tx *ctx, debug_check_no_locks_freed((void *)ctx, sizeof(*ctx)); lockdep_init_map(&ctx->dep_map, ww_class->acquire_name, &ww_class->acquire_key, 0); + lockdep_init_map(&ctx->first_lock_dep_map, ww_class->mutex_name, + &ww_class->mutex_key, 0); mutex_acquire(&ctx->dep_map, 0, 0, _RET_IP_); + mutex_acquire_nest(&ctx->first_lock_dep_map, 0, 0, &ctx->dep_map, _RET_IP= _); #endif #ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH ctx->deadlock_inject_interval =3D 1; @@ -185,6 +198,7 @@ static inline void ww_acquire_done(struct ww_acquire_ct= x *ctx) static inline void ww_acquire_fini(struct ww_acquire_ctx *ctx) { #ifdef CONFIG_DEBUG_LOCK_ALLOC + mutex_release(&ctx->first_lock_dep_map, _THIS_IP_); mutex_release(&ctx->dep_map, _THIS_IP_); #endif #ifdef DEBUG_WW_MUTEXES diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c index 10a5736a21c2..4c2b8b567de5 100644 --- a/kernel/locking/test-ww_mutex.c +++ b/kernel/locking/test-ww_mutex.c @@ -62,7 +62,8 @@ static int __test_mutex(unsigned int flags) int ret; =20 ww_mutex_init(&mtx.mutex, &ww_class); - ww_acquire_init(&ctx, &ww_class); + if (flags & TEST_MTX_CTX) + ww_acquire_init(&ctx, &ww_class); =20 INIT_WORK_ONSTACK(&mtx.work, test_mutex_work); init_completion(&mtx.ready); @@ -90,7 +91,8 @@ static int __test_mutex(unsigned int flags) ret =3D wait_for_completion_timeout(&mtx.done, TIMEOUT); } ww_mutex_unlock(&mtx.mutex); - ww_acquire_fini(&ctx); + if (flags & TEST_MTX_CTX) + ww_acquire_fini(&ctx); =20 if (ret) { pr_err("%s(flags=3D%x): mutual exclusion failure\n", --=20 2.46.0