Skip to content

Commit

Permalink
Use vmem_alloc() for nvlists
Browse files Browse the repository at this point in the history
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 <[email protected]>
Edited-by: DHE <[email protected]>
Closes openzfs#3057
Closes openzfs#3079
Closes openzfs#3081
  • Loading branch information
behlendorf authored and DeHackEd committed Apr 5, 2015
1 parent 23fafc2 commit 1392d65
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions module/nvpair/nvpair_alloc_spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
static void *
nv_alloc_sleep_spl(nv_alloc_t *nva, size_t size)
{
return (kmem_alloc(size, KM_SLEEP | KM_NODEBUG));
return (vmem_alloc(size, KM_SLEEP));
}

static void *
nv_alloc_pushpage_spl(nv_alloc_t *nva, size_t size)
{
return (kmem_alloc(size, KM_PUSHPAGE | KM_NODEBUG));
return (vmem_alloc(size, KM_PUSHPAGE));
}

static void *
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/spa.c
Original file line number Diff line number Diff line change
Expand Up @@ -1586,12 +1586,12 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value)
nvsize = *(uint64_t *)db->db_data;
dmu_buf_rele(db, FTAG);

packed = kmem_alloc(nvsize, KM_PUSHPAGE | KM_NODEBUG);
packed = vmem_alloc(nvsize, KM_SLEEP);
error = dmu_read(spa->spa_meta_objset, obj, 0, nvsize, packed,
DMU_READ_PREFETCH);
if (error == 0)
error = nvlist_unpack(packed, nvsize, value, 0);
kmem_free(packed, nvsize);
vmem_free(packed, nvsize);

return (error);
}
Expand Down
8 changes: 4 additions & 4 deletions module/zfs/zfs_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1328,20 +1328,20 @@ get_nvlist(uint64_t nvl, uint64_t size, int iflag, nvlist_t **nvp)
if (size == 0)
return (SET_ERROR(EINVAL));

packed = kmem_alloc(size, KM_SLEEP | KM_NODEBUG);
packed = vmem_alloc(size, KM_SLEEP);

if ((error = ddi_copyin((void *)(uintptr_t)nvl, packed, size,
iflag)) != 0) {
kmem_free(packed, size);
vmem_free(packed, size);
return (error);
}

if ((error = nvlist_unpack(packed, size, &list, 0)) != 0) {
kmem_free(packed, size);
vmem_free(packed, size);
return (error);
}

kmem_free(packed, size);
vmem_free(packed, size);

*nvp = list;
return (0);
Expand Down

0 comments on commit 1392d65

Please sign in to comment.