diff options
| author | Ubuntu <[email protected]> | 2016-10-28 20:56:38 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-11-02 10:34:19 -0700 |
| commit | 1b457bcbe502eb29333a34b0518c1dca0e2ee974 (patch) | |
| tree | 6f1bf489e55c479b950c896dd372d2247b408174 /module/splat | |
| parent | 7b25c48e6ec6aa55bd5fead2d57ade01bfb0777b (diff) | |
Fix vmem_size()
Add a minimal implementation of vmem_size() which accounts for the
virtual memory usage of the SPL's kmem cache. This functionality
is only useful on 32-bit systems with a small virtual address space.
The following assumptions are made:
1) The major SPL consumer of virtual memory is the kmem cache.
2) Memory allocated with vmem_alloc() is short lived and can be ignored.
3) Allow a 4MB floor as a generous pad given normal consumption.
4) The spl_kmem_cache_sem only contends with cache create/destroy.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/splat')
| -rw-r--r-- | module/splat/splat-kmem.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/module/splat/splat-kmem.c b/module/splat/splat-kmem.c index 288112278..102a76ea8 100644 --- a/module/splat/splat-kmem.c +++ b/module/splat/splat-kmem.c @@ -1131,9 +1131,15 @@ out: static int splat_kmem_test10(struct file *file, void *arg) { - uint64_t size, alloc, rc = 0; + uint64_t size, alloc, maxsize, limit, rc = 0; - for (size = 32; size <= 1024*1024; size *= 2) { +#if defined(CONFIG_64BIT) + maxsize = (1024 * 1024); +#else + maxsize = (128 * 1024); +#endif + + for (size = 32; size <= maxsize; size *= 2) { splat_vprint(file, SPLAT_KMEM_TEST10_NAME, "%-22s %s", "name", "time (sec)\tslabs \tobjs \thash\n"); @@ -1142,8 +1148,10 @@ splat_kmem_test10(struct file *file, void *arg) for (alloc = 1; alloc <= 1024; alloc *= 2) { - /* Skip tests which exceed 1/2 of physical memory. */ - if (size * alloc * SPLAT_KMEM_THREADS > physmem / 2) + /* Skip tests which exceed 1/2 of memory. */ + limit = MIN(physmem * PAGE_SIZE, + vmem_size(NULL, VMEM_ALLOC | VMEM_FREE)) / 2; + if (size * alloc * SPLAT_KMEM_THREADS > limit) continue; rc = splat_kmem_cache_thread_test(file, arg, @@ -1223,7 +1231,8 @@ splat_kmem_test13(struct file *file, void *arg) int i, rc = 0, max_time = 10; size = 128 * 1024; - count = ((physmem * PAGE_SIZE) / 4 / size); + count = MIN(physmem * PAGE_SIZE, vmem_size(NULL, + VMEM_ALLOC | VMEM_FREE)) / 4 / size; kcp = splat_kmem_cache_test_kcp_alloc(file, SPLAT_KMEM_TEST13_NAME, size, 0, 0); |