* [PATCH 1/2] drm: Add DRM-managed alloc_workqueue() and alloc_ordered_workqueue()
2024-03-15 14:50 [PATCH 0/2] drm: Add DRM managed workqueues Jeffrey Hugo
@ 2024-03-15 14:50 ` Jeffrey Hugo
2024-03-15 20:51 ` kernel test robot
2024-03-15 14:50 ` [PATCH 2/2] accel/qaic: Use drmm_alloc_workqueue() Jeffrey Hugo
1 sibling, 1 reply; 4+ messages in thread
From: Jeffrey Hugo @ 2024-03-15 14:50 UTC (permalink / raw)
To: daniel, jiasheng, quic_carlv, quic_pkanojiy, stanislaw.gruszka,
jacek.lawrynowicz
Cc: linux-arm-msm, dri-devel, ogabbay, Daniel Vetter, Jeffrey Hugo
From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Add drmm_alloc_workqueue() and drmm_alloc_ordered_workqueue(), the helpers
that provide managed workqueue cleanup. The workqueue will be destroyed
with the final reference of the DRM device.
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[jhugo: fix API to return the alloc'd workqueue]
Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Reviewed-by: Carl Vanderlip <quic_carlv@quicinc.com>
Reviewed-by: Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
---
drivers/gpu/drm/drm_managed.c | 82 +++++++++++++++++++++++++++++++++++
include/drm/drm_managed.h | 8 ++++
2 files changed, 90 insertions(+)
diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c
index 7646f67bda4e..d5135a471ff2 100644
--- a/drivers/gpu/drm/drm_managed.c
+++ b/drivers/gpu/drm/drm_managed.c
@@ -310,3 +310,85 @@ void __drmm_mutex_release(struct drm_device *dev, void *res)
mutex_destroy(lock);
}
EXPORT_SYMBOL(__drmm_mutex_release);
+
+static void drmm_destroy_workqueue(struct drm_device *dev, void *res)
+{
+ struct workqueue_struct *wq = res;
+
+ destroy_workqueue(wq);
+}
+
+/**
+ * drmm_alloc_workqueue - &drm_device-managed alloc_workqueue()
+ * @dev: DRM device
+ * @wq: workqueue to be allocated
+ *
+ * Returns:
+ * Valid pointer on success, NULL on error.
+ *
+ * This is a &drm_device-managed version of alloc_workqueue().
+ * The initialized lock is automatically destroyed on the final
+ * drm_dev_put().
+ */
+struct workqueue_struct *drmm_alloc_workqueue(struct drm_device *dev,
+ const char *fmt, unsigned int flags,
+ int max_active, ...)
+{
+ struct workqueue_struct *wq;
+ va_list args;
+ int ret;
+
+ va_start(args, max_active);
+ wq = alloc_workqueue(fmt, flags, max_active, args);
+ va_end(args);
+
+ if (!wq)
+ return NULL;
+
+ ret = drmm_add_action_or_reset(dev, drmm_destroy_workqueue, wq);
+ if (ret) {
+ destroy_workqueue(wq);
+ return NULL;
+ }
+
+ return wq;
+}
+EXPORT_SYMBOL(drmm_alloc_workqueue);
+
+/**
+ * drmm_alloc_ordered_workqueue - &drm_device-managed
+ * alloc_ordered_workqueue()
+ * @dev: DRM device
+ * @wq: workqueue to be allocated
+ *
+ * Returns:
+ * Valid pointer on success, NULL on error.
+ *
+ * This is a &drm_device-managed version of alloc_ordered_workqueue().
+ * The initialized lock is automatically destroyed on the final
+ * drm_dev_put().
+ */
+struct workqueue_struct *drmm_alloc_ordered_workqueue(struct drm_device *dev,
+ const char *fmt,
+ unsigned int flags, ...)
+{
+ struct workqueue_struct *wq;
+ va_list args;
+ int ret;
+
+ va_start(args, flags);
+ wq = alloc_ordered_workqueue(fmt, flags, args);
+ va_end(args);
+
+ if (!wq)
+ return NULL;
+
+ ret = drmm_add_action_or_reset(dev, drmm_destroy_workqueue, wq);
+ if (ret) {
+ destroy_workqueue(wq);
+ return NULL;
+ }
+
+ return wq;
+}
+EXPORT_SYMBOL(drmm_alloc_ordered_workqueue);
diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h
index f547b09ca023..cb42fb252648 100644
--- a/include/drm/drm_managed.h
+++ b/include/drm/drm_managed.h
@@ -127,4 +127,12 @@ void __drmm_mutex_release(struct drm_device *dev, void *res);
drmm_add_action_or_reset(dev, __drmm_mutex_release, lock); \
}) \
+struct workqueue_struct *drmm_alloc_workqueue(struct drm_device *dev,
+ const char *fmt, unsigned int flags,
+ int max_active, ...);
+
+struct workqueue_struct *drmm_alloc_ordered_workqueue(struct drm_device *dev,
+ const char *fmt,
+ unsigned int flags, ...);
+
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] accel/qaic: Use drmm_alloc_workqueue()
2024-03-15 14:50 [PATCH 0/2] drm: Add DRM managed workqueues Jeffrey Hugo
2024-03-15 14:50 ` [PATCH 1/2] drm: Add DRM-managed alloc_workqueue() and alloc_ordered_workqueue() Jeffrey Hugo
@ 2024-03-15 14:50 ` Jeffrey Hugo
1 sibling, 0 replies; 4+ messages in thread
From: Jeffrey Hugo @ 2024-03-15 14:50 UTC (permalink / raw)
To: daniel, jiasheng, quic_carlv, quic_pkanojiy, stanislaw.gruszka,
jacek.lawrynowicz
Cc: linux-arm-msm, dri-devel, ogabbay, Jeffrey Hugo
Now that drmm_alloc_workqueue() exists, we can stop open coding our own
implementation.
Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Reviewed-by: Carl Vanderlip <quic_carlv@quicinc.com>
Reviewed-by: Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
---
drivers/accel/qaic/qaic_drv.c | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/drivers/accel/qaic/qaic_drv.c b/drivers/accel/qaic/qaic_drv.c
index f072edb74f22..9bc09b87a7e1 100644
--- a/drivers/accel/qaic/qaic_drv.c
+++ b/drivers/accel/qaic/qaic_drv.c
@@ -45,28 +45,6 @@ MODULE_PARM_DESC(datapath_polling, "Operate the datapath in polling mode");
static bool link_up;
static DEFINE_IDA(qaic_usrs);
-static void qaicm_wq_release(struct drm_device *dev, void *res)
-{
- struct workqueue_struct *wq = res;
-
- destroy_workqueue(wq);
-}
-
-static struct workqueue_struct *qaicm_wq_init(struct drm_device *dev, const char *fmt)
-{
- struct workqueue_struct *wq;
- int ret;
-
- wq = alloc_workqueue(fmt, WQ_UNBOUND, 0);
- if (!wq)
- return ERR_PTR(-ENOMEM);
- ret = drmm_add_action_or_reset(dev, qaicm_wq_release, wq);
- if (ret)
- return ERR_PTR(ret);
-
- return wq;
-}
-
static void qaicm_srcu_release(struct drm_device *dev, void *res)
{
struct srcu_struct *lock = res;
@@ -391,11 +369,11 @@ static struct qaic_device *create_qdev(struct pci_dev *pdev, const struct pci_de
if (ret)
return NULL;
- qdev->cntl_wq = qaicm_wq_init(drm, "qaic_cntl");
- if (IS_ERR(qdev->cntl_wq))
+ qdev->cntl_wq = drmm_alloc_workqueue(drm, "qaic_cntl", WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE);
+ if (!qdev->cntl_wq)
return NULL;
- qdev->qts_wq = qaicm_wq_init(drm, "qaic_ts");
- if (IS_ERR(qdev->qts_wq))
+ qdev->qts_wq = drmm_alloc_workqueue(drm, "qaic_ts", WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE);
+ if (!qdev->qts_wq)
return NULL;
ret = qaicm_srcu_init(drm, &qdev->dev_lock);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread