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

Fix kmem cstyle issues 

Address all cstyle issues in the kmem, vmem, and kmem_cache source
and headers.  This will done to make it easier to review subsequent
changes which will rework the kmem/vmem implementation.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2014-12-08 13:35:51 -05:00
parent e5b9b344c7
commit b34b95635a
6 changed files with 333 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/sys/kmem.h
View File

@ -1,4 +1,4 @@
/*****************************************************************************\ /*
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California. * Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@ -20,7 +20,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
\*****************************************************************************/ */
#ifndef _SPL_KMEM_H #ifndef _SPL_KMEM_H
#define _SPL_KMEM_H #define _SPL_KMEM_H
@ -66,7 +66,7 @@ kmalloc_nofail(size_t size, gfp_t flags)
ptr = kmalloc(size, flags); ptr = kmalloc(size, flags);
} while (ptr == NULL && (flags & __GFP_WAIT)); } while (ptr == NULL && (flags & __GFP_WAIT));
return ptr; return (ptr);
} }
static inline void * static inline void *
@ -78,7 +78,7 @@ kzalloc_nofail(size_t size, gfp_t flags)
ptr = kzalloc(size, flags); ptr = kzalloc(size, flags);
} while (ptr == NULL && (flags & __GFP_WAIT)); } while (ptr == NULL && (flags & __GFP_WAIT));
return ptr; return (ptr);
} }
static inline void * static inline void *
@ -90,7 +90,7 @@ kmalloc_node_nofail(size_t size, gfp_t flags, int node)
ptr = kmalloc_node(size, flags, node); ptr = kmalloc_node(size, flags, node);
} while (ptr == NULL && (flags & __GFP_WAIT)); } while (ptr == NULL && (flags & __GFP_WAIT));
return ptr; return (ptr);
} }
#ifdef DEBUG_KMEM #ifdef DEBUG_KMEM
@ -99,25 +99,19 @@ kmalloc_node_nofail(size_t size, gfp_t flags, int node)
* Memory accounting functions to be used only when DEBUG_KMEM is set. * Memory accounting functions to be used only when DEBUG_KMEM is set.
*/ */
#ifdef HAVE_ATOMIC64_T #ifdef HAVE_ATOMIC64_T
#define kmem_alloc_used_add(size) atomic64_add(size, &kmem_alloc_used) #define kmem_alloc_used_add(size) atomic64_add(size, &kmem_alloc_used)
#define kmem_alloc_used_sub(size) atomic64_sub(size, &kmem_alloc_used) #define kmem_alloc_used_sub(size) atomic64_sub(size, &kmem_alloc_used)
#define kmem_alloc_used_read() atomic64_read(&kmem_alloc_used) #define kmem_alloc_used_read() atomic64_read(&kmem_alloc_used)
#define kmem_alloc_used_set(size) atomic64_set(&kmem_alloc_used, size) #define kmem_alloc_used_set(size) atomic64_set(&kmem_alloc_used, size)
extern atomic64_t kmem_alloc_used; extern atomic64_t kmem_alloc_used;
extern unsigned long long kmem_alloc_max; extern unsigned long long kmem_alloc_max;
#else /* HAVE_ATOMIC64_T */ #else /* HAVE_ATOMIC64_T */
#define kmem_alloc_used_add(size) atomic_add(size, &kmem_alloc_used) #define kmem_alloc_used_add(size) atomic_add(size, &kmem_alloc_used)
#define kmem_alloc_used_sub(size) atomic_sub(size, &kmem_alloc_used) #define kmem_alloc_used_sub(size) atomic_sub(size, &kmem_alloc_used)
#define kmem_alloc_used_read() atomic_read(&kmem_alloc_used) #define kmem_alloc_used_read() atomic_read(&kmem_alloc_used)
#define kmem_alloc_used_set(size) atomic_set(&kmem_alloc_used, size) #define kmem_alloc_used_set(size) atomic_set(&kmem_alloc_used, size)
extern atomic_t kmem_alloc_used; extern atomic_t kmem_alloc_used;
extern unsigned long long kmem_alloc_max; extern unsigned long long kmem_alloc_max;
#endif /* HAVE_ATOMIC64_T */ #endif /* HAVE_ATOMIC64_T */
#ifdef DEBUG_KMEM_TRACKING #ifdef DEBUG_KMEM_TRACKING

13
include/sys/kmem_cache.h
View File

@ -1,4 +1,4 @@
/*****************************************************************************\ /*
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California. * Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@ -20,7 +20,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
\*****************************************************************************/ */
#ifndef _SPL_KMEM_CACHE_H #ifndef _SPL_KMEM_CACHE_H
#define _SPL_KMEM_CACHE_H #define _SPL_KMEM_CACHE_H
@ -33,7 +33,7 @@
* allocated from the physical or virtal memory address space. The virtual * allocated from the physical or virtal memory address space. The virtual
* slabs allow for good behavior when allocation large objects of identical * slabs allow for good behavior when allocation large objects of identical
* size. This slab implementation also supports both constructors and * size. This slab implementation also supports both constructors and
* destructions which the Linux slab does not. * destructors which the Linux slab does not.
*/ */
enum { enum {
KMC_BIT_NOTOUCH = 0, /* Don't update ages */ KMC_BIT_NOTOUCH = 0, /* Don't update ages */
@ -205,8 +205,8 @@ extern void spl_kmem_cache_free(spl_kmem_cache_t *skc, void *obj);
extern void spl_kmem_cache_reap_now(spl_kmem_cache_t *skc, int count); extern void spl_kmem_cache_reap_now(spl_kmem_cache_t *skc, int count);
extern void spl_kmem_reap(void); extern void spl_kmem_reap(void);
#define kmem_cache_create(name,size,align,ctor,dtor,rclm,priv,vmp,flags) \ #define kmem_cache_create(name, size, align, ctor, dtor, rclm, priv, vmp, fl) \
spl_kmem_cache_create(name,size,align,ctor,dtor,rclm,priv,vmp,flags) spl_kmem_cache_create(name, size, align, ctor, dtor, rclm, priv, vmp, fl)
#define kmem_cache_set_move(skc, move) spl_kmem_cache_set_move(skc, move) #define kmem_cache_set_move(skc, move) spl_kmem_cache_set_move(skc, move)
#define kmem_cache_destroy(skc) spl_kmem_cache_destroy(skc) #define kmem_cache_destroy(skc) spl_kmem_cache_destroy(skc)
#define kmem_cache_alloc(skc, flags) spl_kmem_cache_alloc(skc, flags) #define kmem_cache_alloc(skc, flags) spl_kmem_cache_alloc(skc, flags)
@ -214,7 +214,8 @@ extern void spl_kmem_reap(void);
#define kmem_cache_reap_now(skc) \ #define kmem_cache_reap_now(skc) \
spl_kmem_cache_reap_now(skc, skc->skc_reap) spl_kmem_cache_reap_now(skc, skc->skc_reap)
#define kmem_reap() spl_kmem_reap() #define kmem_reap() spl_kmem_reap()
#define kmem_virt(ptr) (((ptr) >= (void *)VMALLOC_START) && \ #define kmem_virt(ptr) \
(((ptr) >= (void *)VMALLOC_START) && \
((ptr) < (void *)VMALLOC_END)) ((ptr) < (void *)VMALLOC_END))
/* /*

8
include/sys/vmem.h
View File

@ -1,4 +1,4 @@
/*****************************************************************************\ /*
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California. * Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@ -20,7 +20,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
\*****************************************************************************/ */
#ifndef _SPL_VMEM_H #ifndef _SPL_VMEM_H
#define _SPL_VMEM_H #define _SPL_VMEM_H
@ -78,7 +78,7 @@ vmalloc_nofail(size_t size, gfp_t flags)
} }
} }
return ptr; return (ptr);
} }
static inline void * static inline void *
@ -90,7 +90,7 @@ vzalloc_nofail(size_t size, gfp_t flags)
if (ptr) if (ptr)
memset(ptr, 0, (size)); memset(ptr, 0, (size));
return ptr; return (ptr);
} }
#ifdef DEBUG_KMEM #ifdef DEBUG_KMEM

114
module/spl/spl-kmem-cache.c
View File

@ -1,4 +1,4 @@
/*****************************************************************************\ /*
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California. * Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@ -20,9 +20,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
***************************************************************************** */
* Solaris Porting Layer (SPL) Kmem Implementation.
\*****************************************************************************/
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/kmem_cache.h> #include <sys/kmem_cache.h>
@ -114,7 +112,7 @@ MODULE_PARM_DESC(spl_kmem_cache_kmem_limit,
* breaker for the SPL which contains particularly expensive * breaker for the SPL which contains particularly expensive
* initializers for mutex's, condition variables, etc. We also * initializers for mutex's, condition variables, etc. We also
* require a minimal level of cleanup for these data types unlike * require a minimal level of cleanup for these data types unlike
* many Linux data type which do need to be explicitly destroyed. * many Linux data types which do need to be explicitly destroyed.
* *
* 2) Virtual address space backed slab. Callers of the Solaris slab * 2) Virtual address space backed slab. Callers of the Solaris slab
* expect it to work well for both small are very large allocations. * expect it to work well for both small are very large allocations.
@ -135,7 +133,7 @@ MODULE_PARM_DESC(spl_kmem_cache_kmem_limit,
* *
* XXX: Improve the partial slab list by carefully maintaining a * XXX: Improve the partial slab list by carefully maintaining a
* strict ordering of fullest to emptiest slabs based on * strict ordering of fullest to emptiest slabs based on
* the slab reference count. This guarantees the when freeing * the slab reference count. This guarantees that when freeing
* slabs back to the system we need only linearly traverse the * slabs back to the system we need only linearly traverse the
* last N slabs in the list to discover all the freeable slabs. * last N slabs in the list to discover all the freeable slabs.
* *
@ -173,7 +171,7 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags)
/* Resulting allocated memory will be page aligned */ /* Resulting allocated memory will be page aligned */
ASSERT(IS_P2ALIGNED(ptr, PAGE_SIZE)); ASSERT(IS_P2ALIGNED(ptr, PAGE_SIZE));
return ptr; return (ptr);
} }
static void static void
@ -204,8 +202,8 @@ kv_free(spl_kmem_cache_t *skc, void *ptr, int size)
static inline uint32_t static inline uint32_t
spl_sks_size(spl_kmem_cache_t *skc) spl_sks_size(spl_kmem_cache_t *skc)
{ {
return P2ROUNDUP_TYPED(sizeof(spl_kmem_slab_t), return (P2ROUNDUP_TYPED(sizeof (spl_kmem_slab_t),
skc->skc_obj_align, uint32_t); skc->skc_obj_align, uint32_t));
} }
/* /*
@ -216,8 +214,8 @@ spl_obj_size(spl_kmem_cache_t *skc)
{ {
uint32_t align = skc->skc_obj_align; uint32_t align = skc->skc_obj_align;
return P2ROUNDUP_TYPED(skc->skc_obj_size, align, uint32_t) + return (P2ROUNDUP_TYPED(skc->skc_obj_size, align, uint32_t) +
P2ROUNDUP_TYPED(sizeof(spl_kmem_obj_t), align, uint32_t); P2ROUNDUP_TYPED(sizeof (spl_kmem_obj_t), align, uint32_t));
} }
/* /*
@ -226,8 +224,8 @@ spl_obj_size(spl_kmem_cache_t *skc)
static inline spl_kmem_obj_t * static inline spl_kmem_obj_t *
spl_sko_from_obj(spl_kmem_cache_t *skc, void *obj) spl_sko_from_obj(spl_kmem_cache_t *skc, void *obj)
{ {
return obj + P2ROUNDUP_TYPED(skc->skc_obj_size, return (obj + P2ROUNDUP_TYPED(skc->skc_obj_size,
skc->skc_obj_align, uint32_t); skc->skc_obj_align, uint32_t));
} }
/* /*
@ -237,7 +235,7 @@ spl_sko_from_obj(spl_kmem_cache_t *skc, void *obj)
static inline uint32_t static inline uint32_t
spl_offslab_size(spl_kmem_cache_t *skc) spl_offslab_size(spl_kmem_cache_t *skc)
{ {
return 1UL << (fls64(spl_obj_size(skc)) + 1); return (1UL << (fls64(spl_obj_size(skc)) + 1));
} }
/* /*
@ -320,8 +318,8 @@ spl_slab_alloc(spl_kmem_cache_t *skc, int flags)
out: out:
if (rc) { if (rc) {
if (skc->skc_flags & KMC_OFFSLAB) if (skc->skc_flags & KMC_OFFSLAB)
list_for_each_entry_safe(sko, n, &sks->sks_free_list, list_for_each_entry_safe(sko,
sko_list) n, &sks->sks_free_list, sko_list)
kv_free(skc, sko->sko_addr, offslab_size); kv_free(skc, sko->sko_addr, offslab_size);
kv_free(skc, base, skc->skc_slab_size); kv_free(skc, base, skc->skc_slab_size);
@ -363,7 +361,7 @@ spl_slab_free(spl_kmem_slab_t *sks,
} }
/* /*
* Traverses all the partial slabs attached to a cache and free those * Traverse all the partial slabs attached to a cache and free those
* which which are currently empty, and have not been touched for * which which are currently empty, and have not been touched for
* skc_delay seconds to avoid thrashing. The count argument is * skc_delay seconds to avoid thrashing. The count argument is
* passed to optionally cap the number of slabs reclaimed, a count * passed to optionally cap the number of slabs reclaimed, a count
@ -387,7 +385,8 @@ spl_slab_reclaim(spl_kmem_cache_t *skc, int count, int flag)
* however when flag is set the delay will not be used. * however when flag is set the delay will not be used.
*/ */
spin_lock(&skc->skc_lock); spin_lock(&skc->skc_lock);
list_for_each_entry_safe_reverse(sks,m,&skc->skc_partial_list,sks_list){ list_for_each_entry_safe_reverse(sks, m,
&skc->skc_partial_list, sks_list) {
/* /*
* All empty slabs are at the end of skc->skc_partial_list, * All empty slabs are at the end of skc->skc_partial_list,
* therefore once a non-empty slab is found we can stop * therefore once a non-empty slab is found we can stop
@ -397,7 +396,8 @@ spl_slab_reclaim(spl_kmem_cache_t *skc, int count, int flag)
if ((sks->sks_ref > 0) || (count && i >= count)) if ((sks->sks_ref > 0) || (count && i >= count))
break; break;
if (time_after(jiffies,sks->sks_age+skc->skc_delay*HZ)||flag) { if (time_after(jiffies, sks->sks_age + skc->skc_delay * HZ) ||
flag) {
spl_slab_free(sks, &sks_list, &sko_list); spl_slab_free(sks, &sks_list, &sko_list);
i++; i++;
} }
@ -443,10 +443,10 @@ spl_emergency_search(struct rb_root *root, void *obj)
else if (address > (unsigned long)ske->ske_obj) else if (address > (unsigned long)ske->ske_obj)
node = node->rb_right; node = node->rb_right;
else else
return ske; return (ske);
} }
return NULL; return (NULL);
} }
static int static int
@ -465,13 +465,13 @@ spl_emergency_insert(struct rb_root *root, spl_kmem_emergency_t *ske)
else if (address > (unsigned long)ske_tmp->ske_obj) else if (address > (unsigned long)ske_tmp->ske_obj)
new = &((*new)->rb_right); new = &((*new)->rb_right);
else else
return 0; return (0);
} }
rb_link_node(&ske->ske_node, parent, new); rb_link_node(&ske->ske_node, parent, new);
rb_insert_color(&ske->ske_node, root); rb_insert_color(&ske->ske_node, root);
return 1; return (1);
} }
/* /*
@ -832,9 +832,7 @@ spl_magazine_destroy(spl_kmem_cache_t *skc)
*/ */
spl_kmem_cache_t * spl_kmem_cache_t *
spl_kmem_cache_create(char *name, size_t size, size_t align, spl_kmem_cache_create(char *name, size_t size, size_t align,
spl_kmem_ctor_t ctor, spl_kmem_ctor_t ctor, spl_kmem_dtor_t dtor, spl_kmem_reclaim_t reclaim,
spl_kmem_dtor_t dtor,
spl_kmem_reclaim_t reclaim,
void *priv, void *vmp, int flags) void *priv, void *vmp, int flags)
{ {
spl_kmem_cache_t *skc; spl_kmem_cache_t *skc;
@ -851,7 +849,7 @@ spl_kmem_cache_create(char *name, size_t size, size_t align,
might_sleep(); might_sleep();
/* /*
* Allocate memory for a new cache an initialize it. Unfortunately, * Allocate memory for a new cache and initialize it. Unfortunately,
* this usually ends up being a large allocation of ~32k because * this usually ends up being a large allocation of ~32k because
* we need to allocate enough memory for the worst case number of * we need to allocate enough memory for the worst case number of
* cpus in the magazine, skc_mag[NR_CPUS]. Because of this we * cpus in the magazine, skc_mag[NR_CPUS]. Because of this we
@ -923,7 +921,7 @@ spl_kmem_cache_create(char *name, size_t size, size_t align,
* Objects smaller than spl_kmem_cache_slab_limit can * Objects smaller than spl_kmem_cache_slab_limit can
* use the Linux slab for better space-efficiency. By * use the Linux slab for better space-efficiency. By
* default this functionality is disabled until its * default this functionality is disabled until its
* performance characters are fully understood. * performance characteristics are fully understood.
*/ */
if (spl_kmem_cache_slab_limit && if (spl_kmem_cache_slab_limit &&
size <= (size_t)spl_kmem_cache_slab_limit) size <= (size_t)spl_kmem_cache_slab_limit)
@ -986,7 +984,7 @@ out:
EXPORT_SYMBOL(spl_kmem_cache_create); EXPORT_SYMBOL(spl_kmem_cache_create);
/* /*
* Register a move callback to for cache defragmentation. * Register a move callback for cache defragmentation.
* XXX: Unimplemented but harmless to stub out for now. * XXX: Unimplemented but harmless to stub out for now.
*/ */
void void
@ -1022,9 +1020,11 @@ spl_kmem_cache_destroy(spl_kmem_cache_t *skc)
taskq_cancel_id(spl_kmem_cache_taskq, id); taskq_cancel_id(spl_kmem_cache_taskq, id);
/* Wait until all current callers complete, this is mainly /*
* Wait until all current callers complete, this is mainly
* to catch the case where a low memory situation triggers a * to catch the case where a low memory situation triggers a
* cache reaping action which races with this destroy. */ * cache reaping action which races with this destroy.
*/
wait_event(wq, atomic_read(&skc->skc_ref) == 0); wait_event(wq, atomic_read(&skc->skc_ref) == 0);
if (skc->skc_flags & (KMC_KMEM | KMC_VMEM)) { if (skc->skc_flags & (KMC_KMEM | KMC_VMEM)) {
@ -1037,8 +1037,10 @@ spl_kmem_cache_destroy(spl_kmem_cache_t *skc)
spin_lock(&skc->skc_lock); spin_lock(&skc->skc_lock);
/* Validate there are no objects in use and free all the /*
* spl_kmem_slab_t, spl_kmem_obj_t, and object buffers. */ * Validate there are no objects in use and free all the
* spl_kmem_slab_t, spl_kmem_obj_t, and object buffers.
*/
ASSERT3U(skc->skc_slab_alloc, ==, 0); ASSERT3U(skc->skc_slab_alloc, ==, 0);
ASSERT3U(skc->skc_obj_alloc, ==, 0); ASSERT3U(skc->skc_obj_alloc, ==, 0);
ASSERT3U(skc->skc_slab_total, ==, 0); ASSERT3U(skc->skc_slab_total, ==, 0);
@ -1089,7 +1091,7 @@ spl_cache_obj(spl_kmem_cache_t *skc, spl_kmem_slab_t *sks)
skc->skc_slab_max = skc->skc_slab_alloc; skc->skc_slab_max = skc->skc_slab_alloc;
} }
return sko->sko_addr; return (sko->sko_addr);
} }
/* /*
@ -1127,7 +1129,7 @@ spl_cache_grow_work(void *data)
static int static int
spl_cache_grow_wait(spl_kmem_cache_t *skc) spl_cache_grow_wait(spl_kmem_cache_t *skc)
{ {
return !test_bit(KMC_BIT_GROWING, &skc->skc_flags); return (!test_bit(KMC_BIT_GROWING, &skc->skc_flags));
} }
/* /*
@ -1249,9 +1251,11 @@ spl_cache_refill(spl_kmem_cache_t *skc, spl_kmem_magazine_t *skm, int flags)
if (skm != skc->skc_mag[smp_processor_id()]) if (skm != skc->skc_mag[smp_processor_id()])
goto out; goto out;
/* Potentially rescheduled to the same CPU but /*
* Potentially rescheduled to the same CPU but
* allocations may have occurred from this CPU while * allocations may have occurred from this CPU while
* we were sleeping so recalculate max refill. */ * we were sleeping so recalculate max refill.
*/
refill = MIN(refill, skm->skm_size - skm->skm_avail); refill = MIN(refill, skm->skm_size - skm->skm_avail);
spin_lock(&skc->skc_lock); spin_lock(&skc->skc_lock);
@ -1265,12 +1269,16 @@ spl_cache_refill(spl_kmem_cache_t *skc, spl_kmem_magazine_t *skm, int flags)
ASSERT(sks->sks_ref < sks->sks_objs); ASSERT(sks->sks_ref < sks->sks_objs);
ASSERT(!list_empty(&sks->sks_free_list)); ASSERT(!list_empty(&sks->sks_free_list));
/* Consume as many objects as needed to refill the requested /*
* cache. We must also be careful not to overfill it. */ * Consume as many objects as needed to refill the requested
while (sks->sks_ref < sks->sks_objs && refill-- > 0 && ++count) { * cache. We must also be careful not to overfill it.
*/
while (sks->sks_ref < sks->sks_objs && refill-- > 0 &&
++count) {
ASSERT(skm->skm_avail < skm->skm_size); ASSERT(skm->skm_avail < skm->skm_size);
ASSERT(count < skm->skm_size); ASSERT(count < skm->skm_size);
skm->skm_objs[skm->skm_avail++]=spl_cache_obj(skc,sks); skm->skm_objs[skm->skm_avail++] =
spl_cache_obj(skc, sks);
} }
/* Move slab to skc_complete_list when full */ /* Move slab to skc_complete_list when full */
@ -1308,16 +1316,20 @@ spl_cache_shrink(spl_kmem_cache_t *skc, void *obj)
sks->sks_ref--; sks->sks_ref--;
skc->skc_obj_alloc--; skc->skc_obj_alloc--;
/* Move slab to skc_partial_list when no longer full. Slabs /*
* Move slab to skc_partial_list when no longer full. Slabs
* are added to the head to keep the partial list is quasi-full * are added to the head to keep the partial list is quasi-full
* sorted order. Fuller at the head, emptier at the tail. */ * sorted order. Fuller at the head, emptier at the tail.
*/
if (sks->sks_ref == (sks->sks_objs - 1)) { if (sks->sks_ref == (sks->sks_objs - 1)) {
list_del(&sks->sks_list); list_del(&sks->sks_list);
list_add(&sks->sks_list, &skc->skc_partial_list); list_add(&sks->sks_list, &skc->skc_partial_list);
} }
/* Move empty slabs to the end of the partial list so /*
* they can be easily found and freed during reclamation. */ * Move empty slabs to the end of the partial list so
* they can be easily found and freed during reclamation.
*/
if (sks->sks_ref == 0) { if (sks->sks_ref == 0) {
list_del(&sks->sks_list); list_del(&sks->sks_list);
list_add_tail(&sks->sks_list, &skc->skc_partial_list); list_add_tail(&sks->sks_list, &skc->skc_partial_list);
@ -1359,10 +1371,12 @@ spl_kmem_cache_alloc(spl_kmem_cache_t *skc, int flags)
local_irq_disable(); local_irq_disable();
restart: restart:
/* Safe to update per-cpu structure without lock, but /*
* Safe to update per-cpu structure without lock, but
* in the restart case we must be careful to reacquire * in the restart case we must be careful to reacquire
* the local magazine since this may have changed * the local magazine since this may have changed
* when we need to grow the cache. */ * when we need to grow the cache.
*/
skm = skc->skc_mag[smp_processor_id()]; skm = skc->skc_mag[smp_processor_id()];
ASSERT(skm->skm_magic == SKM_MAGIC); ASSERT(skm->skm_magic == SKM_MAGIC);
@ -1438,10 +1452,12 @@ spl_kmem_cache_free(spl_kmem_cache_t *skc, void *obj)
local_irq_save(flags); local_irq_save(flags);
/* Safe to update per-cpu structure without lock, but /*
* Safe to update per-cpu structure without lock, but
* no remote memory allocation tracking is being performed * no remote memory allocation tracking is being performed
* it is entirely possible to allocate an object from one * it is entirely possible to allocate an object from one
* CPU cache and return it to another. */ * CPU cache and return it to another.
*/
skm = skc->skc_mag[smp_processor_id()]; skm = skc->skc_mag[smp_processor_id()];
ASSERT(skm->skm_magic == SKM_MAGIC); ASSERT(skm->skm_magic == SKM_MAGIC);

44
module/spl/spl-kmem.c
View File

@ -1,4 +1,4 @@
/*****************************************************************************\ /*
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California. * Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@ -20,9 +20,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
***************************************************************************** */
* Solaris Porting Layer (SPL) Kmem Implementation.
\*****************************************************************************/
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/kmem.h> #include <sys/kmem.h>
@ -31,7 +29,7 @@
int int
kmem_debugging(void) kmem_debugging(void)
{ {
return 0; return (0);
} }
EXPORT_SYMBOL(kmem_debugging); EXPORT_SYMBOL(kmem_debugging);
@ -47,7 +45,7 @@ kmem_vasprintf(const char *fmt, va_list ap)
va_end(aq); va_end(aq);
} while (ptr == NULL); } while (ptr == NULL);
return ptr; return (ptr);
} }
EXPORT_SYMBOL(kmem_vasprintf); EXPORT_SYMBOL(kmem_vasprintf);
@ -63,7 +61,7 @@ kmem_asprintf(const char *fmt, ...)
va_end(ap); va_end(ap);
} while (ptr == NULL); } while (ptr == NULL);
return ptr; return (ptr);
} }
EXPORT_SYMBOL(kmem_asprintf); EXPORT_SYMBOL(kmem_asprintf);
@ -78,13 +76,13 @@ __strdup(const char *str, int flags)
if (ptr) if (ptr)
memcpy(ptr, str, n + 1); memcpy(ptr, str, n + 1);
return ptr; return (ptr);
} }
char * char *
strdup(const char *str) strdup(const char *str)
{ {
return __strdup(str, KM_SLEEP); return (__strdup(str, KM_SLEEP));
} }
EXPORT_SYMBOL(strdup); EXPORT_SYMBOL(strdup);
@ -115,7 +113,8 @@ unsigned long long kmem_alloc_max = 0;
EXPORT_SYMBOL(kmem_alloc_used); EXPORT_SYMBOL(kmem_alloc_used);
EXPORT_SYMBOL(kmem_alloc_max); EXPORT_SYMBOL(kmem_alloc_max);
/* When DEBUG_KMEM_TRACKING is enabled not only will total bytes be tracked /*
* When DEBUG_KMEM_TRACKING is enabled not only will total bytes be tracked
* but also the location of every alloc and free. When the SPL module is * but also the location of every alloc and free. When the SPL module is
* unloaded a list of all leaked addresses and where they were allocated * unloaded a list of all leaked addresses and where they were allocated
* will be dumped to the console. Enabling this feature has a significant * will be dumped to the console. Enabling this feature has a significant
@ -149,7 +148,8 @@ EXPORT_SYMBOL(kmem_table);
EXPORT_SYMBOL(kmem_list); EXPORT_SYMBOL(kmem_list);
static kmem_debug_t * static kmem_debug_t *
kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void *addr) kmem_del_init(spinlock_t *lock, struct hlist_head *table,
int bits, const void *addr)
{ {
struct hlist_head *head; struct hlist_head *head;
struct hlist_node *node; struct hlist_node *node;
@ -165,7 +165,7 @@ kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void *
hlist_del_init(&p->kd_hlist); hlist_del_init(&p->kd_hlist);
list_del_init(&p->kd_list); list_del_init(&p->kd_list);
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
return p; return (p);
} }
} }
@ -355,15 +355,19 @@ spl_sprintf_addr(kmem_debug_t *kd, char *str, int len, int min)
ASSERT(str != NULL && len >= 17); ASSERT(str != NULL && len >= 17);
memset(str, 0, len); memset(str, 0, len);
/* Check for a fully printable string, and while we are at /*
* it place the printable characters in the passed buffer. */ * Check for a fully printable string, and while we are at
* it place the printable characters in the passed buffer.
*/
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
str[i] = ((char *)(kd->kd_addr))[i]; str[i] = ((char *)(kd->kd_addr))[i];
if (isprint(str[i])) { if (isprint(str[i])) {
continue; continue;
} else { } else {
/* Minimum number of printable characters found /*
* to make it worthwhile to print this as ascii. */ * Minimum number of printable characters found
* to make it worthwhile to print this as ascii.
*/
if (i > min) if (i > min)
break; break;
@ -384,7 +388,7 @@ spl_sprintf_addr(kmem_debug_t *kd, char *str, int len, int min)
*((uint8_t *)kd->kd_addr + 14)); *((uint8_t *)kd->kd_addr + 14));
} }
return str; return (str);
} }
static int static int
@ -442,10 +446,12 @@ void
spl_kmem_fini(void) spl_kmem_fini(void)
{ {
#ifdef DEBUG_KMEM #ifdef DEBUG_KMEM
/* Display all unreclaimed memory addresses, including the /*
* Display all unreclaimed memory addresses, including the
* allocation size and the first few bytes of what's located * allocation size and the first few bytes of what's located
* at that address to aid in debugging. Performance is not * at that address to aid in debugging. Performance is not
* a serious concern here since it is module unload time. */ * a serious concern here since it is module unload time.
*/
if (kmem_alloc_used_read() != 0) if (kmem_alloc_used_read() != 0)
printk(KERN_WARNING "kmem leaked %ld/%llu bytes\n", printk(KERN_WARNING "kmem leaked %ld/%llu bytes\n",
kmem_alloc_used_read(), kmem_alloc_max); kmem_alloc_used_read(), kmem_alloc_max);

29
module/spl/spl-vmem.c
View File

@ -1,4 +1,4 @@
/*****************************************************************************\ /*
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California. * Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@ -20,9 +20,7 @@
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
***************************************************************************** */
* Solaris Porting Layer (SPL) Kmem Implementation.
\*****************************************************************************/
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/vmem.h> #include <sys/vmem.h>
@ -68,7 +66,8 @@ unsigned long long vmem_alloc_max = 0;
EXPORT_SYMBOL(vmem_alloc_used); EXPORT_SYMBOL(vmem_alloc_used);
EXPORT_SYMBOL(vmem_alloc_max); EXPORT_SYMBOL(vmem_alloc_max);
/* When DEBUG_KMEM_TRACKING is enabled not only will total bytes be tracked /*
* When DEBUG_KMEM_TRACKING is enabled not only will total bytes be tracked
* but also the location of every alloc and free. When the SPL module is * but also the location of every alloc and free. When the SPL module is
* unloaded a list of all leaked addresses and where they were allocated * unloaded a list of all leaked addresses and where they were allocated
* will be dumped to the console. Enabling this feature has a significant * will be dumped to the console. Enabling this feature has a significant
@ -255,15 +254,19 @@ spl_sprintf_addr(kmem_debug_t *kd, char *str, int len, int min)
ASSERT(str != NULL && len >= 17); ASSERT(str != NULL && len >= 17);
memset(str, 0, len); memset(str, 0, len);
/* Check for a fully printable string, and while we are at /*
* it place the printable characters in the passed buffer. */ * Check for a fully printable string, and while we are at
* it place the printable characters in the passed buffer.
*/
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
str[i] = ((char *)(kd->kd_addr))[i]; str[i] = ((char *)(kd->kd_addr))[i];
if (isprint(str[i])) { if (isprint(str[i])) {
continue; continue;
} else { } else {
/* Minimum number of printable characters found /*
* to make it worthwhile to print this as ascii. */ * Minimum number of printable characters found
* to make it worthwhile to print this as ascii.
*/
if (i > min) if (i > min)
break; break;
@ -284,7 +287,7 @@ spl_sprintf_addr(kmem_debug_t *kd, char *str, int len, int min)
*((uint8_t *)kd->kd_addr + 14)); *((uint8_t *)kd->kd_addr + 14));
} }
return str; return (str);
} }
static int static int
@ -342,10 +345,12 @@ void
spl_vmem_fini(void) spl_vmem_fini(void)
{ {
#ifdef DEBUG_KMEM #ifdef DEBUG_KMEM
/* Display all unreclaimed memory addresses, including the /*
* Display all unreclaimed memory addresses, including the
* allocation size and the first few bytes of what's located * allocation size and the first few bytes of what's located
* at that address to aid in debugging. Performance is not * at that address to aid in debugging. Performance is not
* a serious concern here since it is module unload time. */ * a serious concern here since it is module unload time.
*/
if (vmem_alloc_used_read() != 0) if (vmem_alloc_used_read() != 0)
printk(KERN_WARNING "vmem leaked %ld/%llu bytes\n", printk(KERN_WARNING "vmem leaked %ld/%llu bytes\n",
vmem_alloc_used_read(), vmem_alloc_max); vmem_alloc_used_read(), vmem_alloc_max);