forked from mirrors/linux
		
	The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
        kmalloc(a * b, gfp)
with:
        kmalloc_array(a * b, gfp)
as well as handling cases of:
        kmalloc(a * b * c, gfp)
with:
        kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
        kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
        kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
  kmalloc(
-	(sizeof(TYPE)) * E
+	sizeof(TYPE) * E
  , ...)
|
  kmalloc(
-	(sizeof(THING)) * E
+	sizeof(THING) * E
  , ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
  kmalloc(
-	sizeof(u8) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(__u8) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(char) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(unsigned char) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(u8) * COUNT
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(__u8) * COUNT
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(char) * COUNT
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(unsigned char) * COUNT
+	COUNT
  , ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * (COUNT_ID)
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * COUNT_ID
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * (COUNT_CONST)
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * COUNT_CONST
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * (COUNT_ID)
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * COUNT_ID
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * (COUNT_CONST)
+	COUNT_CONST, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * COUNT_CONST
+	COUNT_CONST, sizeof(THING)
  , ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
  (
-	SIZE * COUNT
+	COUNT, SIZE
  , ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
  kmalloc(
-	sizeof(TYPE) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(TYPE) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(TYPE) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(TYPE) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(THING) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kmalloc(
-	sizeof(THING) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kmalloc(
-	sizeof(THING) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kmalloc(
-	sizeof(THING) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
  kmalloc(
-	sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kmalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kmalloc(
-	sizeof(THING1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kmalloc(
-	sizeof(THING1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kmalloc(
-	sizeof(TYPE1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
|
  kmalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
  kmalloc(
-	(COUNT) * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	(COUNT) * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	(COUNT) * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	(COUNT) * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
  kmalloc(C1 * C2 * C3, ...)
|
  kmalloc(
-	(E1) * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kmalloc(
-	(E1) * (E2) * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kmalloc(
-	(E1) * (E2) * (E3)
+	array3_size(E1, E2, E3)
  , ...)
|
  kmalloc(
-	E1 * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
  kmalloc(sizeof(THING) * C2, ...)
|
  kmalloc(sizeof(TYPE) * C2, ...)
|
  kmalloc(C1 * C2 * C3, ...)
|
  kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * (E2)
+	E2, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * E2
+	E2, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * (E2)
+	E2, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * E2
+	E2, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	(E1) * E2
+	E1, E2
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	(E1) * (E2)
+	E1, E2
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	E1 * E2
+	E1, E2
  , ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
		
	
			
		
			
				
	
	
		
			138 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			138 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include <linux/module.h>
 | 
						|
#include <linux/moduleparam.h>
 | 
						|
#include <linux/interval_tree.h>
 | 
						|
#include <linux/random.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <asm/timex.h>
 | 
						|
 | 
						|
#define __param(type, name, init, msg)		\
 | 
						|
	static type name = init;		\
 | 
						|
	module_param(name, type, 0444);		\
 | 
						|
	MODULE_PARM_DESC(name, msg);
 | 
						|
 | 
						|
__param(int, nnodes, 100, "Number of nodes in the interval tree");
 | 
						|
__param(int, perf_loops, 1000, "Number of iterations modifying the tree");
 | 
						|
 | 
						|
__param(int, nsearches, 100, "Number of searches to the interval tree");
 | 
						|
__param(int, search_loops, 1000, "Number of iterations searching the tree");
 | 
						|
__param(bool, search_all, false, "Searches will iterate all nodes in the tree");
 | 
						|
 | 
						|
__param(uint, max_endpoint, ~0, "Largest value for the interval's endpoint");
 | 
						|
 | 
						|
static struct rb_root_cached root = RB_ROOT_CACHED;
 | 
						|
static struct interval_tree_node *nodes = NULL;
 | 
						|
static u32 *queries = NULL;
 | 
						|
 | 
						|
static struct rnd_state rnd;
 | 
						|
 | 
						|
static inline unsigned long
 | 
						|
search(struct rb_root_cached *root, unsigned long start, unsigned long last)
 | 
						|
{
 | 
						|
	struct interval_tree_node *node;
 | 
						|
	unsigned long results = 0;
 | 
						|
 | 
						|
	for (node = interval_tree_iter_first(root, start, last); node;
 | 
						|
	     node = interval_tree_iter_next(node, start, last))
 | 
						|
		results++;
 | 
						|
	return results;
 | 
						|
}
 | 
						|
 | 
						|
static void init(void)
 | 
						|
{
 | 
						|
	int i;
 | 
						|
 | 
						|
	for (i = 0; i < nnodes; i++) {
 | 
						|
		u32 b = (prandom_u32_state(&rnd) >> 4) % max_endpoint;
 | 
						|
		u32 a = (prandom_u32_state(&rnd) >> 4) % b;
 | 
						|
 | 
						|
		nodes[i].start = a;
 | 
						|
		nodes[i].last = b;
 | 
						|
	}
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Limit the search scope to what the user defined.
 | 
						|
	 * Otherwise we are merely measuring empty walks,
 | 
						|
	 * which is pointless.
 | 
						|
	 */
 | 
						|
	for (i = 0; i < nsearches; i++)
 | 
						|
		queries[i] = (prandom_u32_state(&rnd) >> 4) % max_endpoint;
 | 
						|
}
 | 
						|
 | 
						|
static int interval_tree_test_init(void)
 | 
						|
{
 | 
						|
	int i, j;
 | 
						|
	unsigned long results;
 | 
						|
	cycles_t time1, time2, time;
 | 
						|
 | 
						|
	nodes = kmalloc_array(nnodes, sizeof(struct interval_tree_node),
 | 
						|
			      GFP_KERNEL);
 | 
						|
	if (!nodes)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	queries = kmalloc_array(nsearches, sizeof(int), GFP_KERNEL);
 | 
						|
	if (!queries) {
 | 
						|
		kfree(nodes);
 | 
						|
		return -ENOMEM;
 | 
						|
	}
 | 
						|
 | 
						|
	printk(KERN_ALERT "interval tree insert/remove");
 | 
						|
 | 
						|
	prandom_seed_state(&rnd, 3141592653589793238ULL);
 | 
						|
	init();
 | 
						|
 | 
						|
	time1 = get_cycles();
 | 
						|
 | 
						|
	for (i = 0; i < perf_loops; i++) {
 | 
						|
		for (j = 0; j < nnodes; j++)
 | 
						|
			interval_tree_insert(nodes + j, &root);
 | 
						|
		for (j = 0; j < nnodes; j++)
 | 
						|
			interval_tree_remove(nodes + j, &root);
 | 
						|
	}
 | 
						|
 | 
						|
	time2 = get_cycles();
 | 
						|
	time = time2 - time1;
 | 
						|
 | 
						|
	time = div_u64(time, perf_loops);
 | 
						|
	printk(" -> %llu cycles\n", (unsigned long long)time);
 | 
						|
 | 
						|
	printk(KERN_ALERT "interval tree search");
 | 
						|
 | 
						|
	for (j = 0; j < nnodes; j++)
 | 
						|
		interval_tree_insert(nodes + j, &root);
 | 
						|
 | 
						|
	time1 = get_cycles();
 | 
						|
 | 
						|
	results = 0;
 | 
						|
	for (i = 0; i < search_loops; i++)
 | 
						|
		for (j = 0; j < nsearches; j++) {
 | 
						|
			unsigned long start = search_all ? 0 : queries[j];
 | 
						|
			unsigned long last = search_all ? max_endpoint : queries[j];
 | 
						|
 | 
						|
			results += search(&root, start, last);
 | 
						|
		}
 | 
						|
 | 
						|
	time2 = get_cycles();
 | 
						|
	time = time2 - time1;
 | 
						|
 | 
						|
	time = div_u64(time, search_loops);
 | 
						|
	results = div_u64(results, search_loops);
 | 
						|
	printk(" -> %llu cycles (%lu results)\n",
 | 
						|
	       (unsigned long long)time, results);
 | 
						|
 | 
						|
	kfree(queries);
 | 
						|
	kfree(nodes);
 | 
						|
 | 
						|
	return -EAGAIN; /* Fail will directly unload the module */
 | 
						|
}
 | 
						|
 | 
						|
static void interval_tree_test_exit(void)
 | 
						|
{
 | 
						|
	printk(KERN_ALERT "test exit\n");
 | 
						|
}
 | 
						|
 | 
						|
module_init(interval_tree_test_init)
 | 
						|
module_exit(interval_tree_test_exit)
 | 
						|
 | 
						|
MODULE_LICENSE("GPL");
 | 
						|
MODULE_AUTHOR("Michel Lespinasse");
 | 
						|
MODULE_DESCRIPTION("Interval Tree test");
 |