firmware_class: fix memory leak - free allocated pages
Subsystems (2)
PATCH v2 1/1 firmware_class: fix memory leak - free allocated pages
From: David Woodhouse <[email protected]>
fix memory leak introduced by the patch 6e03a201bbe:
firmware: speed up request_firmware()
1. vfree won't release pages there were allocated explicitly and mapped using vmap. The memory has to be vunmap-ed and the pages needs to be freed explicitly
2. page array is moved into the 'struct firmware' so that we can free it from release_firmware() and not only in fw_dev_release()
The fix doesn't break the firmware load speed.
---
V2: fix authorship of the patch
drivers/base/firmware_class.c | 28 ++++++++++++++++++++++------ include/linux/firmware.h | 1 + 2 files changed, 23 insertions(+), 6 deletions(-)
drivers/base/firmware_class.c +22 -6
@@ -130,6 +130,20 @@ static ssize_t firmware_loading_show(struct device *dev,return sprintf (buf,"%d\n" , loading); } +static void firmware_free_data (struct firmware *fw) +{ +int i; +vunmap (fw->data); + fw->data =NULL ; +if (fw->pages) { +for (i =0 ; i <PFN_UP (fw->size); i++) +__free_page (fw->pages[i]); +kfree (fw->pages); + } + fw->pages =NULL ; + fw->size =0 ; +} +/* Some architectures don't have PAGE_KERNEL_RO */ #ifndef PAGE_KERNEL_RO #define PAGE_KERNEL_RO PAGE_KERNEL
@@ -162,21 +176,20 @@ static ssize_t firmware_loading_store(struct device *dev,mutex_unlock (&fw_lock);break ; } -vfree (fw_priv->fw->data); - fw_priv->fw->data =NULL ; +firmware_free_data (fw_priv->fw); +/* If the pages are not owned by 'struct firmware' */ for (i =0 ; i < fw_priv->nr_pages; i++)__free_page (fw_priv->pages[i]);kfree (fw_priv->pages); fw_priv->pages =NULL ; fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ; - fw_priv->fw->size =0 ;set_bit (FW_STATUS_LOADING , &fw_priv->status);mutex_unlock (&fw_lock);break ;case 0 :if (test_bit (FW_STATUS_LOADING , &fw_priv->status)) { -vfree (fw_priv->fw->data); +vunmap (fw_priv->fw->data); fw_priv->fw->data =vmap (fw_priv->pages, fw_priv->nr_pages,0 ,PAGE_KERNEL_RO );
@@ -184,7 +197,10 @@ static ssize_t firmware_loading_store(struct device *dev,dev_err (dev,"%s: vmap() failed\n" , __func__); goto err; } -/* Pages will be freed by vfree() */ +/* Pages are now owned by 'struct firmware' */ + fw_priv->fw->pages = fw_priv->pages; + fw_priv->pages =NULL ; + fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ;complete (&fw_priv->completion);
@@ -578,7 +594,7 @@ release_firmware(const struct firmware *fw)if (fw->data == builtin->data) goto free_fw; } -vfree (fw->data); +firmware_free_data (fw); free_fw:kfree (fw); }
include/linux/firmware.h +1 -0
@@ -12,6 +12,7 @@struct firmware {size_t size;const u8 *data; +struct page **pages; };struct device ;
Signature · 9 lines
1.6.6.1 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Quoted 10 lines · David Woodhouse
From: David Woodhouse <[email protected]>
fix memory leak introduced by the patch
6e03a201bbe:
firmware: speed uprequest_firmware()1. vfree won't release pages there were allocated explicitly and mapped using vmap. The memory has to be vunmap-ed and the pages needs to be freed explicitly
Quoted 5 lines
2. page array is moved into the 'struct firmware' so that we can free it from
release_firmware()and not only infw_dev_release()The fix doesn't break the firmware load speed.
But it does create a ton of compiler warnings due the const * change. I had to fix up the patch to get the firmware.c file to build cleanly, but that then causes a bunch of warnings all over the tree.
So can someone please fix the patch up properly so it doesn't have these problems and resend it to me?
thanks,
greg k-h
Quoted 121 lines
Cc Johannes Berg <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Ming Lei <[email protected]>Cc Catalin Marinas <[email protected]>Cc Kay Sievers <[email protected]>Signed-off-by David Woodhouse <[email protected]>Signed-off-by Tomas Winkler <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/base/firmware_class.c | 30 +++++++++++++++++++++++------- include/linux/firmware.h | 5 +++-- 2 files changed, 26 insertions(+), 9 deletions(-)drivers/base/firmware_class.c +23
-7@@ -130,6 +130,20 @@ static ssize_t firmware_loading_show(strreturn sprintf (buf,"%d\n" , loading); } +static void firmware_free_data (struct firmware *fw) +{ +int i; +vunmap (fw->data); + fw->data =NULL ; +if (fw->pages) { +for (i =0 ; i <PFN_UP (fw->size); i++) +__free_page (fw->pages[i]); +kfree (fw->pages); + } + fw->pages =NULL ; + fw->size =0 ; +} +/* Some architectures don't have PAGE_KERNEL_RO */ #ifndef PAGE_KERNEL_RO #define PAGE_KERNEL_RO PAGE_KERNEL@@ -162,21 +176,20 @@ static ssize_t firmware_loading_store(stmutex_unlock (&fw_lock);break ; } -vfree (fw_priv->fw->data); - fw_priv->fw->data =NULL ; +firmware_free_data (fw_priv->fw); +/* If the pages are not owned by 'struct firmware' */ for (i =0 ; i < fw_priv->nr_pages; i++)__free_page (fw_priv->pages[i]);kfree (fw_priv->pages); fw_priv->pages =NULL ; fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ; - fw_priv->fw->size =0 ;set_bit (FW_STATUS_LOADING , &fw_priv->status);mutex_unlock (&fw_lock);break ;case 0 :if (test_bit (FW_STATUS_LOADING , &fw_priv->status)) { -vfree (fw_priv->fw->data); +vunmap (fw_priv->fw->data); fw_priv->fw->data =vmap (fw_priv->pages, fw_priv->nr_pages,0 ,PAGE_KERNEL_RO );@@ -184,7 +197,10 @@ static ssize_t firmware_loading_store(stdev_err (dev,"%s: vmap() failed\n" , __func__); goto err; } -/* Pages will be freed by vfree() */ +/* Pages are now owned by 'struct firmware' */ + fw_priv->fw->pages = fw_priv->pages; + fw_priv->pages =NULL ; + fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ;complete (&fw_priv->completion);@@ -568,7 +584,7 @@ request_firmware(const struct firmware ** @fw: firmware resource to release **/ void -release_firmware (const struct firmware *fw) +release_firmware (struct firmware *fw) {struct builtin_fw *builtin;@@ -578,7 +594,7 @@ release_firmware(const struct firmware *if (fw->data == builtin->data) goto free_fw; } -vfree (fw->data); +firmware_free_data (fw); free_fw:kfree (fw); }include/linux/firmware.h +3
-2@@ -12,6 +12,7 @@struct firmware {size_t size;const u8 *data; +struct page **pages; };struct device ;@@ -42,7 +43,7 @@ int request_firmware_nowait( const char *name, struct device *device, gfp_t gfp, void *context, void (*cont)(const struct firmware *fw, void *context)); -void release_firmware (const struct firmware *fw); +void release_firmware (struct firmware *fw);#else static inline int request_firmware(const struct firmware **fw, const char *name,@@ -58,7 +59,7 @@ static inline int request_firmware_nowai return -EINVAL; } -static inline void release_firmware (const struct firmware *fw) +static inline void release_firmware (struct firmware *fw) { }#endif