Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfea1d4e authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: tests: use random32 instead of home-brewed generator 



This is a clean-up patch which removes the own pseudo-random numbers generator
from the speed- and stress-tests and makes them use the 'random32()' generator
instead.

[dwmw2: Merge later fix for negative offsets]

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 3166df0d

drivers/mtd/tests/mtd_speedtest.c

+2 −14
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/random.h>



#define PRINT_PREF KERN_INFO "mtd_speedtest: "
@@ -47,25 +48,13 @@ static int ebcnt; 
static int pgcnt;

static int goodebcnt;

static struct timeval start, finish;

static unsigned long next = 1;



static inline unsigned int simple_rand(void)

{

	next = next * 1103515245 + 12345;

	return (unsigned int)((next / 65536) % 32768);

}



static inline void simple_srand(unsigned long seed)

{

	next = seed;

}



static void set_random_data(unsigned char *buf, size_t len)

{

	size_t i;



	for (i = 0; i < len; ++i)

		buf[i] = simple_rand();

		buf[i] = random32();

}



static int erase_eraseblock(int ebnum)
@@ -407,7 +396,6 @@ static int __init mtd_speedtest_init(void) 
		goto out;

	}



	simple_srand(1);

	set_random_data(iobuf, mtd->erasesize);



	err = scan_for_bad_eraseblocks();

drivers/mtd/tests/mtd_stresstest.c

+9 −30
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/vmalloc.h>

#include <linux/random.h>



#define PRINT_PREF KERN_INFO "mtd_stresstest: "
@@ -48,28 +49,13 @@ static int pgsize; 
static int bufsize;

static int ebcnt;

static int pgcnt;

static unsigned long next = 1;



static inline unsigned int simple_rand(void)

{

	next = next * 1103515245 + 12345;

	return (unsigned int)((next / 65536) % 32768);

}



static inline void simple_srand(unsigned long seed)

{

	next = seed;

}



static int rand_eb(void)

{

	int eb;

	unsigned int eb;



again:

	if (ebcnt < 32768)

		eb = simple_rand();

	else

		eb = (simple_rand() << 15) | simple_rand();

	eb = random32();

	/* Read or write up 2 eraseblocks at a time - hence 'ebcnt - 1' */

	eb %= (ebcnt - 1);

	if (bbt[eb])
@@ -79,24 +65,18 @@ static int rand_eb(void) 


static int rand_offs(void)

{

	int offs;

	unsigned int offs;



	if (bufsize < 32768)

		offs = simple_rand();

	else

		offs = (simple_rand() << 15) | simple_rand();

	offs = random32();

	offs %= bufsize;

	return offs;

}



static int rand_len(int offs)

{

	int len;

	unsigned int len;



	if (bufsize < 32768)

		len = simple_rand();

	else

		len = (simple_rand() << 15) | simple_rand();

	len = random32();

	len %= (bufsize - offs);

	return len;

}
@@ -211,7 +191,7 @@ static int do_write(void) 


static int do_operation(void)

{

	if (simple_rand() & 1)

	if (random32() & 1)

		return do_read();

	else

		return do_write();
@@ -302,9 +282,8 @@ static int __init mtd_stresstest_init(void) 
	}

	for (i = 0; i < ebcnt; i++)

		offsets[i] = mtd->erasesize;

	simple_srand(current->pid);

	for (i = 0; i < bufsize; i++)

		writebuf[i] = simple_rand();

		writebuf[i] = random32();



	err = scan_for_bad_eraseblocks();

	if (err)