From nobody Sun Feb 8 02:55:49 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 9D8C618DF83 for ; Tue, 30 Jul 2024 22:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722377819; cv=none; b=JBonh7IGQS2+sHkFk4EAqJK7mm+ZIXO9EWkQtm2qkHq+DCvflXxGvNM2FEDi1Ul4LouO+46Xmym6y6wZVU4ETvr6NeZPBiQ9r+v8hv2M8Kvw3h6ekXWzcm70OR/YHhzBTjd36UeHxwW/0CybVxBXaf5n52o1KTNDgheRNCcMb3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722377819; c=relaxed/simple; bh=qCyhA4EZ+YVt5V2C/j3gEoE4CkrbPbSQ4eW9bIIZI3o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TiPmm9oOzHZGM+dKnAbmB35njiyPTYZlM/8amKNiee3WyPOS/I7ZNZ+tm6UgLd3FU1XFfBNnKaNLky+aSHS7+p8WYDVZvgyYfR+JsUMtbTAvgTwjLcJxK/7vIvwY1ykCqzFdKl++I3IU1PXI3JLTOu6k3rQD+RIRwpffVmiFbno= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=UIeVZX9h; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UIeVZX9h" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722377817; x=1753913817; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qCyhA4EZ+YVt5V2C/j3gEoE4CkrbPbSQ4eW9bIIZI3o=; b=UIeVZX9hINeWFIyFfsTwBW2xd4Z1YA11t9wII5dbjCL46X2pAx2MrEPb +sFV7X/FPutPPwpc2z+p+FWB2GrlCBLRCDfU/rLUksgOXwEY9ONUmI8lE uiZ+hi95rwUeRVEkY6IWwXitC4p5+25MfpNA/PqyY4Q1D6gVvtUxg9qdk O09c4XwkopwkrD6IKlfSWkaQ9GK3Nuen/3jNi3uSZyyIEbGE9lwwDRC84 pU8U16qGRzrXVbHmgFiy3kP4KqJWj6uPn6TyxZ8Q5Wpv5W8B+rHaK1hb6 NRexhGLjgWV9R12dCga4DxBAyjDO0uSHSZJtBnjRp+QIki4LGmzdkwxVG g==; X-CSE-ConnectionGUID: Bz82NKlmRhSZ/PspRRB3xw== X-CSE-MsgGUID: OyOFqguCTzSpyqvLat8kwQ== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="24094121" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="24094121" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 15:16:55 -0700 X-CSE-ConnectionGUID: lPUoaK04Rlur3pRGWxuJ8g== X-CSE-MsgGUID: nN2hCdBdRPeP6gSawUSfVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="58613341" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 15:16:55 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: tj@kernel.org, jiangshanlai@gmail.com, christian.koenig@amd.com, ltuikov89@gmail.com, daniel@ffwll.ch Subject: [RFC PATCH 1/3] workqueue: Add interface for user-defined workqueue lockdep map Date: Tue, 30 Jul 2024 15:17:40 -0700 Message-Id: <20240730221742.2248527-2-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730221742.2248527-1-matthew.brost@intel.com> References: <20240730221742.2248527-1-matthew.brost@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add an interface for a user-defined workqueue lockdep map, which is helpful when multiple workqueues are created for the same purpose. This also helps avoid leaking lockdep maps on each workqueue creation. Implement a new workqueue flag, WQ_USER_OWNED_LOCKDEP, to indicate that the user will set up the workqueue lockdep map using the new function wq_init_user_lockdep_map. Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Matthew Brost --- include/linux/workqueue.h | 3 +++ kernel/workqueue.c | 44 ++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index d9968bfc8eac..3e6db0889e2b 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -223,6 +223,8 @@ struct execute_work { }; =20 #ifdef CONFIG_LOCKDEP +void wq_init_user_lockdep_map(struct workqueue_struct *wq, + struct lockdep_map *lockdep_map); /* * NB: because we have to copy the lockdep_map, setting _key * here is required, otherwise it could get initialised to the @@ -401,6 +403,7 @@ enum wq_flags { * http://thread.gmane.org/gmane.linux.kernel/1480396 */ WQ_POWER_EFFICIENT =3D 1 << 7, + WQ_USER_OWNED_LOCKDEP =3D 1 << 8, /* allow users to define lockdep map */ =20 __WQ_DESTROYING =3D 1 << 15, /* internal: workqueue is destroying */ __WQ_DRAINING =3D 1 << 16, /* internal: workqueue is draining */ diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3fbaecfc88c2..228b52b8d7c4 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -366,7 +366,8 @@ struct workqueue_struct { #ifdef CONFIG_LOCKDEP char *lock_name; struct lock_class_key key; - struct lockdep_map lockdep_map; + struct lockdep_map __lockdep_map; + struct lockdep_map *lockdep_map; #endif char name[WQ_NAME_LEN]; /* I: workqueue name */ =20 @@ -3220,7 +3221,7 @@ __acquires(&pool->lock) lockdep_start_depth =3D lockdep_depth(current); /* see drain_dead_softirq_workfn() */ if (!bh_draining) - lock_map_acquire(&pwq->wq->lockdep_map); + lock_map_acquire(pwq->wq->lockdep_map); lock_map_acquire(&lockdep_map); /* * Strictly speaking we should mark the invariant state without holding @@ -3254,7 +3255,7 @@ __acquires(&pool->lock) pwq->stats[PWQ_STAT_COMPLETED]++; lock_map_release(&lockdep_map); if (!bh_draining) - lock_map_release(&pwq->wq->lockdep_map); + lock_map_release(pwq->wq->lockdep_map); =20 if (unlikely((worker->task && in_atomic()) || lockdep_depth(current) !=3D lockdep_start_depth || @@ -3892,8 +3893,8 @@ static void touch_wq_lockdep_map(struct workqueue_str= uct *wq) if (wq->flags & WQ_BH) local_bh_disable(); =20 - lock_map_acquire(&wq->lockdep_map); - lock_map_release(&wq->lockdep_map); + lock_map_acquire(wq->lockdep_map); + lock_map_release(wq->lockdep_map); =20 if (wq->flags & WQ_BH) local_bh_enable(); @@ -3927,7 +3928,8 @@ void __flush_workqueue(struct workqueue_struct *wq) struct wq_flusher this_flusher =3D { .list =3D LIST_HEAD_INIT(this_flusher.list), .flush_color =3D -1, - .done =3D COMPLETION_INITIALIZER_ONSTACK_MAP(this_flusher.done, wq->lock= dep_map), + .done =3D COMPLETION_INITIALIZER_ONSTACK_MAP(this_flusher.done, + (*wq->lockdep_map)), }; int next_color; =20 @@ -4778,26 +4780,54 @@ static int init_worker_pool(struct worker_pool *poo= l) } =20 #ifdef CONFIG_LOCKDEP +/** + * wq_init_user_lockdep_map - init user lockdep map for workqueue + * @wq: workqueue to init lockdep map for + * @lockdep_map: lockdep map to use for workqueue + * + * Initialize workqueue with a user defined lockdep map. WQ_USER_OWNED_LOC= KDEP + * must be set for workqueue. + */ +void wq_init_user_lockdep_map(struct workqueue_struct *wq, + struct lockdep_map *lockdep_map) +{ + if (WARN_ON_ONCE(!(wq->flags & WQ_USER_OWNED_LOCKDEP))) + return; + + wq->lockdep_map =3D lockdep_map; +} +EXPORT_SYMBOL_GPL(wq_init_user_lockdep_map); + static void wq_init_lockdep(struct workqueue_struct *wq) { char *lock_name; =20 + if (wq->flags & WQ_USER_OWNED_LOCKDEP) + return; + lockdep_register_key(&wq->key); lock_name =3D kasprintf(GFP_KERNEL, "%s%s", "(wq_completion)", wq->name); if (!lock_name) lock_name =3D wq->name; =20 wq->lock_name =3D lock_name; - lockdep_init_map(&wq->lockdep_map, lock_name, &wq->key, 0); + wq->lockdep_map =3D &wq->__lockdep_map; + lockdep_init_map(wq->lockdep_map, lock_name, &wq->key, 0); } =20 static void wq_unregister_lockdep(struct workqueue_struct *wq) { + if (wq->flags & WQ_USER_OWNED_LOCKDEP) + return; + lockdep_unregister_key(&wq->key); } =20 static void wq_free_lockdep(struct workqueue_struct *wq) { + if (wq->flags & WQ_USER_OWNED_LOCKDEP) + return; + if (wq->lock_name !=3D wq->name) kfree(wq->lock_name); } --=20 2.34.1 From nobody Sun Feb 8 02:55:49 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 8D72E18E056 for ; Tue, 30 Jul 2024 22:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722377820; cv=none; b=OKGFL9IRu5dpe2RSWqrb2/Q3BSUh5iOgcyAirPBEYMScAe6L3a5Bpoa18bJfFAxyPNkqkXzsaKnRO5Bge3UhpO6DLqTCkX/lb/Plimv3qSe9KcmU4rj543LbH0li099+Xc/f6c0HSSm+V6462aBwqv6RoZOC+YmuEvHHMoRXmfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722377820; c=relaxed/simple; bh=y++SgnKsOkD1w3+gC/PYkBw3ruX/r97HkH5EBfT9tg0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Jq4S3QoMDnWfeNyaabSghhrSONhoXeY07wIAZhUW17cCL7dBW7K5swr8Yl1LAWNOSa0Ai31wKob7QADcj1r/QMeecRHBwukDt8TKWFGftCosaSQeOVG9g6Grwfu+XrZ1iUecXXFMLTdUm8cCOyIjrUHgTSbSc0tg9goJXUfWn9c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Q5oVYFx4; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Q5oVYFx4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722377818; x=1753913818; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y++SgnKsOkD1w3+gC/PYkBw3ruX/r97HkH5EBfT9tg0=; b=Q5oVYFx40eX0INVpDgErz+D55kce3EwiCex/3igoY1TKmCBqZX4G0AUG 8ThFty61moYCu+6fJoXSXGyqOVdeJwi7vF+soAMW/9nOhQQ0G4csPtU11 67uvHrvTzuohuUV6c6Hj4JcOK9Fpl3AYcXXSQV2G+QUU7RlEAQYFPE+VT LAMxMXRErOA3jyQaTaLomYDP0OyunZpLp9KWLnl0QfJrJs8jTrb/u1l7a jjxCKi/N+nhYfJ9xiFy42/PWnHJaTh3XiZaVjyQsa3tNfsEwqF8XwVN9O L8t/xvvv/CgIvfhwOdEEZTUxHYM5twN4jTe+PjP1QZg0rYYnWjfht5uLe g==; X-CSE-ConnectionGUID: Wf1XxqusRCi1OIoBtnGyUg== X-CSE-MsgGUID: vUjyMCICT1Cadil6rIfKOw== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="24094128" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="24094128" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 15:16:55 -0700 X-CSE-ConnectionGUID: UyTdp70ORjW+jKpD1cQbHQ== X-CSE-MsgGUID: M+gAdEy3QNqg8wkpDRBsSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="58613344" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 15:16:56 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: tj@kernel.org, jiangshanlai@gmail.com, christian.koenig@amd.com, ltuikov89@gmail.com, daniel@ffwll.ch Subject: [RFC PATCH 2/3] drm/sched: Use drm sched lockdep map for submit_wq Date: Tue, 30 Jul 2024 15:17:41 -0700 Message-Id: <20240730221742.2248527-3-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730221742.2248527-1-matthew.brost@intel.com> References: <20240730221742.2248527-1-matthew.brost@intel.com> 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 Avoid leaking a lockdep map on each drm sched creation and destruction by using a single lockdep map for all drm sched allocated submit_wq. Cc: Luben Tuikov Cc: Christian K=C3=B6nig Signed-off-by: Matthew Brost --- drivers/gpu/drm/scheduler/sched_main.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index ab53ab486fe6..9849fd64aff9 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -87,6 +87,12 @@ #define CREATE_TRACE_POINTS #include "gpu_scheduler_trace.h" =20 +#ifdef CONFIG_LOCKDEP +static struct lockdep_map drm_sched_lockdep_map =3D { + .name =3D "drm_sched_lockdep_map" +}; +#endif + #define to_drm_sched_job(sched_job) \ container_of((sched_job), struct drm_sched_job, queue_node) =20 @@ -1272,9 +1278,13 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, sched->submit_wq =3D submit_wq; sched->own_submit_wq =3D false; } else { - sched->submit_wq =3D alloc_ordered_workqueue(name, 0); + sched->submit_wq =3D alloc_ordered_workqueue(name, WQ_USER_OWNED_LOCKDEP= ); if (!sched->submit_wq) return -ENOMEM; +#ifdef CONFIG_LOCKDEP + wq_init_user_lockdep_map(sched->submit_wq, + &drm_sched_lockdep_map); +#endif =20 sched->own_submit_wq =3D true; } --=20 2.34.1 From nobody Sun Feb 8 02:55:49 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 7D19A191484 for ; Tue, 30 Jul 2024 22:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722377821; cv=none; b=uPfMRzEm1cbTBHaq9l8ff+qr4RlG+vvcNYH+67Pv2/yHZeliH/b4zPLxcP9v5SE81tuOWtXI1e9fGMdsTXs2stEe50adDN955EEGlgP6pN0DdYqPsywMlcQP/6eS3/SY0nHd+y3yl2FokE3JNqsXBzzZt1XFLYY+f3bzhujsSx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722377821; c=relaxed/simple; bh=ND0M1O/b09cO9CGWjH0eDAueXMZa8J6c/uYozl9G1ZY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nUcezfCd1CwMA8LauStXWjFpqcdcjbNBzEMenVE8zb/HuBVDn9IhjM/BUwV7nsDG1DftY/hv2TgB4qojURY1sFDuHTEPYKVb5DFa1alkQ+f1Tp4A/07frkL1QQOElKYmQLAWYKZEKUMaMC4gfbn+ynnWAhVczRy+FK//lb4pnqU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Spv8JYtT; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Spv8JYtT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722377819; x=1753913819; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ND0M1O/b09cO9CGWjH0eDAueXMZa8J6c/uYozl9G1ZY=; b=Spv8JYtTdZ80OBXBdPUgD24xrdw3J6HNm+1sRxBkJEh8FCx41mAqneFw Mggfa2jREyOJ5+zN+HeV2hXirZt23XQa77+lxFkYuMSHT8BQp/ri7JvDH MkxW2zB/tQOzHCfco/iU2xg3/8B395FACH2tFZaqMCRe26C6BDSKII9ZB MdlR6BpkuHtA5BR+YiBcWxug/lte0tJGDFDWxa6YEV72qmtVtYCm5wOqR w1m3zaNxxlw0MFucz/FRaHcgpIFyp+RvqaW19SyNZ99JMp6Crz8c2vTnt YfrA/5AAKySkVKkcywV8H1qIw1IwVGO/IrAnA+fMhLwK1JyUNXL9lHaMz w==; X-CSE-ConnectionGUID: 5V26OP1uSUaL/74ZtI9fug== X-CSE-MsgGUID: FcpkaAsdSb+vZbG0x0x17Q== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="24094135" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="24094135" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 15:16:55 -0700 X-CSE-ConnectionGUID: 7WxHhnR9TaueAGKqB2JvwA== X-CSE-MsgGUID: pNpF4eF7S02MYcejiLF95Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="58613347" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 15:16:56 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: tj@kernel.org, jiangshanlai@gmail.com, christian.koenig@amd.com, ltuikov89@gmail.com, daniel@ffwll.ch Subject: [RFC PATCH 3/3] drm/xe: Drop GuC submit_wq pool Date: Tue, 30 Jul 2024 15:17:42 -0700 Message-Id: <20240730221742.2248527-4-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730221742.2248527-1-matthew.brost@intel.com> References: <20240730221742.2248527-1-matthew.brost@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that drm sched uses a single lockdep map for all submit_wq, drop the GuC submit_wq pool hack. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_guc_submit.c | 60 +----------------------------- drivers/gpu/drm/xe/xe_guc_types.h | 7 ---- 2 files changed, 1 insertion(+), 66 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc= _submit.c index 460808507947..882cef3a10dc 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -224,64 +224,11 @@ static bool exec_queue_killed_or_banned_or_wedged(str= uct xe_exec_queue *q) EXEC_QUEUE_STATE_BANNED)); } =20 -#ifdef CONFIG_PROVE_LOCKING -static int alloc_submit_wq(struct xe_guc *guc) -{ - int i; - - for (i =3D 0; i < NUM_SUBMIT_WQ; ++i) { - guc->submission_state.submit_wq_pool[i] =3D - alloc_ordered_workqueue("submit_wq", 0); - if (!guc->submission_state.submit_wq_pool[i]) - goto err_free; - } - - return 0; - -err_free: - while (i) - destroy_workqueue(guc->submission_state.submit_wq_pool[--i]); - - return -ENOMEM; -} - -static void free_submit_wq(struct xe_guc *guc) -{ - int i; - - for (i =3D 0; i < NUM_SUBMIT_WQ; ++i) - destroy_workqueue(guc->submission_state.submit_wq_pool[i]); -} - -static struct workqueue_struct *get_submit_wq(struct xe_guc *guc) -{ - int idx =3D guc->submission_state.submit_wq_idx++ % NUM_SUBMIT_WQ; - - return guc->submission_state.submit_wq_pool[idx]; -} -#else -static int alloc_submit_wq(struct xe_guc *guc) -{ - return 0; -} - -static void free_submit_wq(struct xe_guc *guc) -{ - -} - -static struct workqueue_struct *get_submit_wq(struct xe_guc *guc) -{ - return NULL; -} -#endif - static void guc_submit_fini(struct drm_device *drm, void *arg) { struct xe_guc *guc =3D arg; =20 xa_destroy(&guc->submission_state.exec_queue_lookup); - free_submit_wq(guc); } =20 static void guc_submit_wedged_fini(struct drm_device *drm, void *arg) @@ -337,10 +284,6 @@ int xe_guc_submit_init(struct xe_guc *guc, unsigned in= t num_ids) if (err) return err; =20 - err =3D alloc_submit_wq(guc); - if (err) - return err; - gt->exec_queue_ops =3D &guc_exec_queue_ops; =20 xa_init(&guc->submission_state.exec_queue_lookup); @@ -1445,8 +1388,7 @@ static int guc_exec_queue_init(struct xe_exec_queue *= q) timeout =3D (q->vm && xe_vm_in_lr_mode(q->vm)) ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(q->sched_props.job_timeout_ms); err =3D xe_sched_init(&ge->sched, &drm_sched_ops, &xe_sched_ops, - get_submit_wq(guc), - q->lrc[0]->ring.size / MAX_JOB_SIZE_BYTES, 64, + NULL, q->lrc[0]->ring.size / MAX_JOB_SIZE_BYTES, 64, timeout, guc_to_gt(guc)->ordered_wq, NULL, q->name, gt_to_xe(q->gt)->drm.dev); if (err) diff --git a/drivers/gpu/drm/xe/xe_guc_types.h b/drivers/gpu/drm/xe/xe_guc_= types.h index 546ac6350a31..585f5c274f09 100644 --- a/drivers/gpu/drm/xe/xe_guc_types.h +++ b/drivers/gpu/drm/xe/xe_guc_types.h @@ -72,13 +72,6 @@ struct xe_guc { atomic_t stopped; /** @submission_state.lock: protects submission state */ struct mutex lock; -#ifdef CONFIG_PROVE_LOCKING -#define NUM_SUBMIT_WQ 256 - /** @submission_state.submit_wq_pool: submission ordered workqueues pool= */ - struct workqueue_struct *submit_wq_pool[NUM_SUBMIT_WQ]; - /** @submission_state.submit_wq_idx: submission ordered workqueue index = */ - int submit_wq_idx; -#endif /** @submission_state.enabled: submission is enabled */ bool enabled; } submission_state; --=20 2.34.1