Commit 1391efa9 authored by Johannes Berg's avatar Johannes Berg Committed by Linus Torvalds
Browse files

gcov: use kvmalloc() 

Using vmalloc() in gcov is really quite wasteful, many of the objects
allocated are really small (e.g.  I've seen 24 bytes.) Use kvmalloc() to
automatically pick the better of kmalloc() or vmalloc() depending on the
size.

[johannes.berg@intel.com: fix clang-11+ build]
  Link: https://lkml.kernel.org/r/20210412214210.6e1ecca9cdc5.I24459763acf0591d5e6b31c7e3a59890d802f79c@changeid

Link: https://lkml.kernel.org/r/20210315235453.799e7a9d627d.I741d0db096c6f312910f7f1bcdfde0fda20801a4@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3180c44f

kernel/gcov/clang.c

+6 −6
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include <linux/printk.h>

#include <linux/ratelimit.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>

#include "gcov.h"



typedef void (*llvm_gcov_callback)(void);
@@ -333,8 +333,8 @@ void gcov_info_add(struct gcov_info *dst, struct gcov_info *src) 
static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn)

{

	size_t cv_size; /* counter values size */

	struct gcov_fn_info *fn_dup = kmemdup(fn, sizeof(*fn),

			GFP_KERNEL);

	struct gcov_fn_info *fn_dup = kmemdup(fn, sizeof(*fn), GFP_KERNEL);



	if (!fn_dup)

		return NULL;

	INIT_LIST_HEAD(&fn_dup->head);
@@ -344,7 +344,7 @@ static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn) 
		goto err_name;



	cv_size = fn->num_counters * sizeof(fn->counters[0]);

	fn_dup->counters = vmalloc(cv_size);

	fn_dup->counters = kvmalloc(cv_size, GFP_KERNEL);

	if (!fn_dup->counters)

		goto err_counters;

	memcpy(fn_dup->counters, fn->counters, cv_size);
@@ -368,7 +368,7 @@ static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn) 
	INIT_LIST_HEAD(&fn_dup->head);



	cv_size = fn->num_counters * sizeof(fn->counters[0]);

	fn_dup->counters = vmalloc(cv_size);

	fn_dup->counters = kvmalloc(cv_size, GFP_KERNEL);

	if (!fn_dup->counters) {

		kfree(fn_dup);

		return NULL;
@@ -439,7 +439,7 @@ void gcov_info_free(struct gcov_info *info) 
	struct gcov_fn_info *fn, *tmp;



	list_for_each_entry_safe(fn, tmp, &info->functions, head) {

		vfree(fn->counters);

		kvfree(fn->counters);

		list_del(&fn->head);

		kfree(fn);

	}

kernel/gcov/fs.c

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/slab.h>

#include <linux/mutex.h>

#include <linux/seq_file.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>

#include "gcov.h"



/**
@@ -116,7 +116,7 @@ static struct gcov_iterator *gcov_iter_new(struct gcov_info *info) 
	/* Dry-run to get the actual buffer size. */

	size = convert_to_gcda(NULL, info);



	iter = vmalloc(struct_size(iter, buffer, size));

	iter = kvmalloc(struct_size(iter, buffer, size), GFP_KERNEL);

	if (!iter)

		return NULL;
@@ -134,7 +134,7 @@ static struct gcov_iterator *gcov_iter_new(struct gcov_info *info) 
 */

static void gcov_iter_free(struct gcov_iterator *iter)

{

	vfree(iter);

	kvfree(iter);

}



/**

kernel/gcov/gcc_4_7.c

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>

#include "gcov.h"



#if (__GNUC__ >= 10)
@@ -309,7 +309,7 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info) 


			cv_size = sizeof(gcov_type) * sci_ptr->num;



			dci_ptr->values = vmalloc(cv_size);

			dci_ptr->values = kvmalloc(cv_size, GFP_KERNEL);



			if (!dci_ptr->values)

				goto err_free;
@@ -351,7 +351,7 @@ void gcov_info_free(struct gcov_info *info) 
		ci_ptr = info->functions[fi_idx]->ctrs;



		for (ct_idx = 0; ct_idx < active; ct_idx++, ci_ptr++)

			vfree(ci_ptr->values);

			kvfree(ci_ptr->values);



		kfree(info->functions[fi_idx]);

	}