projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crc/test: fix potential div by zero
[fio.git]
/
smalloc.c
diff --git
a/smalloc.c
b/smalloc.c
index 0a86c43b0f17d58a5aa69587f92eff1d4f39c279..5fe0b6f7e57d11cdade9f103d9e8ff9dd5cbf7c1 100644
(file)
--- a/
smalloc.c
+++ b/
smalloc.c
@@
-8,41
+8,44
@@
#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <assert.h>
#include <string.h>
#include <unistd.h>
+#include <inttypes.h>
#include <sys/types.h>
#include <limits.h>
#include <sys/types.h>
#include <limits.h>
+#include <fcntl.h>
#include "mutex.h"
#include "arch/arch.h"
#include "mutex.h"
#include "arch/arch.h"
+#include "os/os.h"
+#include "smalloc.h"
+#include "log.h"
-#define MP_SAFE /* define to make thread safe */
#define SMALLOC_REDZONE /* define to detect memory corruption */
#define SMALLOC_BPB 32 /* block size, bytes-per-bit in bitmap */
#define SMALLOC_BPI (sizeof(unsigned int) * 8)
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
#define SMALLOC_REDZONE /* define to detect memory corruption */
#define SMALLOC_BPB 32 /* block size, bytes-per-bit in bitmap */
#define SMALLOC_BPI (sizeof(unsigned int) * 8)
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
-#define INITIAL_SIZE
1024
*1024 /* new pool size */
-#define MAX_POOLS
4
/* maximum number of pools to setup */
+#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;
#define SMALLOC_PRE_RED 0xdeadbeefU
#define SMALLOC_POST_RED 0x5aa55aa5U
unsigned int smalloc_pool_size = INITIAL_SIZE;
+static const int int_mask = sizeof(int) - 1;
struct pool {
struct fio_mutex *lock; /* protects this pool */
void *map; /* map of blocks */
unsigned int *bitmap; /* blocks free/busy map */
struct pool {
struct fio_mutex *lock; /* protects this pool */
void *map; /* map of blocks */
unsigned int *bitmap; /* blocks free/busy map */
- unsigned int free_blocks; /* free blocks */
- unsigned int nr_blocks; /* total blocks */
- unsigned int next_non_full;
- int fd; /* memory backing fd */
- char file[PATH_MAX]; /* filename for fd */
- unsigned int mmap_size;
+ size_t free_blocks; /* free blocks */
+ size_t nr_blocks; /* total blocks */
+ size_t next_non_full;
+ size_t mmap_size;
};
struct block_hdr {
};
struct block_hdr {
-
unsigned in
t size;
+
size_
t size;
#ifdef SMALLOC_REDZONE
unsigned int prered;
#endif
#ifdef SMALLOC_REDZONE
unsigned int prered;
#endif
@@
-51,42
+54,36
@@
struct block_hdr {
static struct pool mp[MAX_POOLS];
static unsigned int nr_pools;
static unsigned int last_pool;
static struct pool mp[MAX_POOLS];
static unsigned int nr_pools;
static unsigned int last_pool;
-static struct fio_
mutex
*lock;
+static struct fio_
rwlock
*lock;
static inline void pool_lock(struct pool *pool)
{
static inline void pool_lock(struct pool *pool)
{
- if (pool->lock)
- fio_mutex_down(pool->lock);
+ fio_mutex_down(pool->lock);
}
static inline void pool_unlock(struct pool *pool)
{
}
static inline void pool_unlock(struct pool *pool)
{
- if (pool->lock)
- fio_mutex_up(pool->lock);
+ fio_mutex_up(pool->lock);
}
static inline void global_read_lock(void)
{
}
static inline void global_read_lock(void)
{
- if (lock)
- fio_mutex_down_read(lock);
+ fio_rwlock_read(lock);
}
static inline void global_read_unlock(void)
{
}
static inline void global_read_unlock(void)
{
- if (lock)
- fio_mutex_up_read(lock);
+ fio_rwlock_unlock(lock);
}
static inline void global_write_lock(void)
{
}
static inline void global_write_lock(void)
{
- if (lock)
- fio_mutex_down_write(lock);
+ fio_rwlock_write(lock);
}
static inline void global_write_unlock(void)
{
}
static inline void global_write_unlock(void)
{
- if (lock)
- fio_mutex_up_write(lock);
+ fio_rwlock_unlock(lock);
}
static inline int ptr_valid(struct pool *pool, void *ptr)
}
static inline int ptr_valid(struct pool *pool, void *ptr)
@@
-96,13
+93,13
@@
static inline int ptr_valid(struct pool *pool, void *ptr)
return (ptr >= pool->map) && (ptr < pool->map + pool_size);
}
return (ptr >= pool->map) && (ptr < pool->map + pool_size);
}
-static inline
unsigned int size_to_blocks(unsigned in
t size)
+static inline
size_t size_to_blocks(size_
t size)
{
return (size + SMALLOC_BPB - 1) / SMALLOC_BPB;
}
static int blocks_iter(struct pool *pool, unsigned int pool_idx,
{
return (size + SMALLOC_BPB - 1) / SMALLOC_BPB;
}
static int blocks_iter(struct pool *pool, unsigned int pool_idx,
- unsigned int idx,
unsigned in
t nr_blocks,
+ unsigned int idx,
size_
t nr_blocks,
int (*func)(unsigned int *map, unsigned int mask))
{
int (*func)(unsigned int *map, unsigned int mask))
{
@@
-157,19
+154,19
@@
static int mask_set(unsigned int *map, unsigned int mask)
}
static int blocks_free(struct pool *pool, unsigned int pool_idx,
}
static int blocks_free(struct pool *pool, unsigned int pool_idx,
- unsigned int idx,
unsigned in
t nr_blocks)
+ unsigned int idx,
size_
t nr_blocks)
{
return blocks_iter(pool, pool_idx, idx, nr_blocks, mask_cmp);
}
static void set_blocks(struct pool *pool, unsigned int pool_idx,
{
return blocks_iter(pool, pool_idx, idx, nr_blocks, mask_cmp);
}
static void set_blocks(struct pool *pool, unsigned int pool_idx,
- unsigned int idx,
unsigned in
t nr_blocks)
+ unsigned int idx,
size_
t nr_blocks)
{
blocks_iter(pool, pool_idx, idx, nr_blocks, mask_set);
}
static void clear_blocks(struct pool *pool, unsigned int pool_idx,
{
blocks_iter(pool, pool_idx, idx, nr_blocks, mask_set);
}
static void clear_blocks(struct pool *pool, unsigned int pool_idx,
- unsigned int idx,
unsigned in
t nr_blocks)
+ unsigned int idx,
size_
t nr_blocks)
{
blocks_iter(pool, pool_idx, idx, nr_blocks, mask_clear);
}
{
blocks_iter(pool, pool_idx, idx, nr_blocks, mask_clear);
}
@@
-177,19
+174,15
@@
static void clear_blocks(struct pool *pool, unsigned int pool_idx,
static int find_next_zero(int word, int start)
{
assert(word != -1U);
static int find_next_zero(int word, int start)
{
assert(word != -1U);
- word >>=
(start + 1)
;
- return ffz(word) + start
+ 1
;
+ word >>=
start
;
+ return ffz(word) + start;
}
static int add_pool(struct pool *pool, unsigned int alloc_size)
{
}
static int add_pool(struct pool *pool, unsigned int alloc_size)
{
+ int bitmap_blocks;
+ int mmap_flags;
void *ptr;
void *ptr;
- int fd, bitmap_blocks;
-
- strcpy(pool->file, "/tmp/.fio_smalloc.XXXXXX");
- fd = mkstemp(pool->file);
- if (fd < 0)
- goto out_close;
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
@@
-203,41
+196,35
@@
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;
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;
pool->nr_blocks = bitmap_blocks;
pool->free_blocks = bitmap_blocks * SMALLOC_BPB;
- if (ftruncate(fd, alloc_size) < 0)
- goto out_unlink;
+ mmap_flags = OS_MAP_ANON;
+#ifdef CONFIG_ESX
+ mmap_flags |= MAP_PRIVATE;
+#else
+ mmap_flags |= MAP_SHARED;
+#endif
+ ptr = mmap(NULL, alloc_size, PROT_READ|PROT_WRITE, mmap_flags, -1, 0);
- ptr = mmap(NULL, alloc_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
if (ptr == MAP_FAILED)
if (ptr == MAP_FAILED)
- goto out_
unlink
;
+ goto out_
fail
;
memset(ptr, 0, alloc_size);
pool->map = ptr;
pool->bitmap = (void *) ptr + (pool->nr_blocks * SMALLOC_BPL);
memset(ptr, 0, alloc_size);
pool->map = ptr;
pool->bitmap = (void *) ptr + (pool->nr_blocks * SMALLOC_BPL);
-#ifdef MP_SAFE
- pool->lock = fio_mutex_init(1);
+ pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
if (!pool->lock)
if (!pool->lock)
- goto out_unlink;
-#endif
-
- pool->fd = fd;
+ goto out_fail;
- global_write_lock();
nr_pools++;
nr_pools++;
- global_write_unlock();
return 0;
return 0;
-out_
unlink
:
-
fprintf(stderr,
"smalloc: failed adding pool\n");
+out_
fail
:
+
log_err(
"smalloc: failed adding pool\n");
if (pool->map)
munmap(pool->map, pool->mmap_size);
if (pool->map)
munmap(pool->map, pool->mmap_size);
- unlink(pool->file);
-out_close:
- if (fd >= 0)
- close(fd);
return 1;
}
return 1;
}
@@
-245,17
+232,17
@@
void sinit(void)
{
int ret;
{
int ret;
-#ifdef MP_SAFE
- lock = fio_mutex_rw_init();
-#endif
+ lock = fio_rwlock_init();
ret = add_pool(&mp[0], INITIAL_SIZE);
assert(!ret);
}
static void cleanup_pool(struct pool *pool)
{
ret = add_pool(&mp[0], INITIAL_SIZE);
assert(!ret);
}
static void cleanup_pool(struct pool *pool)
{
- unlink(pool->file);
- close(pool->fd);
+ /*
+ * This will also remove the temporary file we used as a backing
+ * store, it was already unlinked
+ */
munmap(pool->map, pool->mmap_size);
if (pool->lock)
munmap(pool->map, pool->mmap_size);
if (pool->lock)
@@
-270,13
+257,23
@@
void scleanup(void)
cleanup_pool(&mp[i]);
if (lock)
cleanup_pool(&mp[i]);
if (lock)
- fio_
mutex
_remove(lock);
+ fio_
rwlock
_remove(lock);
}
#ifdef SMALLOC_REDZONE
}
#ifdef SMALLOC_REDZONE
+static void *postred_ptr(struct block_hdr *hdr)
+{
+ uintptr_t ptr;
+
+ ptr = (uintptr_t) hdr + hdr->size - sizeof(unsigned int);
+ ptr = (ptr + int_mask) & ~int_mask;
+
+ return (void *) ptr;
+}
+
static void fill_redzone(struct block_hdr *hdr)
{
static void fill_redzone(struct block_hdr *hdr)
{
- unsigned int *postred =
(void *) hdr + hdr->size - sizeof(unsigned int
);
+ unsigned int *postred =
postred_ptr(hdr
);
hdr->prered = SMALLOC_PRE_RED;
*postred = SMALLOC_POST_RED;
hdr->prered = SMALLOC_PRE_RED;
*postred = SMALLOC_POST_RED;
@@
-284,17
+281,17
@@
static void fill_redzone(struct block_hdr *hdr)
static void sfree_check_redzone(struct block_hdr *hdr)
{
static void sfree_check_redzone(struct block_hdr *hdr)
{
- unsigned int *postred =
(void *) hdr + hdr->size - sizeof(unsigned int
);
+ unsigned int *postred =
postred_ptr(hdr
);
if (hdr->prered != SMALLOC_PRE_RED) {
if (hdr->prered != SMALLOC_PRE_RED) {
- fprintf(stderr, "smalloc pre redzone destroyed!\n");
-
fprintf(stderr, "
ptr=%p, prered=%x, expected %x\n",
+ log_err("smalloc pre redzone destroyed!\n"
+
"
ptr=%p, prered=%x, expected %x\n",
hdr, hdr->prered, SMALLOC_PRE_RED);
assert(0);
}
if (*postred != SMALLOC_POST_RED) {
hdr, hdr->prered, SMALLOC_PRE_RED);
assert(0);
}
if (*postred != SMALLOC_POST_RED) {
- fprintf(stderr, "smalloc post redzone destroyed!\n");
-
fprintf(stderr,
" ptr=%p, postred=%x, expected %x\n",
+ log_err("smalloc post redzone destroyed!\n"
+
" ptr=%p, postred=%x, expected %x\n",
hdr, *postred, SMALLOC_POST_RED);
assert(0);
}
hdr, *postred, SMALLOC_POST_RED);
assert(0);
}
@@
-360,9
+357,9
@@
void sfree(void *ptr)
sfree_pool(pool, ptr);
}
sfree_pool(pool, ptr);
}
-static void *__smalloc_pool(struct pool *pool,
unsigned in
t size)
+static void *__smalloc_pool(struct pool *pool,
size_
t size)
{
{
-
unsigned in
t nr_blocks;
+
size_
t nr_blocks;
unsigned int i;
unsigned int offset;
unsigned int last_idx;
unsigned int i;
unsigned int offset;
unsigned int last_idx;
@@
-415,13
+412,18
@@
fail:
return ret;
}
return ret;
}
-static void *smalloc_pool(struct pool *pool,
unsigned in
t size)
+static void *smalloc_pool(struct pool *pool,
size_
t size)
{
{
-
unsigned in
t alloc_size = size + sizeof(struct block_hdr);
+
size_
t alloc_size = size + sizeof(struct block_hdr);
void *ptr;
void *ptr;
+ /*
+ * Round to int alignment, so that the postred pointer will
+ * be naturally aligned as well.
+ */
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
+ alloc_size = (alloc_size + int_mask) & ~int_mask;
#endif
ptr = __smalloc_pool(pool, alloc_size);
#endif
ptr = __smalloc_pool(pool, alloc_size);
@@
-438,11
+440,14
@@
static void *smalloc_pool(struct pool *pool, unsigned int size)
return ptr;
}
return ptr;
}
-void *smalloc(
unsigned in
t size)
+void *smalloc(
size_
t size)
{
unsigned int i;
{
unsigned int i;
- global_read_lock();
+ if (size != (unsigned int) size)
+ return NULL;
+
+ global_write_lock();
i = last_pool;
do {
i = last_pool;
do {
@@
-451,7
+456,7
@@
void *smalloc(unsigned int size)
if (ptr) {
last_pool = i;
if (ptr) {
last_pool = i;
- global_
read
_unlock();
+ global_
write
_unlock();
return ptr;
}
}
return ptr;
}
}
@@
-464,15
+469,13
@@
void *smalloc(unsigned int size)
break;
else {
i = nr_pools;
break;
else {
i = nr_pools;
- global_read_unlock();
if (add_pool(&mp[nr_pools], size))
goto out;
if (add_pool(&mp[nr_pools], size))
goto out;
- global_read_lock();
}
} while (1);
}
} while (1);
- global_read_unlock();
out:
out:
+ global_write_unlock();
return NULL;
}
return NULL;
}