hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] slab: remove drain_array_locked 

Remove drain_array_locked and use that opportunity to limit the time the l3
lock is taken further.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christoph Lameter 2006-03-22 00:09:07 -08:00 committed by Linus Torvalds
parent aab2207cf8
commit 1b55253a7f
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mm/slab.c
View File

@ -2123,9 +2123,6 @@ static void check_spinlock_acquired_node(struct kmem_cache *cachep, int node)
#define check_spinlock_acquired_node(x, y) do { } while(0) #define check_spinlock_acquired_node(x, y) do { } while(0)
#endif #endif
static void drain_array_locked(struct kmem_cache *cachep,
struct array_cache *ac, int force, int node);
static void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3, static void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3,
struct array_cache *ac, struct array_cache *ac,
int force, int node); int force, int node);
@ -3522,40 +3519,32 @@ static void enable_cpucache(struct kmem_cache *cachep)
cachep->name, -err); cachep->name, -err);
} }
static void drain_array_locked(struct kmem_cache *cachep, /*
struct array_cache *ac, int force, int node) * Drain an array if it contains any elements taking the l3 lock only if
* necessary.
*/
void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3,
struct array_cache *ac, int force, int node)
{ {
int tofree; int tofree;
check_spinlock_acquired_node(cachep, node); if (!ac || !ac->avail)
return;
if (ac->touched && !force) { if (ac->touched && !force) {
ac->touched = 0; ac->touched = 0;
} else if (ac->avail) { } else if (ac->avail) {
tofree = force ? ac->avail : (ac->limit + 4) / 5; tofree = force ? ac->avail : (ac->limit + 4) / 5;
if (tofree > ac->avail) if (tofree > ac->avail)
tofree = (ac->avail + 1) / 2; tofree = (ac->avail + 1) / 2;
spin_lock_irq(&l3->list_lock);
free_block(cachep, ac->entry, tofree, node); free_block(cachep, ac->entry, tofree, node);
spin_unlock_irq(&l3->list_lock);
ac->avail -= tofree; ac->avail -= tofree;
memmove(ac->entry, &(ac->entry[tofree]), memmove(ac->entry, &(ac->entry[tofree]),
sizeof(void *) * ac->avail); sizeof(void *) * ac->avail);
} }
} }
/*
* Drain an array if it contains any elements taking the l3 lock only if
* necessary.
*/
static void drain_array(struct kmem_cache *searchp, struct kmem_list3 *l3,
struct array_cache *ac, int force, int node)
{
if (ac && ac->avail) {
spin_lock_irq(&l3->list_lock);
drain_array_locked(searchp, ac, force, node);
spin_unlock_irq(&l3->list_lock);
}
}
/** /**
* cache_reap - Reclaim memory from caches. * cache_reap - Reclaim memory from caches.
* @unused: unused parameter * @unused: unused parameter