mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 11:19:32 +03:00
81eaf15107
The non-blocking allocation handlers in nvlist_alloc() would be mistakenly assigned if any flags other than KM_SLEEP were passed. This meant that nvlists allocated with KM_PUSHPUSH or other KM_* debug flags were effectively always using atomic allocations. While these failures were unlikely it could lead to assertions because KM_PUSHPAGE allocations in particular are guaranteed to succeed or block. They must never fail. Since the existing API does not allow us to pass allocation flags to the private allocators the cleanest thing to do is to add a KM_PUSHPAGE allocator. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes zfsonlinux/spl#249
96 lines
2.6 KiB
C
96 lines
2.6 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License, Version 1.0 only
|
|
* (the "License"). You may not use this file except in compliance
|
|
* with the License.
|
|
*
|
|
* You can obtain a copy of the license at * usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
|
* Use is subject to license terms.
|
|
*/
|
|
|
|
#include <sys/nvpair.h>
|
|
#include <sys/kmem.h>
|
|
|
|
static void *
|
|
nv_alloc_sleep_spl(nv_alloc_t *nva, size_t size)
|
|
{
|
|
return (kmem_alloc(size, KM_SLEEP | KM_NODEBUG));
|
|
}
|
|
|
|
static void *
|
|
nv_alloc_pushpage_spl(nv_alloc_t *nva, size_t size)
|
|
{
|
|
return (kmem_alloc(size, KM_PUSHPAGE | KM_NODEBUG));
|
|
}
|
|
|
|
static void *
|
|
nv_alloc_nosleep_spl(nv_alloc_t *nva, size_t size)
|
|
{
|
|
return (kmem_alloc(size, KM_NOSLEEP));
|
|
}
|
|
|
|
static void
|
|
nv_free_spl(nv_alloc_t *nva, void *buf, size_t size)
|
|
{
|
|
kmem_free(buf, size);
|
|
}
|
|
|
|
const nv_alloc_ops_t spl_sleep_ops_def = {
|
|
NULL, /* nv_ao_init() */
|
|
NULL, /* nv_ao_fini() */
|
|
nv_alloc_sleep_spl, /* nv_ao_alloc() */
|
|
nv_free_spl, /* nv_ao_free() */
|
|
NULL /* nv_ao_reset() */
|
|
};
|
|
|
|
const nv_alloc_ops_t spl_pushpage_ops_def = {
|
|
NULL, /* nv_ao_init() */
|
|
NULL, /* nv_ao_fini() */
|
|
nv_alloc_pushpage_spl, /* nv_ao_alloc() */
|
|
nv_free_spl, /* nv_ao_free() */
|
|
NULL /* nv_ao_reset() */
|
|
};
|
|
|
|
const nv_alloc_ops_t spl_nosleep_ops_def = {
|
|
NULL, /* nv_ao_init() */
|
|
NULL, /* nv_ao_fini() */
|
|
nv_alloc_nosleep_spl, /* nv_ao_alloc() */
|
|
nv_free_spl, /* nv_ao_free() */
|
|
NULL /* nv_ao_reset() */
|
|
};
|
|
|
|
nv_alloc_t nv_alloc_sleep_def = {
|
|
&spl_sleep_ops_def,
|
|
NULL
|
|
};
|
|
|
|
nv_alloc_t nv_alloc_pushpage_def = {
|
|
&spl_pushpage_ops_def,
|
|
NULL
|
|
};
|
|
|
|
nv_alloc_t nv_alloc_nosleep_def = {
|
|
&spl_nosleep_ops_def,
|
|
NULL
|
|
};
|
|
|
|
nv_alloc_t *nv_alloc_sleep = &nv_alloc_sleep_def;
|
|
nv_alloc_t *nv_alloc_pushpage = &nv_alloc_pushpage_def;
|
|
nv_alloc_t *nv_alloc_nosleep = &nv_alloc_nosleep_def;
|