Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-19 12:00:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcov: simplify buffer allocation

Browse Source 
Use just a single vmalloc() with struct_size() instead of a separate
kmalloc() for the iter struct.

Link: https://lkml.kernel.org/r/20210315235453.b6de4a92096e.Iac40a5166589cefbff8449e466bd1b38ea7a17af@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Berg 2021-05-06 18:04:48 -07:00 committed by Linus Torvalds
parent 7a1d55b987
commit 3180c44fe1
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/gcov/fs.c
View File

@ -97,9 +97,9 @@ __setup("gcov_persist=", gcov_persist_setup);
*/
struct gcov_iterator {
struct gcov_info *info;
void *buffer;
size_t size;
loff_t pos;
char buffer[];
};
/**
@ -111,25 +111,20 @@ struct gcov_iterator {
static struct gcov_iterator *gcov_iter_new(struct gcov_info *info)
{
struct gcov_iterator *iter;
size_t size;
iter = kzalloc(sizeof(struct gcov_iterator), GFP_KERNEL);
/* Dry-run to get the actual buffer size. */
size = convert_to_gcda(NULL, info);
iter = vmalloc(struct_size(iter, buffer, size));
if (!iter)
goto err_free;
return NULL;
iter->info = info;
/* Dry-run to get the actual buffer size. */
iter->size = convert_to_gcda(NULL, info);
iter->buffer = vmalloc(iter->size);
if (!iter->buffer)
goto err_free;
iter->size = size;
convert_to_gcda(iter->buffer, info);
return iter;
err_free:
kfree(iter);
return NULL;
}
@ -139,8 +134,7 @@ err_free:
*/
static void gcov_iter_free(struct gcov_iterator *iter)
{
vfree(iter->buffer);
kfree(iter);
vfree(iter);
}
/**