X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=smalloc.c;h=409998aa8ad5a66ebbc8ac7d2fb620553ac75880;hp=e0bc49818e23c3aa1049662038b8562f0891d301;hb=d66672686baf3834f5135804f89c8e3f4aed0f79;hpb=cf98708da292cb9e77bb6aff4eda7652103f4f77

diff --git a/smalloc.c b/smalloc.c
index e0bc4981..409998aa 100644
--- a/smalloc.c
+++ b/smalloc.c
@@ -20,13 +20,14 @@
 #define SMALLOC_BPI	(sizeof(unsigned int) * 8)
 #define SMALLOC_BPL	(SMALLOC_BPB * SMALLOC_BPI)
 
-#define INITIAL_SIZE	1024*1024	/* new pool size */
+#define INITIAL_SIZE	8192*1024	/* new pool size */
 #define MAX_POOLS	128		/* maximum number of pools to setup */
 
 #define SMALLOC_PRE_RED		0xdeadbeefU
 #define SMALLOC_POST_RED	0x5aa55aa5U
 
 unsigned int smalloc_pool_size = INITIAL_SIZE;
+const int int_mask = sizeof(int) - 1;
 
 struct pool {
 	struct fio_mutex *lock;			/* protects this pool */
@@ -195,7 +196,7 @@ static int add_pool(struct pool *pool, unsigned int alloc_size)
 	bitmap_blocks = alloc_size / SMALLOC_BPL;
 	alloc_size += bitmap_blocks * sizeof(unsigned int);
 	pool->mmap_size = alloc_size;
-	
+
 	pool->nr_blocks = bitmap_blocks;
 	pool->free_blocks = bitmap_blocks * SMALLOC_BPB;
 
@@ -270,7 +271,6 @@ void scleanup(void)
 #ifdef SMALLOC_REDZONE
 static void *postred_ptr(struct block_hdr *hdr)
 {
-	const int int_mask = sizeof(unsigned int) - 1;
 	unsigned long ptr;
 
 	ptr = (unsigned long) hdr + hdr->size - sizeof(unsigned int);
@@ -426,11 +426,12 @@ static void *smalloc_pool(struct pool *pool, unsigned int size)
 	void *ptr;
 
 	/*
-	 * Use twice the size for good luck, we may need to adjust
-	 * alignment.
+	 * Round to int alignment, so that the postred pointer will
+	 * be naturally aligned as well.
 	 */
 #ifdef SMALLOC_REDZONE
-	alloc_size += 2 * sizeof(unsigned int);
+	alloc_size += sizeof(unsigned int);
+	alloc_size = (alloc_size + int_mask) & ~int_mask;
 #endif
 
 	ptr = __smalloc_pool(pool, alloc_size);