* [PATCH v4 1/2] soc: fsl: dpio: Use scope-based resource management in dpaa2_io_store_create()
2026-09-24 7:15 [PATCH v4 0/2] soc: fsl: dpio: Use scope-based resource management in two functions Markus Elfring
@ 2026-09-24 7:17 ` Markus Elfring
2026-09-24 7:19 ` [PATCH v4 2/2] soc: fsl: dpio: Use scope-based resource management in dpaa2_io_create() Markus Elfring
1 sibling, 0 replies; 3+ messages in thread
From: Markus Elfring @ 2026-09-24 7:17 UTC (permalink / raw)
To: linuxppc-dev, linux-arm-kernel, Christophe Leroy, Dan Carpenter,
Ioana Ciornei, Roy Pledge
Cc: LKML, kernel-janitors, Peter Zijlstra
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 23 Sep 2026 15:48:11 +0200
Scope-based resource management became supported for some
programming interfaces by contributions of Peter Zijlstra on 2023-05-26.
See also the commit 54da6a0924311c7cf5015533991e44fb8eb12773 ("locking:
Introduce __cleanup() based infrastructure").
* Move some source code from the implementation of the function
“dpaa2_io_store_create” to a new function.
* Use the attribute “__free(kfree)” for the local variable “ret”.
* Omit two kfree() calls accordingly.
* Replace a return statement by the macro call “return_ptr(ret)”.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/soc/fsl/dpio/dpio-service.c | 49 +++++++++++++++--------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index 317ca50b0c2b..cb870aae30b4 100644
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -4,6 +4,7 @@
* Copyright 2016-2019 NXP
*
*/
+#include <linux/cleanup.h>
#include <linux/types.h>
#include <linux/fsl/mc.h>
#include <soc/fsl/dpaa2-io.h>
@@ -638,37 +639,20 @@ EXPORT_SYMBOL_GPL(dpaa2_io_service_acquire);
* assist with parsing those results.
*/
-/**
- * dpaa2_io_store_create() - Create the dma memory storage for dequeue result.
- * @max_frames: the maximum number of dequeued result for frames, must be <= 32.
- * @dev: the device to allow mapping/unmapping the DMAable region.
- *
- * The size of the storage is "max_frames*sizeof(struct dpaa2_dq)".
- * The 'dpaa2_io_store' returned is a DPIO service managed object.
- *
- * Return pointer to dpaa2_io_store struct for successfully created storage
- * memory, or NULL on error.
- */
-struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames,
- struct device *dev)
+static inline
+struct dpaa2_io_store *dpaa2_io_store_create_impl(unsigned int max_frames, struct device *dev)
{
- struct dpaa2_io_store *ret;
size_t size;
+ struct dpaa2_io_store *ret __free(kfree) = kmalloc_obj(*ret);
- if (!max_frames || (max_frames > 32))
- return NULL;
-
- ret = kmalloc_obj(*ret);
if (!ret)
return NULL;
ret->max = max_frames;
size = max_frames * sizeof(struct dpaa2_dq) + 64;
ret->alloced_addr = kzalloc(size, GFP_KERNEL);
- if (!ret->alloced_addr) {
- kfree(ret);
+ if (!ret->alloced_addr)
return NULL;
- }
ret->vaddr = PTR_ALIGN(ret->alloced_addr, 64);
ret->paddr = dma_map_single(dev, ret->vaddr,
@@ -676,14 +660,33 @@ struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames,
DMA_FROM_DEVICE);
if (dma_mapping_error(dev, ret->paddr)) {
kfree(ret->alloced_addr);
- kfree(ret);
return NULL;
}
ret->idx = 0;
ret->dev = dev;
- return ret;
+ return_ptr(ret);
+}
+
+/**
+ * dpaa2_io_store_create() - Create the dma memory storage for dequeue result.
+ * @max_frames: the maximum number of dequeued result for frames, must be <= 32.
+ * @dev: the device to allow mapping/unmapping the DMAable region.
+ *
+ * The size of the storage is "max_frames*sizeof(struct dpaa2_dq)".
+ * The 'dpaa2_io_store' returned is a DPIO service managed object.
+ *
+ * Return pointer to dpaa2_io_store struct for successfully created storage
+ * memory, or NULL on error.
+ */
+struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames,
+ struct device *dev)
+{
+ if (!max_frames || (max_frames > 32))
+ return NULL;
+
+ return dpaa2_io_store_create_impl(max_frames, dev);
}
EXPORT_SYMBOL_GPL(dpaa2_io_store_create);
--
2.55.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v4 2/2] soc: fsl: dpio: Use scope-based resource management in dpaa2_io_create()
2026-09-24 7:15 [PATCH v4 0/2] soc: fsl: dpio: Use scope-based resource management in two functions Markus Elfring
2026-09-24 7:17 ` [PATCH v4 1/2] soc: fsl: dpio: Use scope-based resource management in dpaa2_io_store_create() Markus Elfring
@ 2026-09-24 7:19 ` Markus Elfring
1 sibling, 0 replies; 3+ messages in thread
From: Markus Elfring @ 2026-09-24 7:19 UTC (permalink / raw)
To: linuxppc-dev, linux-arm-kernel, Christophe Leroy, Dan Carpenter,
Ioana Ciornei, Roy Pledge
Cc: LKML, kernel-janitors, Peter Zijlstra
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 24 Sep 2026 08:42:19 +0200
Scope-based resource management became supported for some
programming interfaces by contributions of Peter Zijlstra on 2023-05-26.
See also the commit 54da6a0924311c7cf5015533991e44fb8eb12773 ("locking:
Introduce __cleanup() based infrastructure").
* Move some source code from the implementation of the function
“dpaa2_io_create” to a new function.
* Use the attribute “__free(kfree)” for the local variable “obj”.
* Omit two kfree() calls accordingly.
* Replace a return statement by the macro call “return_ptr(obj)”.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/soc/fsl/dpio/dpio-service.c | 48 +++++++++++++++--------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index cb870aae30b4..8085c42c74ce 100644
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -121,31 +121,15 @@ static void dpaa2_io_dim_work(struct work_struct *w)
dim->state = DIM_START_MEASURE;
}
-/**
- * dpaa2_io_create() - create a dpaa2_io object.
- * @desc: the dpaa2_io descriptor
- * @dev: the actual DPIO device
- *
- * Activates a "struct dpaa2_io" corresponding to the given config of an actual
- * DPIO object.
- *
- * Return a valid dpaa2_io object for success, or NULL for failure.
- */
-struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
- struct device *dev)
+static inline
+struct dpaa2_io *dpaa2_io_create_impl(const struct dpaa2_io_desc *desc, struct device *dev)
{
- struct dpaa2_io *obj = kmalloc_obj(*obj);
u32 qman_256_cycles_per_ns;
+ struct dpaa2_io *obj __free(kfree) = kmalloc_obj(*obj);
if (!obj)
return NULL;
- /* check if CPU is out of range (-1 means any cpu) */
- if (desc->cpu != DPAA2_IO_ANY_CPU && desc->cpu >= num_possible_cpus()) {
- kfree(obj);
- return NULL;
- }
-
obj->dpio_desc = *desc;
obj->swp_desc.cena_bar = obj->dpio_desc.regs_cena;
obj->swp_desc.cinh_bar = obj->dpio_desc.regs_cinh;
@@ -160,10 +144,8 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
obj->swp_desc.qman_256_cycles_per_ns = qman_256_cycles_per_ns;
obj->swp = qbman_swp_init(&obj->swp_desc);
- if (!obj->swp) {
- kfree(obj);
+ if (!obj->swp)
return NULL;
- }
INIT_LIST_HEAD(&obj->node);
spin_lock_init(&obj->lock_mgmt_cmd);
@@ -192,7 +174,27 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
obj->bytes = 0;
obj->frames = 0;
- return obj;
+ return_ptr(obj);
+}
+
+/**
+ * dpaa2_io_create() - create a dpaa2_io object.
+ * @desc: the dpaa2_io descriptor
+ * @dev: the actual DPIO device
+ *
+ * Activates a "struct dpaa2_io" corresponding to the given config of an actual
+ * DPIO object.
+ *
+ * Return a valid dpaa2_io object for success, or NULL for failure.
+ */
+struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
+ struct device *dev)
+{
+ /* check if CPU is out of range (-1 means any cpu) */
+ if (desc->cpu != DPAA2_IO_ANY_CPU && desc->cpu >= num_possible_cpus())
+ return NULL;
+
+ return dpaa2_io_create_impl(desc, dev);
}
/**
--
2.55.0
^ permalink raw reply [flat|nested] 3+ messages in thread