On Tue, 08 Oct 2013 21:59:27 -0700 Joe Perches <[email protected]> wrote:
> I was a bit surprised to find there isn't a devm_kmalloc.
Yes, the unconditional memset is silly. Especially when the
function has a handy gfp_t and could be passed __GFP_ZERO.
The comment says "managed kzalloc/kfree for device drivers, no kmalloc,
always use kzalloc". There's no explanation for this - it looks like
some ideological thing.
--- a/drivers/base/devres.c~a
+++ a/drivers/base/devres.c
@@ -91,7 +91,8 @@ static __always_inline struct devres * a
if (unlikely(!dr))
return NULL;
- memset(dr, 0, tot_size);
+ if (gfp & __GFP_ZERO)
+ memset(dr, 0, tot_size);
INIT_LIST_HEAD(&dr->node.entry);
dr->node.release = release;
return dr;
@@ -770,7 +771,7 @@ static int devm_kzalloc_match(struct dev
* RETURNS:
* Pointer to allocated memory on success, NULL on failure.
*/
-void * devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
+static void *__devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
{
struct devres *dr;
@@ -783,8 +784,19 @@ void * devm_kzalloc(struct device *dev,
devres_add(dev, dr->data);
return dr->data;
}
+
+void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
+{
+ return __devm_kzalloc(dev, size, gfp | __GFP_ZERO);
+}
EXPORT_SYMBOL_GPL(devm_kzalloc);
+void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp)
+{
+ return __devm_kzalloc(dev, size, gfp);
+}
+EXPORT_SYMBOL_GPL(devm_kmalloc);
+
/**
* devm_kfree - Resource-managed kfree
* @dev: Device this memory belongs to
--- a/include/linux/device.h~a
+++ a/include/linux/device.h
@@ -602,8 +602,9 @@ extern void devres_close_group(struct de
extern void devres_remove_group(struct device *dev, void *id);
extern int devres_release_group(struct device *dev, void *id);
-/* managed kzalloc/kfree for device drivers, no kmalloc, always use kzalloc */
+/* managed kmalloc/kzalloc/kfree for device drivers */
extern void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp);
+extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
extern void devm_kfree(struct device *dev, void *p);
void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
