Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Use vmem_alloc() for nvlists 

Several of the nvlist functions may perform allocations larger than
the 32k warning threshold.  Convert them to use vmem_alloc() so the
best allocator is used.

Commit efcd79a retired KM_NODEBUG which was used to suppress large
allocation warnings.  Concurrently the large allocation warning threshold
was increased from 8k to 32k.  The goal was to identify the remaining
locations, such as this one, where the allocation can be larger than
32k.  This patch is expected fine tuning resulting for the kmem-rework
changes, see commit 6e9710f.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3057
Closes #3079
Closes #3081
This commit is contained in:
Brian Behlendorf 2015-02-05 12:43:37 -08:00
parent afe373260e
commit 77aef6f60e
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/nvpair/nvpair_alloc_spl.c
View File

@ -26,17 +26,18 @@
#include <sys/nvpair.h> #include <sys/nvpair.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/vmem.h>
static void * static void *
nv_alloc_sleep_spl(nv_alloc_t *nva, size_t size) nv_alloc_sleep_spl(nv_alloc_t *nva, size_t size)
{ {
return (kmem_alloc(size, KM_SLEEP)); return (vmem_alloc(size, KM_SLEEP));
} }
static void * static void *
nv_alloc_pushpage_spl(nv_alloc_t *nva, size_t size) nv_alloc_pushpage_spl(nv_alloc_t *nva, size_t size)
{ {
return (kmem_alloc(size, KM_PUSHPAGE)); return (vmem_alloc(size, KM_PUSHPAGE));
} }
static void * static void *

4
module/zfs/spa.c
View File

@ -1586,12 +1586,12 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value)
nvsize = *(uint64_t *)db->db_data; nvsize = *(uint64_t *)db->db_data;
dmu_buf_rele(db, FTAG); dmu_buf_rele(db, FTAG);
packed = kmem_alloc(nvsize, KM_SLEEP); packed = vmem_alloc(nvsize, KM_SLEEP);
error = dmu_read(spa->spa_meta_objset, obj, 0, nvsize, packed, error = dmu_read(spa->spa_meta_objset, obj, 0, nvsize, packed,
DMU_READ_PREFETCH); DMU_READ_PREFETCH);
if (error == 0) if (error == 0)
error = nvlist_unpack(packed, nvsize, value, 0); error = nvlist_unpack(packed, nvsize, value, 0);
kmem_free(packed, nvsize); vmem_free(packed, nvsize);
return (error); return (error);
} }

8
module/zfs/zfs_ioctl.c
View File

@ -1328,20 +1328,20 @@ get_nvlist(uint64_t nvl, uint64_t size, int iflag, nvlist_t **nvp)
if (size == 0) if (size == 0)
return (SET_ERROR(EINVAL)); return (SET_ERROR(EINVAL));
packed = kmem_alloc(size, KM_SLEEP); packed = vmem_alloc(size, KM_SLEEP);
if ((error = ddi_copyin((void *)(uintptr_t)nvl, packed, size, if ((error = ddi_copyin((void *)(uintptr_t)nvl, packed, size,
iflag)) != 0) { iflag)) != 0) {
kmem_free(packed, size); vmem_free(packed, size);
return (error); return (error);
} }
if ((error = nvlist_unpack(packed, size, &list, 0)) != 0) { if ((error = nvlist_unpack(packed, size, &list, 0)) != 0) {
kmem_free(packed, size); vmem_free(packed, size);
return (error); return (error);
} }
kmem_free(packed, size); vmem_free(packed, size);
*nvp = list; *nvp = list;
return (0); return (0);