Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello, On Sat, May 24, 2014 at 01:05:00PM -0700, Greg Kroah-Hartman wrote: > Please feel free to break it up as asked for and I'll be glad to > consider it then. ack Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
On Sat, May 24, 2014 at 05:22:00PM +0200, Emil Goode wrote: > Hello Uwe and Greg, > > > You'd do a better deed if you picked up > > http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 > > Since there is nothing wrong with the last version of the patch in > the above thread, I feel strange about picking it up and just splitting > it into two patches. However it would be good to have it applied. > > I think the reason why the author didn't resend is that the object file > and data structure layout information in the changelog depend on the > changes to both .name and .dma_mask and by splitting the patch this > information would not apply to any one of the resulting two patches. > > Perhaps keeping this information in the changelog is a good reason for > applying the patch as it is? If you read the thread, I explained why I didn't want to take the patch as-is. Please feel free to break it up as asked for and I'll be glad to consider it then. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello Uwe and Greg,
> You'd do a better deed if you picked up
> http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995
Since there is nothing wrong with the last version of the patch in
the above thread, I feel strange about picking it up and just splitting
it into two patches. However it would be good to have it applied.
I think the reason why the author didn't resend is that the object file
and data structure layout information in the changelog depend on the
changes to both .name and .dma_mask and by splitting the patch this
information would not apply to any one of the resulting two patches.
Perhaps keeping this information in the changelog is a good reason for
applying the patch as it is?
(I have attached the patch in question)
Best regards,
Emil Goode
>From 66b72cb8eb71974903dd40ed67a34412faf818f0 Mon Sep 17 00:00:00 2001
From: Yann Droneaud
Date: Mon, 27 Jan 2014 11:05:52 +0100
Subject: [PATCH] driver core/platform: don't leak memory allocated for
dma_mask
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since commit 01dcc60a7cb8, platform_device_register_full() is
available to allocate and register a platform device.
If a dma_mask is provided as part of platform_device_info,
platform_device_register_full() allocate memory for a u64 using
kmalloc().
A comment in the code state that "[t]his memory isn't freed when the
device is put".
It's never a good thing to leak memory, but there's only very few
users of platform_device_info's dma_mask, and those are mostly
"static" devices that are not going to be plugged/unplugged often.
So memory leak is not really an issue, but allocating 8 bytes through
kmalloc() seems overkill.
And it's a pity to have to allocate 8 bytes for the dma_mask while up
to 7 bytes are wasted at the end of struct platform_object in the form
of padding after name field: unfortunately this padding is not used
when allocating the memory to hold the name.
To address theses issues, this patch adds dma_mask to platform_object
struct so that it is always allocated for all struct platform_device
allocated through platform_device_alloc() or platform_device_register_full().
And since it's within struct platform_object, dma_mask won't be leaked
anymore when struct platform_device got released. Storage for dma_mask
is added almost for free by removing the padding at the end of struct
platform_object.
Padding at the end of the structure is removed by making name a C99
flexible array member (eg. a zero sized array). To handle this change,
memory allocation is updated to take care of allocating an additional
byte for the NUL terminating character.
No more memory leak, no small allocation, no byte wasted and
a slight reduction in code size.
Built on Fedora 20, using GCC 4.8, for ARM, i386, x86_64 and PPC64
architectures, the size of the object file and the data structure layout
are updated as follow, produced with commands:
$ size drivers/base/platform.o
$ pahole drivers/base/platform.o \
--recursive \
--class_name device,pdev_archdata,platform_device,platform_object
--- size+pahole.next-20140124
+++ size+pahole.next-20140124+
@@ -1,5 +1,5 @@
textdata bss dec hex filename
- 5616 472 32612017e8 obj-arm/drivers/base/platform.o
+ 5572 472 32607617bc obj-arm/drivers/base/platform.o
struct device {
struct device *parent; /* 0 4 */
struct device_private *p;/* 4 4 */
@@ -77,15 +77,15 @@ struct platform_object {
/* XXX last struct has 4 bytes of padding */
/* --- cacheline 6 boundary (384 bytes) --- */
-char name[1]; /* 384 1 */
+u64dma_mask; /* 384 8 */
+char name[0]; /* 392 0 */
-/* size: 392, cachelines: 7, members: 2 */
-/* padding: 7 */
+/* size: 392, cachelines: 7, members: 3 */
/* paddings: 1, sum paddings: 4 */
/* last cacheline: 8 bytes */
};
textdata bss dec hex filename
- 6007 532 32657119ab obj-i386/drivers/base/platform.o
+ 5943 532 326507196b obj-i386/drivers/base/platform.o
struct device {
struct device *parent; /* 0 4 */
struct device_private *p;/* 4 4 */
@@ -161,14 +161,14 @@ struct platform_device {
struct platform_object {
struct platform_device pdev; /* 0 392 */
/* --- cacheline 6 boundary (384 bytes) was 8 bytes ago --- */
-char name[1]; /* 392 1 */
+u64dma_mask; /* 392 8 */
+
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello Uwe and Greg,
You'd do a better deed if you picked up
http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995
Since there is nothing wrong with the last version of the patch in
the above thread, I feel strange about picking it up and just splitting
it into two patches. However it would be good to have it applied.
I think the reason why the author didn't resend is that the object file
and data structure layout information in the changelog depend on the
changes to both .name and .dma_mask and by splitting the patch this
information would not apply to any one of the resulting two patches.
Perhaps keeping this information in the changelog is a good reason for
applying the patch as it is?
(I have attached the patch in question)
Best regards,
Emil Goode
From 66b72cb8eb71974903dd40ed67a34412faf818f0 Mon Sep 17 00:00:00 2001
From: Yann Droneaud ydrone...@opteya.com
Date: Mon, 27 Jan 2014 11:05:52 +0100
Subject: [PATCH] driver core/platform: don't leak memory allocated for
dma_mask
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since commit 01dcc60a7cb8, platform_device_register_full() is
available to allocate and register a platform device.
If a dma_mask is provided as part of platform_device_info,
platform_device_register_full() allocate memory for a u64 using
kmalloc().
A comment in the code state that [t]his memory isn't freed when the
device is put.
It's never a good thing to leak memory, but there's only very few
users of platform_device_info's dma_mask, and those are mostly
static devices that are not going to be plugged/unplugged often.
So memory leak is not really an issue, but allocating 8 bytes through
kmalloc() seems overkill.
And it's a pity to have to allocate 8 bytes for the dma_mask while up
to 7 bytes are wasted at the end of struct platform_object in the form
of padding after name field: unfortunately this padding is not used
when allocating the memory to hold the name.
To address theses issues, this patch adds dma_mask to platform_object
struct so that it is always allocated for all struct platform_device
allocated through platform_device_alloc() or platform_device_register_full().
And since it's within struct platform_object, dma_mask won't be leaked
anymore when struct platform_device got released. Storage for dma_mask
is added almost for free by removing the padding at the end of struct
platform_object.
Padding at the end of the structure is removed by making name a C99
flexible array member (eg. a zero sized array). To handle this change,
memory allocation is updated to take care of allocating an additional
byte for the NUL terminating character.
No more memory leak, no small allocation, no byte wasted and
a slight reduction in code size.
Built on Fedora 20, using GCC 4.8, for ARM, i386, x86_64 and PPC64
architectures, the size of the object file and the data structure layout
are updated as follow, produced with commands:
$ size drivers/base/platform.o
$ pahole drivers/base/platform.o \
--recursive \
--class_name device,pdev_archdata,platform_device,platform_object
--- size+pahole.next-20140124
+++ size+pahole.next-20140124+
@@ -1,5 +1,5 @@
textdata bss dec hex filename
- 5616 472 32612017e8 obj-arm/drivers/base/platform.o
+ 5572 472 32607617bc obj-arm/drivers/base/platform.o
struct device {
struct device *parent; /* 0 4 */
struct device_private *p;/* 4 4 */
@@ -77,15 +77,15 @@ struct platform_object {
/* XXX last struct has 4 bytes of padding */
/* --- cacheline 6 boundary (384 bytes) --- */
-char name[1]; /* 384 1 */
+u64dma_mask; /* 384 8 */
+char name[0]; /* 392 0 */
-/* size: 392, cachelines: 7, members: 2 */
-/* padding: 7 */
+/* size: 392, cachelines: 7, members: 3 */
/* paddings: 1, sum paddings: 4 */
/* last cacheline: 8 bytes */
};
textdata bss dec hex filename
- 6007 532 32657119ab obj-i386/drivers/base/platform.o
+ 5943 532 326507196b obj-i386/drivers/base/platform.o
struct device {
struct device *parent; /* 0 4 */
struct device_private *p;/* 4 4 */
@@ -161,14 +161,14 @@ struct platform_device {
struct platform_object {
struct platform_device pdev; /* 0 392 */
/* --- cacheline 6 boundary (384 bytes) was 8 bytes ago --- */
-char name[1]; /* 392 1 */
+u64dma_mask; /* 392
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
On Sat, May 24, 2014 at 05:22:00PM +0200, Emil Goode wrote: Hello Uwe and Greg, You'd do a better deed if you picked up http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 Since there is nothing wrong with the last version of the patch in the above thread, I feel strange about picking it up and just splitting it into two patches. However it would be good to have it applied. I think the reason why the author didn't resend is that the object file and data structure layout information in the changelog depend on the changes to both .name and .dma_mask and by splitting the patch this information would not apply to any one of the resulting two patches. Perhaps keeping this information in the changelog is a good reason for applying the patch as it is? If you read the thread, I explained why I didn't want to take the patch as-is. Please feel free to break it up as asked for and I'll be glad to consider it then. thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello, On Sat, May 24, 2014 at 01:05:00PM -0700, Greg Kroah-Hartman wrote: Please feel free to break it up as asked for and I'll be glad to consider it then. ack Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hi Uwe Le 22/05/2014 20:10, Uwe Kleine-König a écrit : [...] Today all imx machines should get their devices from an oftree, so the various functions to add devices started to bitrot. Moreover there is no reason to remove a device once it was successfully added. Note that platform_device_register_full has the same problem (i.e. pdev->dev.dma_mask isn't freed when the last reference to a device is dropped.) You'd do a better deed if you picked up http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 instead of fixing dead code. I would like to object that all imx machine should now boot from devicetree. mx31moboard is still used and still get its kernel updated. It has never booted from devicetree, and IIRC the "deal" when devicetree was enforced on ARM was that all previous boards where still supported and would not get removed. So please don't kick us out of the kernel so fast :) Thanks ! Philippe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hi Uwe Le 22/05/2014 20:10, Uwe Kleine-König a écrit : [...] Today all imx machines should get their devices from an oftree, so the various functions to add devices started to bitrot. Moreover there is no reason to remove a device once it was successfully added. Note that platform_device_register_full has the same problem (i.e. pdev-dev.dma_mask isn't freed when the last reference to a device is dropped.) You'd do a better deed if you picked up http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 instead of fixing dead code. I would like to object that all imx machine should now boot from devicetree. mx31moboard is still used and still get its kernel updated. It has never booted from devicetree, and IIRC the deal when devicetree was enforced on ARM was that all previous boards where still supported and would not get removed. So please don't kick us out of the kernel so fast :) Thanks ! Philippe -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
On Thu, May 22, 2014 at 07:51:19PM +0200, Emil Goode wrote: > We forgot to free pdev->dev.dma_mask on error after > having called the imx_alloc_mx3_camera function. > This patch introduces the imx_free_mx3_camera function > that adds the missing kfree call and is practical for > future usage with imx_alloc_mx3_camera(). > > Signed-off-by: Emil Goode Fantastic. Thanks for this. :) regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello Uwe, On Thu, May 22, 2014 at 08:10:24PM +0200, Uwe Kleine-König wrote: > Hello Emil, > > On Thu, May 22, 2014 at 07:51:19PM +0200, Emil Goode wrote: > > We forgot to free pdev->dev.dma_mask on error after > > having called the imx_alloc_mx3_camera function. > > This patch introduces the imx_free_mx3_camera function > > that adds the missing kfree call and is practical for > > future usage with imx_alloc_mx3_camera(). > > > > Signed-off-by: Emil Goode > > --- > > arch/arm/mach-imx/devices-imx31.h |2 ++ > > arch/arm/mach-imx/devices-imx35.h |2 ++ > > arch/arm/mach-imx/devices/devices-common.h|1 + > > arch/arm/mach-imx/devices/platform-ipu-core.c | 11 +-- > > arch/arm/mach-imx/mach-mx31_3ds.c |2 +- > > arch/arm/mach-imx/mach-mx31moboard.c |3 +-- > > arch/arm/mach-imx/mach-mx35_3ds.c |2 +- > > arch/arm/mach-imx/mach-pcm037.c |2 +- > > 8 files changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/arch/arm/mach-imx/devices-imx31.h > > b/arch/arm/mach-imx/devices-imx31.h > > index e8d1611..900d3b0 100644 > > --- a/arch/arm/mach-imx/devices-imx31.h > > +++ b/arch/arm/mach-imx/devices-imx31.h > > @@ -45,6 +45,8 @@ extern const struct imx_ipu_core_data imx31_ipu_core_data; > > imx_add_ipu_core(_ipu_core_data) > > #define imx31_alloc_mx3_camera(pdata) \ > > imx_alloc_mx3_camera(_ipu_core_data, pdata) > > +#define imx31_free_mx3_camera(pdev)\ > > + imx_free_mx3_camera(pdev) > I wouldn't make this a globally visible function. Today all imx machines > should get their devices from an oftree, so the various functions to add > devices started to bitrot. Moreover there is no reason to remove a > device once it was successfully added. Ok I see. In mx31_3ds_init_camera() there are two checks that could fail before the device is added though. > Note that platform_device_register_full has the same problem (i.e. > pdev->dev.dma_mask isn't freed when the last reference to a device is > dropped.) You'd do a better deed if you picked up > http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 > instead of fixing dead code. But feel free to choose yourself where you > want to patch. Thank you for the hint, I was about to leave this code alone and move on but couldn't resist one more patch :) Yes I realized that leaking dma_mask is a general problem, I will look into that thread, thanks. Best regards, Emil Goode -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello Emil, On Thu, May 22, 2014 at 07:51:19PM +0200, Emil Goode wrote: > We forgot to free pdev->dev.dma_mask on error after > having called the imx_alloc_mx3_camera function. > This patch introduces the imx_free_mx3_camera function > that adds the missing kfree call and is practical for > future usage with imx_alloc_mx3_camera(). > > Signed-off-by: Emil Goode > --- > arch/arm/mach-imx/devices-imx31.h |2 ++ > arch/arm/mach-imx/devices-imx35.h |2 ++ > arch/arm/mach-imx/devices/devices-common.h|1 + > arch/arm/mach-imx/devices/platform-ipu-core.c | 11 +-- > arch/arm/mach-imx/mach-mx31_3ds.c |2 +- > arch/arm/mach-imx/mach-mx31moboard.c |3 +-- > arch/arm/mach-imx/mach-mx35_3ds.c |2 +- > arch/arm/mach-imx/mach-pcm037.c |2 +- > 8 files changed, 18 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-imx/devices-imx31.h > b/arch/arm/mach-imx/devices-imx31.h > index e8d1611..900d3b0 100644 > --- a/arch/arm/mach-imx/devices-imx31.h > +++ b/arch/arm/mach-imx/devices-imx31.h > @@ -45,6 +45,8 @@ extern const struct imx_ipu_core_data imx31_ipu_core_data; > imx_add_ipu_core(_ipu_core_data) > #define imx31_alloc_mx3_camera(pdata)\ > imx_alloc_mx3_camera(_ipu_core_data, pdata) > +#define imx31_free_mx3_camera(pdev) \ > + imx_free_mx3_camera(pdev) I wouldn't make this a globally visible function. Today all imx machines should get their devices from an oftree, so the various functions to add devices started to bitrot. Moreover there is no reason to remove a device once it was successfully added. Note that platform_device_register_full has the same problem (i.e. pdev->dev.dma_mask isn't freed when the last reference to a device is dropped.) You'd do a better deed if you picked up http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 instead of fixing dead code. But feel free to choose yourself where you want to patch. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ARM: imx: introduce function imx_free_mx3_camera
We forgot to free pdev->dev.dma_mask on error after
having called the imx_alloc_mx3_camera function.
This patch introduces the imx_free_mx3_camera function
that adds the missing kfree call and is practical for
future usage with imx_alloc_mx3_camera().
Signed-off-by: Emil Goode
---
arch/arm/mach-imx/devices-imx31.h |2 ++
arch/arm/mach-imx/devices-imx35.h |2 ++
arch/arm/mach-imx/devices/devices-common.h|1 +
arch/arm/mach-imx/devices/platform-ipu-core.c | 11 +--
arch/arm/mach-imx/mach-mx31_3ds.c |2 +-
arch/arm/mach-imx/mach-mx31moboard.c |3 +--
arch/arm/mach-imx/mach-mx35_3ds.c |2 +-
arch/arm/mach-imx/mach-pcm037.c |2 +-
8 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-imx/devices-imx31.h
b/arch/arm/mach-imx/devices-imx31.h
index e8d1611..900d3b0 100644
--- a/arch/arm/mach-imx/devices-imx31.h
+++ b/arch/arm/mach-imx/devices-imx31.h
@@ -45,6 +45,8 @@ extern const struct imx_ipu_core_data imx31_ipu_core_data;
imx_add_ipu_core(_ipu_core_data)
#define imx31_alloc_mx3_camera(pdata) \
imx_alloc_mx3_camera(_ipu_core_data, pdata)
+#define imx31_free_mx3_camera(pdev)\
+ imx_free_mx3_camera(pdev)
#define imx31_add_mx3_sdc_fb(pdata)\
imx_add_mx3_sdc_fb(_ipu_core_data, pdata)
diff --git a/arch/arm/mach-imx/devices-imx35.h
b/arch/arm/mach-imx/devices-imx35.h
index 780d824..02d22e8 100644
--- a/arch/arm/mach-imx/devices-imx35.h
+++ b/arch/arm/mach-imx/devices-imx35.h
@@ -53,6 +53,8 @@ extern const struct imx_ipu_core_data imx35_ipu_core_data;
imx_add_ipu_core(_ipu_core_data)
#define imx35_alloc_mx3_camera(pdata) \
imx_alloc_mx3_camera(_ipu_core_data, pdata)
+#define imx35_free_mx3_camera(pdev)\
+ imx_free_mx3_camera(pdev)
#define imx35_add_mx3_sdc_fb(pdata)\
imx_add_mx3_sdc_fb(_ipu_core_data, pdata)
diff --git a/arch/arm/mach-imx/devices/devices-common.h
b/arch/arm/mach-imx/devices/devices-common.h
index 69bafc8..0b3ca11 100644
--- a/arch/arm/mach-imx/devices/devices-common.h
+++ b/arch/arm/mach-imx/devices/devices-common.h
@@ -185,6 +185,7 @@ struct imx_ipu_core_data {
};
struct platform_device *__init imx_add_ipu_core(
const struct imx_ipu_core_data *data);
+void imx_free_mx3_camera(struct platform_device *pdev);
struct platform_device *__init imx_alloc_mx3_camera(
const struct imx_ipu_core_data *data,
const struct mx3_camera_pdata *pdata);
diff --git a/arch/arm/mach-imx/devices/platform-ipu-core.c
b/arch/arm/mach-imx/devices/platform-ipu-core.c
index fc4dd7c..77424c4 100644
--- a/arch/arm/mach-imx/devices/platform-ipu-core.c
+++ b/arch/arm/mach-imx/devices/platform-ipu-core.c
@@ -58,6 +58,14 @@ struct platform_device *__init imx_add_ipu_core(
res, ARRAY_SIZE(res), NULL, 0);
}
+void imx_free_mx3_camera(struct platform_device *pdev)
+{
+ if (pdev)
+ kfree(pdev->dev.dma_mask);
+
+ platform_device_put(pdev);
+}
+
struct platform_device *__init imx_alloc_mx3_camera(
const struct imx_ipu_core_data *data,
const struct mx3_camera_pdata *pdata)
@@ -96,8 +104,7 @@ struct platform_device *__init imx_alloc_mx3_camera(
ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (ret) {
err:
- kfree(pdev->dev.dma_mask);
- platform_device_put(pdev);
+ imx_free_mx3_camera(pdev);
return ERR_PTR(-ENODEV);
}
copied_pdata = dev_get_platdata(>dev);
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c
b/arch/arm/mach-imx/mach-mx31_3ds.c
index 453f41a..f8e6158 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -203,7 +203,7 @@ static int __init mx31_3ds_init_camera(void)
ret = platform_device_add(pdev);
if (ret)
err:
- platform_device_put(pdev);
+ imx31_free_mx3_camera(pdev);
return ret;
}
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c
b/arch/arm/mach-imx/mach-mx31moboard.c
index 6bed570..25228e3 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -496,10 +496,9 @@ static int __init mx31moboard_init_cam(void)
ret = platform_device_add(pdev);
if (ret)
err:
- platform_device_put(pdev);
+ imx31_free_mx3_camera(pdev);
return ret;
-
}
static void mx31moboard_poweroff(void)
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c
b/arch/arm/mach-imx/mach-mx35_3ds.c
index 72cd77d..77b230e 100644
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -286,7 +286,7 @@ static int __init imx35_3ds_init_camera(void)
ret = platform_device_add(pdev);
if (ret)
err:
-
[PATCH] ARM: imx: introduce function imx_free_mx3_camera
We forgot to free pdev-dev.dma_mask on error after
having called the imx_alloc_mx3_camera function.
This patch introduces the imx_free_mx3_camera function
that adds the missing kfree call and is practical for
future usage with imx_alloc_mx3_camera().
Signed-off-by: Emil Goode emilgo...@gmail.com
---
arch/arm/mach-imx/devices-imx31.h |2 ++
arch/arm/mach-imx/devices-imx35.h |2 ++
arch/arm/mach-imx/devices/devices-common.h|1 +
arch/arm/mach-imx/devices/platform-ipu-core.c | 11 +--
arch/arm/mach-imx/mach-mx31_3ds.c |2 +-
arch/arm/mach-imx/mach-mx31moboard.c |3 +--
arch/arm/mach-imx/mach-mx35_3ds.c |2 +-
arch/arm/mach-imx/mach-pcm037.c |2 +-
8 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-imx/devices-imx31.h
b/arch/arm/mach-imx/devices-imx31.h
index e8d1611..900d3b0 100644
--- a/arch/arm/mach-imx/devices-imx31.h
+++ b/arch/arm/mach-imx/devices-imx31.h
@@ -45,6 +45,8 @@ extern const struct imx_ipu_core_data imx31_ipu_core_data;
imx_add_ipu_core(imx31_ipu_core_data)
#define imx31_alloc_mx3_camera(pdata) \
imx_alloc_mx3_camera(imx31_ipu_core_data, pdata)
+#define imx31_free_mx3_camera(pdev)\
+ imx_free_mx3_camera(pdev)
#define imx31_add_mx3_sdc_fb(pdata)\
imx_add_mx3_sdc_fb(imx31_ipu_core_data, pdata)
diff --git a/arch/arm/mach-imx/devices-imx35.h
b/arch/arm/mach-imx/devices-imx35.h
index 780d824..02d22e8 100644
--- a/arch/arm/mach-imx/devices-imx35.h
+++ b/arch/arm/mach-imx/devices-imx35.h
@@ -53,6 +53,8 @@ extern const struct imx_ipu_core_data imx35_ipu_core_data;
imx_add_ipu_core(imx35_ipu_core_data)
#define imx35_alloc_mx3_camera(pdata) \
imx_alloc_mx3_camera(imx35_ipu_core_data, pdata)
+#define imx35_free_mx3_camera(pdev)\
+ imx_free_mx3_camera(pdev)
#define imx35_add_mx3_sdc_fb(pdata)\
imx_add_mx3_sdc_fb(imx35_ipu_core_data, pdata)
diff --git a/arch/arm/mach-imx/devices/devices-common.h
b/arch/arm/mach-imx/devices/devices-common.h
index 69bafc8..0b3ca11 100644
--- a/arch/arm/mach-imx/devices/devices-common.h
+++ b/arch/arm/mach-imx/devices/devices-common.h
@@ -185,6 +185,7 @@ struct imx_ipu_core_data {
};
struct platform_device *__init imx_add_ipu_core(
const struct imx_ipu_core_data *data);
+void imx_free_mx3_camera(struct platform_device *pdev);
struct platform_device *__init imx_alloc_mx3_camera(
const struct imx_ipu_core_data *data,
const struct mx3_camera_pdata *pdata);
diff --git a/arch/arm/mach-imx/devices/platform-ipu-core.c
b/arch/arm/mach-imx/devices/platform-ipu-core.c
index fc4dd7c..77424c4 100644
--- a/arch/arm/mach-imx/devices/platform-ipu-core.c
+++ b/arch/arm/mach-imx/devices/platform-ipu-core.c
@@ -58,6 +58,14 @@ struct platform_device *__init imx_add_ipu_core(
res, ARRAY_SIZE(res), NULL, 0);
}
+void imx_free_mx3_camera(struct platform_device *pdev)
+{
+ if (pdev)
+ kfree(pdev-dev.dma_mask);
+
+ platform_device_put(pdev);
+}
+
struct platform_device *__init imx_alloc_mx3_camera(
const struct imx_ipu_core_data *data,
const struct mx3_camera_pdata *pdata)
@@ -96,8 +104,7 @@ struct platform_device *__init imx_alloc_mx3_camera(
ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (ret) {
err:
- kfree(pdev-dev.dma_mask);
- platform_device_put(pdev);
+ imx_free_mx3_camera(pdev);
return ERR_PTR(-ENODEV);
}
copied_pdata = dev_get_platdata(pdev-dev);
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c
b/arch/arm/mach-imx/mach-mx31_3ds.c
index 453f41a..f8e6158 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -203,7 +203,7 @@ static int __init mx31_3ds_init_camera(void)
ret = platform_device_add(pdev);
if (ret)
err:
- platform_device_put(pdev);
+ imx31_free_mx3_camera(pdev);
return ret;
}
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c
b/arch/arm/mach-imx/mach-mx31moboard.c
index 6bed570..25228e3 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -496,10 +496,9 @@ static int __init mx31moboard_init_cam(void)
ret = platform_device_add(pdev);
if (ret)
err:
- platform_device_put(pdev);
+ imx31_free_mx3_camera(pdev);
return ret;
-
}
static void mx31moboard_poweroff(void)
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c
b/arch/arm/mach-imx/mach-mx35_3ds.c
index 72cd77d..77b230e 100644
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -286,7 +286,7 @@ static int __init imx35_3ds_init_camera(void)
ret = platform_device_add(pdev);
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello Emil, On Thu, May 22, 2014 at 07:51:19PM +0200, Emil Goode wrote: We forgot to free pdev-dev.dma_mask on error after having called the imx_alloc_mx3_camera function. This patch introduces the imx_free_mx3_camera function that adds the missing kfree call and is practical for future usage with imx_alloc_mx3_camera(). Signed-off-by: Emil Goode emilgo...@gmail.com --- arch/arm/mach-imx/devices-imx31.h |2 ++ arch/arm/mach-imx/devices-imx35.h |2 ++ arch/arm/mach-imx/devices/devices-common.h|1 + arch/arm/mach-imx/devices/platform-ipu-core.c | 11 +-- arch/arm/mach-imx/mach-mx31_3ds.c |2 +- arch/arm/mach-imx/mach-mx31moboard.c |3 +-- arch/arm/mach-imx/mach-mx35_3ds.c |2 +- arch/arm/mach-imx/mach-pcm037.c |2 +- 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/devices-imx31.h b/arch/arm/mach-imx/devices-imx31.h index e8d1611..900d3b0 100644 --- a/arch/arm/mach-imx/devices-imx31.h +++ b/arch/arm/mach-imx/devices-imx31.h @@ -45,6 +45,8 @@ extern const struct imx_ipu_core_data imx31_ipu_core_data; imx_add_ipu_core(imx31_ipu_core_data) #define imx31_alloc_mx3_camera(pdata)\ imx_alloc_mx3_camera(imx31_ipu_core_data, pdata) +#define imx31_free_mx3_camera(pdev) \ + imx_free_mx3_camera(pdev) I wouldn't make this a globally visible function. Today all imx machines should get their devices from an oftree, so the various functions to add devices started to bitrot. Moreover there is no reason to remove a device once it was successfully added. Note that platform_device_register_full has the same problem (i.e. pdev-dev.dma_mask isn't freed when the last reference to a device is dropped.) You'd do a better deed if you picked up http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 instead of fixing dead code. But feel free to choose yourself where you want to patch. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
Hello Uwe, On Thu, May 22, 2014 at 08:10:24PM +0200, Uwe Kleine-König wrote: Hello Emil, On Thu, May 22, 2014 at 07:51:19PM +0200, Emil Goode wrote: We forgot to free pdev-dev.dma_mask on error after having called the imx_alloc_mx3_camera function. This patch introduces the imx_free_mx3_camera function that adds the missing kfree call and is practical for future usage with imx_alloc_mx3_camera(). Signed-off-by: Emil Goode emilgo...@gmail.com --- arch/arm/mach-imx/devices-imx31.h |2 ++ arch/arm/mach-imx/devices-imx35.h |2 ++ arch/arm/mach-imx/devices/devices-common.h|1 + arch/arm/mach-imx/devices/platform-ipu-core.c | 11 +-- arch/arm/mach-imx/mach-mx31_3ds.c |2 +- arch/arm/mach-imx/mach-mx31moboard.c |3 +-- arch/arm/mach-imx/mach-mx35_3ds.c |2 +- arch/arm/mach-imx/mach-pcm037.c |2 +- 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/devices-imx31.h b/arch/arm/mach-imx/devices-imx31.h index e8d1611..900d3b0 100644 --- a/arch/arm/mach-imx/devices-imx31.h +++ b/arch/arm/mach-imx/devices-imx31.h @@ -45,6 +45,8 @@ extern const struct imx_ipu_core_data imx31_ipu_core_data; imx_add_ipu_core(imx31_ipu_core_data) #define imx31_alloc_mx3_camera(pdata) \ imx_alloc_mx3_camera(imx31_ipu_core_data, pdata) +#define imx31_free_mx3_camera(pdev)\ + imx_free_mx3_camera(pdev) I wouldn't make this a globally visible function. Today all imx machines should get their devices from an oftree, so the various functions to add devices started to bitrot. Moreover there is no reason to remove a device once it was successfully added. Ok I see. In mx31_3ds_init_camera() there are two checks that could fail before the device is added though. Note that platform_device_register_full has the same problem (i.e. pdev-dev.dma_mask isn't freed when the last reference to a device is dropped.) You'd do a better deed if you picked up http://thread.gmane.org/gmane.linux.kernel/1613364/focus=1635995 instead of fixing dead code. But feel free to choose yourself where you want to patch. Thank you for the hint, I was about to leave this code alone and move on but couldn't resist one more patch :) Yes I realized that leaking dma_mask is a general problem, I will look into that thread, thanks. Best regards, Emil Goode -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ARM: imx: introduce function imx_free_mx3_camera
On Thu, May 22, 2014 at 07:51:19PM +0200, Emil Goode wrote: We forgot to free pdev-dev.dma_mask on error after having called the imx_alloc_mx3_camera function. This patch introduces the imx_free_mx3_camera function that adds the missing kfree call and is practical for future usage with imx_alloc_mx3_camera(). Signed-off-by: Emil Goode emilgo...@gmail.com Fantastic. Thanks for this. :) regards, dan carpenter -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
