GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-17 03:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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_iterator {
struct gcov_info *info; struct gcov_info *info;
void *buffer;
size_t size; size_t size;
loff_t pos; loff_t pos;
char buffer[];
}; };
/** /**
@ -111,25 +111,20 @@ struct gcov_iterator {
static struct gcov_iterator *gcov_iter_new(struct gcov_info *info) static struct gcov_iterator *gcov_iter_new(struct gcov_info *info)
{ {
struct gcov_iterator *iter; 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) if (!iter)
goto err_free; return NULL;
iter->info = info; iter->info = info;
/* Dry-run to get the actual buffer size. */ iter->size = size;
iter->size = convert_to_gcda(NULL, info);
iter->buffer = vmalloc(iter->size);
if (!iter->buffer)
goto err_free;
convert_to_gcda(iter->buffer, info); convert_to_gcda(iter->buffer, info);
return iter; return iter;
err_free:
kfree(iter);
return NULL;
} }
@ -139,8 +134,7 @@ err_free:
*/ */
static void gcov_iter_free(struct gcov_iterator *iter) static void gcov_iter_free(struct gcov_iterator *iter)
{ {
vfree(iter->buffer); vfree(iter);
kfree(iter);
} }
/** /**