forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: zcache: remove zcache_direct_reclaim_lock

Browse source 
zcache_do_preload() currently does a spin_trylock() on the
zcache_direct_reclaim_lock. Holding this lock intends to prevent
shrink_zcache_memory() from evicting zbud pages as a result
of a preload.

However, it also prevents two threads from
executing zcache_do_preload() at the same time.  The first
thread will obtain the lock and the second thread's spin_trylock()
will fail (an aborted preload) causing the page to be either lost
(cleancache) or pushed out to the swap device (frontswap). It
also doesn't ensure that the call to shrink_zcache_memory() is
on the same thread as the call to zcache_do_preload().

Additional, there is no need for this mechanism because all
zcache_do_preload() calls that come down from cleancache already
have PF_MEMALLOC set in the process flags which prevents
direct reclaim in the memory manager. If the zcache_do_preload()
call is done from the frontswap path, we _want_ reclaim to be
done (which it isn't right now).

This patch removes the zcache_direct_reclaim_lock and related
statistics in zcache.

Based on v3.1-rc8

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Reviewed-by: Dave Hansen <dave@linux.vnet.ibm.com>
Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Seth Jennings 2011-10-12 14:41:00 -05:00 • committed by Greg Kroah-Hartman
parent 3b769edd58
commit 00bf256011
1 changed files with 4 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/zcache/zcache-main.c
View file

@ -962,15 +962,6 @@ out:
static unsigned long zcache_failed_get_free_pages; static unsigned long zcache_failed_get_free_pages;
static unsigned long zcache_failed_alloc; static unsigned long zcache_failed_alloc;
static unsigned long zcache_put_to_flush; static unsigned long zcache_put_to_flush;
static unsigned long zcache_aborted_preload;
static unsigned long zcache_aborted_shrink;
/*
* Ensure that memory allocation requests in zcache don't result
* in direct reclaim requests via the shrinker, which would cause
* an infinite loop. Maybe a GFP flag would be better?
*/
static DEFINE_SPINLOCK(zcache_direct_reclaim_lock);
/* /*
* for now, used named slabs so can easily track usage; later can * for now, used named slabs so can easily track usage; later can
@ -1009,10 +1000,6 @@ static int zcache_do_preload(struct tmem_pool *pool)
goto out; goto out;
if (unlikely(zcache_obj_cache == NULL)) if (unlikely(zcache_obj_cache == NULL))
goto out; goto out;
if (!spin_trylock(&zcache_direct_reclaim_lock)) {
zcache_aborted_preload++;
goto out;
}
preempt_disable(); preempt_disable();
kp = &__get_cpu_var(zcache_preloads); kp = &__get_cpu_var(zcache_preloads);
while (kp->nr < ARRAY_SIZE(kp->objnodes)) { while (kp->nr < ARRAY_SIZE(kp->objnodes)) {
@ -1021,7 +1008,7 @@ static int zcache_do_preload(struct tmem_pool *pool)
ZCACHE_GFP_MASK); ZCACHE_GFP_MASK);
if (unlikely(objnode == NULL)) { if (unlikely(objnode == NULL)) {
zcache_failed_alloc++; zcache_failed_alloc++;
goto unlock_out; goto out;
} }
preempt_disable(); preempt_disable();
kp = &__get_cpu_var(zcache_preloads); kp = &__get_cpu_var(zcache_preloads);
@ -1034,13 +1021,13 @@ static int zcache_do_preload(struct tmem_pool *pool)
obj = kmem_cache_alloc(zcache_obj_cache, ZCACHE_GFP_MASK); obj = kmem_cache_alloc(zcache_obj_cache, ZCACHE_GFP_MASK);
if (unlikely(obj == NULL)) { if (unlikely(obj == NULL)) {
zcache_failed_alloc++; zcache_failed_alloc++;
goto unlock_out; goto out;
} }
page = (void *)__get_free_page(ZCACHE_GFP_MASK); page = (void *)__get_free_page(ZCACHE_GFP_MASK);
if (unlikely(page == NULL)) { if (unlikely(page == NULL)) {
zcache_failed_get_free_pages++; zcache_failed_get_free_pages++;
kmem_cache_free(zcache_obj_cache, obj); kmem_cache_free(zcache_obj_cache, obj);
goto unlock_out; goto out;
} }
preempt_disable(); preempt_disable();
kp = &__get_cpu_var(zcache_preloads); kp = &__get_cpu_var(zcache_preloads);
@ -1053,8 +1040,6 @@ static int zcache_do_preload(struct tmem_pool *pool)
else else
free_page((unsigned long)page); free_page((unsigned long)page);
ret = 0; ret = 0;
unlock_out:
spin_unlock(&zcache_direct_reclaim_lock);
out: out:
return ret; return ret;
} }
@ -1429,8 +1414,6 @@ ZCACHE_SYSFS_RO(evicted_buddied_pages);
ZCACHE_SYSFS_RO(failed_get_free_pages); ZCACHE_SYSFS_RO(failed_get_free_pages);
ZCACHE_SYSFS_RO(failed_alloc); ZCACHE_SYSFS_RO(failed_alloc);
ZCACHE_SYSFS_RO(put_to_flush); ZCACHE_SYSFS_RO(put_to_flush);
ZCACHE_SYSFS_RO(aborted_preload);
ZCACHE_SYSFS_RO(aborted_shrink);
ZCACHE_SYSFS_RO(compress_poor); ZCACHE_SYSFS_RO(compress_poor);
ZCACHE_SYSFS_RO(mean_compress_poor); ZCACHE_SYSFS_RO(mean_compress_poor);
ZCACHE_SYSFS_RO_ATOMIC(zbud_curr_raw_pages); ZCACHE_SYSFS_RO_ATOMIC(zbud_curr_raw_pages);
@ -1472,8 +1455,6 @@ static struct attribute *zcache_attrs[] = {
&zcache_failed_get_free_pages_attr.attr, &zcache_failed_get_free_pages_attr.attr,
&zcache_failed_alloc_attr.attr, &zcache_failed_alloc_attr.attr,
&zcache_put_to_flush_attr.attr, &zcache_put_to_flush_attr.attr,
&zcache_aborted_preload_attr.attr,
&zcache_aborted_shrink_attr.attr,
&zcache_zbud_unbuddied_list_counts_attr.attr, &zcache_zbud_unbuddied_list_counts_attr.attr,
&zcache_zbud_cumul_chunk_counts_attr.attr, &zcache_zbud_cumul_chunk_counts_attr.attr,
&zcache_zv_curr_dist_counts_attr.attr, &zcache_zv_curr_dist_counts_attr.attr,
@ -1513,11 +1494,7 @@ static int shrink_zcache_memory(struct shrinker *shrink,
if (!(gfp_mask & __GFP_FS)) if (!(gfp_mask & __GFP_FS))
/* does this case really need to be skipped? */ /* does this case really need to be skipped? */
goto out; goto out;
if (spin_trylock(&zcache_direct_reclaim_lock)) { zbud_evict_pages(nr);
zbud_evict_pages(nr);
spin_unlock(&zcache_direct_reclaim_lock);
} else
zcache_aborted_shrink++;
} }
ret = (int)atomic_read(&zcache_zbud_curr_raw_pages); ret = (int)atomic_read(&zcache_zbud_curr_raw_pages);
out: out: