From nobody Sun Jun 28 03:10:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 2D1A01AA3C3 for ; Wed, 31 Jul 2024 00:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385833; cv=none; b=nIYfEXjYoHltvia2o9oVRD6x16+1bZXPNHH+EwqcYv/c/jxiac0MfnVCt9fqLYMgafTKbBeW9wBpsTap/91lIzy33IUxsTeWkKkXyPPfUMzElV0waJKAttrytRRdHaHjUtTp8GU5FZ/KGomqmcz9Jn87SQ4TNBRtridVkbsdjMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385833; c=relaxed/simple; bh=g59QcdS841R2ElrGLaqTv8bw9mQqMYsEaa2rIjEi6K4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xn/CWdgRl5vLkpGG9yNKUSetUpr0QCWuwuiZ1jH+FkuO2O7cxIVE41wDjbLoN9/G9y7fvpq5i38R1QaBDhdBfsc3kpcWmBOrjkT3t4qn6jMkwsJF7GdX+WqtjK8JKFOdGsbXX9WlXI0YEy1eFFK6hVj3C6NGLSv4idJpBuhf21s= 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=Uiuwddvq; arc=none smtp.client-ip=192.198.163.13 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="Uiuwddvq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722385832; x=1753921832; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g59QcdS841R2ElrGLaqTv8bw9mQqMYsEaa2rIjEi6K4=; b=UiuwddvqLQ0dbqhzVSYNPDMOy29cEMJ/sE301lRRDx21SZvuWu85kOHN f8pcf5/md23Hm6wilEhpZTY3vfEgQaVjK455oCWiWRYIC0x21qB+Zbuwd aoCjsLIeJpWNHyrbTVgw+llPHh81Da9yVaMid0uI6SqwsT2dnVYWitpK6 2a+ZRIUY5ifBUL8ktO3yk0M4w3/KKDxa0ew7mAEKGALFw0lL8WrSxHnPy mJN+WdLPDrbnEZR4ZAl58sKkNNiEbi3ZcoXvB9Cy6E/AC9MCFSArVFyoL zhYnn9CqeX2KbN0u8H7xx+ZhvaU4mKfLet487s17oayKNuAc8/OQTcm6T A==; X-CSE-ConnectionGUID: FVROUE9fTMGEPJv0xKa2Wg== X-CSE-MsgGUID: zuM6We+YQteVJNZg0Cn4tQ== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="23156075" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="23156075" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -0700 X-CSE-ConnectionGUID: xjpDosHyThOcHkcd7ZCarw== X-CSE-MsgGUID: g+wMVQZpRgysvmnxiUlolQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="77781797" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:30 -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: [PATCH v2 1/5] workqueue: Split alloc_workqueue into internal function and lockdep init Date: Tue, 30 Jul 2024 17:31:15 -0700 Message-Id: <20240731003119.2422940-2-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240731003119.2422940-1-matthew.brost@intel.com> References: <20240731003119.2422940-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" Will help enable user-defined lockdep maps for workqueues. Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Matthew Brost --- kernel/workqueue.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3fbaecfc88c2..c9bdd6a23a2b 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5657,9 +5657,9 @@ static void wq_adjust_max_active(struct workqueue_str= uct *wq) } =20 __printf(1, 4) -struct workqueue_struct *alloc_workqueue(const char *fmt, - unsigned int flags, - int max_active, ...) +static struct workqueue_struct *__alloc_workqueue(const char *fmt, + unsigned int flags, + int max_active, ...) { va_list args; struct workqueue_struct *wq; @@ -5725,12 +5725,11 @@ struct workqueue_struct *alloc_workqueue(const char= *fmt, INIT_LIST_HEAD(&wq->flusher_overflow); INIT_LIST_HEAD(&wq->maydays); =20 - wq_init_lockdep(wq); INIT_LIST_HEAD(&wq->list); =20 if (flags & WQ_UNBOUND) { if (alloc_node_nr_active(wq->node_nr_active) < 0) - goto err_unreg_lockdep; + goto err_free_wq; } =20 if (alloc_and_link_pwqs(wq) < 0) @@ -5762,9 +5761,6 @@ struct workqueue_struct *alloc_workqueue(const char *= fmt, err_free_node_nr_active: if (wq->flags & WQ_UNBOUND) free_node_nr_active(wq->node_nr_active); -err_unreg_lockdep: - wq_unregister_lockdep(wq); - wq_free_lockdep(wq); err_free_wq: free_workqueue_attrs(wq->unbound_attrs); kfree(wq); @@ -5773,6 +5769,25 @@ struct workqueue_struct *alloc_workqueue(const char = *fmt, destroy_workqueue(wq); return NULL; } + +__printf(1, 4) +struct workqueue_struct *alloc_workqueue(const char *fmt, + unsigned int flags, + int max_active, ...) +{ + struct workqueue_struct *wq; + va_list args; + + va_start(args, max_active); + wq =3D __alloc_workqueue(fmt, flags, max_active, args); + va_end(args); + if (!wq) + return NULL; + + wq_init_lockdep(wq); + + return wq; +} EXPORT_SYMBOL_GPL(alloc_workqueue); =20 static bool pwq_busy(struct pool_workqueue *pwq) --=20 2.34.1 From nobody Sun Jun 28 03:10:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 3DDC04431 for ; Wed, 31 Jul 2024 00:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385834; cv=none; b=i4WOIvA6jsUdeIiR8lpu6cyM/vyHIF8pmPHZ+mPMHhCFmGwUa/mG1xxC4uG99LFMvXgc7ly/ptCahj1LrN7HFzpsl83pLyA4IGpy+n8dcsrUo8BC7Dupeb7UjNRv0y5+VSCk42uxZStrHnqSPC4vRLFNYQNFh2IW4DEa+cHbIP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385834; c=relaxed/simple; bh=9VB0D6qtSFvrmgUitG4lhcQZt2t0l9f3P97TzqnDp48=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FBVFMFCaKlJgm2BwtULI8xZrfjHsoXDhvqHmreG96qokjz91I59J3wF+2Wub6O6s9TfZoCzkCarIKB67zWjs83Bn8JCA4zkHMDiXojE4egqMU4J3yW8m6dFZwYN/us5VcqTJqgERtwZMm1FosTZQk4Y5ivAn/JCu+gWT0djqe0g= 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=TcKRlcs6; arc=none smtp.client-ip=192.198.163.13 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="TcKRlcs6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722385833; x=1753921833; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9VB0D6qtSFvrmgUitG4lhcQZt2t0l9f3P97TzqnDp48=; b=TcKRlcs6ssD0GsX2/AirsAYZnp8lyx/EWNmbxkTyTiQFy3Vcrr1g6d71 Vv4AKamw2iwLoSz9wIJ7tRtMOTIOQ0wKHg2utU6mYPDx9djpM+rSArLnz 4YZTfwKN+TDr/SLzWJjS1q/szR6dTe0hf779C8njnTuqToD+Wokw6FO97 y4BFkl9TD7EB6pqcyxGqg4i0YqB3DccvjGBKQE9plX/db+cvAVa/uQew/ 0XvfrXM8vhogCEhx4tUYZonHZ83RztXz2ha5VQNpZZEe99pBSHsKp2HfA ZWUY1b2gxKfzYLXIhwfEAWZ9EhUb+K5DYnVJHCGpL8srCPbdFe/M6hI6L g==; X-CSE-ConnectionGUID: CbMv86vkTtWmn/taEh8/UA== X-CSE-MsgGUID: kLppy/odR4u0A5U4Xqn9Mg== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="23156081" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="23156081" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -0700 X-CSE-ConnectionGUID: PcAjtUvuSueJEW9URfTEwQ== X-CSE-MsgGUID: zkV+Pj5MRvqcGWfBoTaUkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="77781798" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:30 -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: [PATCH v2 2/5] workqueue: Change workqueue lockdep map to pointer Date: Tue, 30 Jul 2024 17:31:16 -0700 Message-Id: <20240731003119.2422940-3-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240731003119.2422940-1-matthew.brost@intel.com> References: <20240731003119.2422940-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" Will help enable user-defined lockdep maps for workqueues. Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Matthew Brost --- kernel/workqueue.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index c9bdd6a23a2b..b3fa4d044f69 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,7 @@ 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->lo= ckdep_map)), }; int next_color; =20 @@ -4788,7 +4789,8 @@ static void wq_init_lockdep(struct workqueue_struct *= wq) 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) --=20 2.34.1 From nobody Sun Jun 28 03:10:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 B30494C80 for ; Wed, 31 Jul 2024 00:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385835; cv=none; b=a88wtivkwt3ZU5wjpVthRt8dWt/Y3BzMuF31ROoonSFkhmEiv61g/yEPBocveRI6z/+bMhcn+qlIRE4IJEhPKAS9IkRvckNanDMAJNx5wHpPPXbCrTu7fo5FTYFIGYKXQp+Ij7RoYs56pdJsLtZPArn8zhPjp4H0SGqfrq1cVyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385835; c=relaxed/simple; bh=6iC7cqHHEWf0XvOJNVvsLe4YM0JKB2yPfC3YrzQWYqU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N7CV4PWNvJXJwPMZm1SEb93sCOis1bsI3g6wFUe6Sy/jBydqMmujy1YCRHsqtL94rZUegT6DQkZJqy5zTukBS/lzN5NEWoPxGxcNwkdSepWrua9ykr/ELInjfvBpD9EoNTojoPcbE9UHdcMFNi0K2nudScOPNxuDoeQ1yAYTIUs= 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=Jdb3KJbv; arc=none smtp.client-ip=192.198.163.13 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="Jdb3KJbv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722385834; x=1753921834; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6iC7cqHHEWf0XvOJNVvsLe4YM0JKB2yPfC3YrzQWYqU=; b=Jdb3KJbvSViaFST+9wk0YJU7pKdFN9LM311h0GnCB6PmDVJivUxbI2DR JFQyMkrI+0E4JDIpAHyj866nQapp0vT+9TSOFVvB+xQWkiL4rDC/h6hij WmuGEyMwUv8K+zQ1N+j0wxe493hO8yVG9OZUvFO+JLhQpEVSwEFgEAL/f GPyvDQxLB/GvrB6+MIBrXe9YduqlWl6sJXKk4+zCUp+PqpqrdgT59OvpW lMPklXdwWU4V5AdQvTJvMvPCC1oSTF311Su8y/zCvN/jThdBBxSisn24S 0Gur054oAb6dCh7O47LZq1NOYeXfa7IHGvUmdwBWv5JSREkbDCxQmdht4 w==; X-CSE-ConnectionGUID: omd0BrHwQH6YsH0a8SZ7cQ== X-CSE-MsgGUID: owDuSsMoQtmymrQQ260puQ== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="23156087" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="23156087" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -0700 X-CSE-ConnectionGUID: U8SOASvxQPis1+P4kIkyhg== X-CSE-MsgGUID: Y++OagSdRQuU43mO7bkTyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="77781799" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -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: [PATCH v2 3/5] workqueue: Add interface for user-defined workqueue lockdep map Date: Tue, 30 Jul 2024 17:31:17 -0700 Message-Id: <20240731003119.2422940-4-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240731003119.2422940-1-matthew.brost@intel.com> References: <20240731003119.2422940-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 internal workqueue flag, __WQ_USER_OWNED_LOCKDEP, to indicate that the user will set up the workqueue lockdep map using the new function alloc_workqueue_lockdep_map. Also add helper macro alloc_ordered_workqueue_lockdep_map. v2: - Add alloc_workqueue_lockdep_map (Tejun) Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Matthew Brost --- include/linux/workqueue.h | 25 +++++++++++++++++++++++++ kernel/workqueue.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index d9968bfc8eac..1707870ef7c5 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -406,6 +406,7 @@ enum wq_flags { __WQ_DRAINING =3D 1 << 16, /* internal: workqueue is draining */ __WQ_ORDERED =3D 1 << 17, /* internal: workqueue is ordered */ __WQ_LEGACY =3D 1 << 18, /* internal: create*_workqueue() */ + __WQ_USER_OWNED_LOCKDEP =3D 1 << 19, /* internal: workqueue has user owne= d lockdep map */ =20 /* BH wq only allows the following flags */ __WQ_BH_ALLOWS =3D WQ_BH | WQ_HIGHPRI, @@ -507,6 +508,30 @@ void workqueue_softirq_dead(unsigned int cpu); __printf(1, 4) struct workqueue_struct * alloc_workqueue(const char *fmt, unsigned int flags, int max_active, ...); =20 +#ifdef CONFIG_LOCKDEP +/** + * alloc_workqueue_lockdep_map - allocate a workqueue with user-defined lo= ckdep_map + * @fmt: printf format for the name of the workqueue + * @flags: WQ_* flags + * @max_active: max in-flight work items, 0 for default + * @lockdep_map: user-defined lockdep_map + * @...: args for @fmt + * + * Same as alloc_workqueue but with the a user-defined lockdep_map. Useful= for + * workqueues created with the same purpose and to avoid leaking a lockdep= _map + * on each workqueue creation. + * + * RETURNS: + * Pointer to the allocated workqueue on success, %NULL on failure. + */ +__printf(1, 5) struct workqueue_struct * +alloc_workqueue_lockdep_map(const char *fmt, unsigned int flags, int max_a= ctive, + struct lockdep_map *lockdep_map, ...); + +#define alloc_ordered_workqueue_lockdep_map(fmt, flags, lockdep_map, args.= ..) \ + alloc_workqueue_lockdep_map(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, = lockdep_map, ##args) +#endif + /** * alloc_ordered_workqueue - allocate an ordered workqueue * @fmt: printf format for the name of the workqueue diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b3fa4d044f69..e1361dedbe06 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4795,11 +4795,17 @@ static void wq_init_lockdep(struct workqueue_struct= *wq) =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); } @@ -5792,6 +5798,28 @@ struct workqueue_struct *alloc_workqueue(const char = *fmt, } EXPORT_SYMBOL_GPL(alloc_workqueue); =20 +#ifdef CONFIG_LOCKDEP +__printf(1, 5) +struct workqueue_struct * +alloc_workqueue_lockdep_map(const char *fmt, unsigned int flags, + int max_active, struct lockdep_map *lockdep_map, ...) +{ + struct workqueue_struct *wq; + va_list args; + + va_start(args, lockdep_map); + wq =3D __alloc_workqueue(fmt, flags | __WQ_USER_OWNED_LOCKDEP, max_active= , args); + va_end(args); + if (!wq) + return NULL; + + wq->lockdep_map =3D lockdep_map; + + return wq; +} +EXPORT_SYMBOL_GPL(alloc_workqueue_lockdep_map); +#endif + static bool pwq_busy(struct pool_workqueue *pwq) { int i; --=20 2.34.1 From nobody Sun Jun 28 03:10:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 0C700523A for ; Wed, 31 Jul 2024 00:30:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385835; cv=none; b=NnEXmEO2cyX/2mcgCvb9Gw3MXhcUh05zmz1fxjexrg2ax3GsK3EQDi8Um/U3M72xkWohQmJOhfYxpX2zo8Izijmv+vOnWVNrNko1iEFBxcCnRYC9zAOyF5niF42nFy95t/QHRxNVjzSEZDd9pNJNz9zkwhUN9J34+kSGN4iWeA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385835; c=relaxed/simple; bh=ptiJFpcxcUokqaP9PdFq+FGJm+jDe2svhscYd8NXJ0M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hrM3i0XsKzozHm87XOtldsepvGpYgeDDZisi2GLFgSb5XQwO9RaeHDfnuKccr+/7OYjyc7IHBL+R1wM0XdPSKumQ0nmrlimkSVFc2JXedDoAWeBmGBiYpsYFyfHpeCrC0BBdPaJqHP78RPAI8253ZbIY4TvYy9sHd7jZA6d7ms4= 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=kSU3uVTS; arc=none smtp.client-ip=192.198.163.13 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="kSU3uVTS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722385834; x=1753921834; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ptiJFpcxcUokqaP9PdFq+FGJm+jDe2svhscYd8NXJ0M=; b=kSU3uVTS7cEAmx16NrLOx8oUXRNcRybYO0TjcAbUWsesPcbS069AWfQi Nfy46T+kEWNiLBegg1r8Q4Y9VHFiADcRw+6kE9KA3/SoqUgQ7IQJigI4i f3mDi251crEsoDsnzHjOPj/QixHOFDBRhcrMp7yoluMVwGSYz9JDl3Tj/ 9Y9N2wiqcbraIMdC4r3zqE3FwmopyICCNB7kTKN0bu8T1RCSI1kLXg490 AoUEK4lpwe+8XPIuFRXb+acctYY4NSvVkmIW5VoQjjQan+z57km09di24 t14kmz/IlbSJM2+4RXqnbnJp/nZ3V59rO9RdBfGe1smE+IFQB+z3gGJMW g==; X-CSE-ConnectionGUID: s+CtFGksSTiTtmEEY6hGAA== X-CSE-MsgGUID: 0tdvTzR0Ru2jNiixyVPSlw== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="23156093" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="23156093" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -0700 X-CSE-ConnectionGUID: iSfPjd5kQ5icKwrUydTiXg== X-CSE-MsgGUID: fB0Js/7+TwuoyWm2ZHUMug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="77781800" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -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: [PATCH v2 4/5] drm/sched: Use drm sched lockdep map for submit_wq Date: Tue, 30 Jul 2024 17:31:18 -0700 Message-Id: <20240731003119.2422940-5-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240731003119.2422940-1-matthew.brost@intel.com> References: <20240731003119.2422940-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. v2: - Use alloc_ordered_workqueue_lockdep_map (Tejun) Cc: Luben Tuikov Cc: Christian K=C3=B6nig Signed-off-by: Matthew Brost --- drivers/gpu/drm/scheduler/sched_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index ab53ab486fe6..cf79d348cb32 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,7 +1278,12 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, sched->submit_wq =3D submit_wq; sched->own_submit_wq =3D false; } else { +#ifdef CONFIG_LOCKDEP + sched->submit_wq =3D alloc_ordered_workqueue_lockdep_map(name, 0, + &drm_sched_lockdep_map); +#else sched->submit_wq =3D alloc_ordered_workqueue(name, 0); +#endif if (!sched->submit_wq) return -ENOMEM; =20 --=20 2.34.1 From nobody Sun Jun 28 03:10:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 DB3FE8BE0 for ; Wed, 31 Jul 2024 00:30:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385836; cv=none; b=WAZmXy8vdU+eEnPBlCEmV09kVgFVDt1UIk/U3jSKDSCFI5GZPCKtiyMz3B9IDd3VladelrA2Pfg4wNhlk7tbmBRd8sLXXD/mTf924cWzKogqVgSANx0MJI348Rpq0/gqSSubXjAm/Mnufktei/OHr89o6D7kmmuriSk2u8aHnRE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722385836; c=relaxed/simple; bh=ND0M1O/b09cO9CGWjH0eDAueXMZa8J6c/uYozl9G1ZY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RPvxtog8qRbN6rMuz/0bDzHdXkHVdJ/JpTKwSIrY04PgFnFzTGQjA7JPRgKz0IPGbPzT8U+VNegLTSxqfjgD75+V3C8ncEjQN+kGJ+4Y5ZjQZUf/uWC/m6s8QnYbOh5K/yrCURX6AAJiURRxskYcY47R75+GBW0XA35g9XpVbN8= 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=MhXV8rkt; arc=none smtp.client-ip=192.198.163.13 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="MhXV8rkt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722385835; x=1753921835; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ND0M1O/b09cO9CGWjH0eDAueXMZa8J6c/uYozl9G1ZY=; b=MhXV8rktYDHl2rMnVQyNQFG8rVQrTzrJpYlDH5etrMMM4+WMtJJkRr2o DFYreXskZET1PhZtSw0iTaz6XCW97Jphdfdzuf9abCEeBYvWjTcAtJnKT +g+1t5cWhNEcppFrKINNErpqiqe0O5gNxt3ka9TdVs7pi1q73oWLn/A4j Bkga8Y2aRMotBJoR+cwtDyVag24fNHPopUL0ScO2iYKJJ17YjlYbtdg/S w/rnEIYRU0XxoXPzLup451sxLsTAr2fpJzzJSwyxdFA9D1AFtmsXwbL4a VakUjvaVp3g3bW9BuhKAvi2sYTySMYuwp8D9ySEV53Jv5Te6OkRZFa0Gm Q==; X-CSE-ConnectionGUID: 8QFR4x+HSKSfPVXpkkpONQ== X-CSE-MsgGUID: UzD79jBGQPOu7qPg/6HyaQ== X-IronPort-AV: E=McAfee;i="6700,10204,11149"; a="23156099" X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="23156099" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -0700 X-CSE-ConnectionGUID: jsP8RgPXRo6BK5inw1iByA== X-CSE-MsgGUID: SKrLtFNsQsqF3bG5sjq9xw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,248,1716274800"; d="scan'208";a="77781801" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2024 17:30:31 -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: [PATCH v2 5/5] drm/xe: Drop GuC submit_wq pool Date: Tue, 30 Jul 2024 17:31:19 -0700 Message-Id: <20240731003119.2422940-6-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240731003119.2422940-1-matthew.brost@intel.com> References: <20240731003119.2422940-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