Skip to content

Commit

Permalink
staging: zsmalloc: add single-page object fastpath in unmap
Browse files Browse the repository at this point in the history
Improve zs_unmap_object() performance by adding a fast path for
objects that don't span pages.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Seth Jennings authored and Greg Kroah-Hartman committed Jul 9, 2012
1 parent 5f60190 commit 1031233
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/staging/zsmalloc/zsmalloc-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle)
}

zs_copy_map_object(area->vm_buf, page, off, class->size);
area->vm_addr = NULL;
return area->vm_buf;
}
EXPORT_SYMBOL_GPL(zs_map_object);
Expand All @@ -788,18 +789,22 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
struct size_class *class;
struct mapping_area *area;

area = &__get_cpu_var(zs_map_area);
if (area->vm_addr) {
/* single-page object fastpath */
kunmap_atomic(area->vm_addr);
put_cpu_var(zs_map_area);
return;
}

BUG_ON(!handle);

obj_handle_to_location(handle, &page, &obj_idx);
get_zspage_mapping(get_first_page(page), &class_idx, &fg);
class = &pool->size_class[class_idx];
off = obj_idx_to_offset(page, obj_idx, class->size);

area = &__get_cpu_var(zs_map_area);
if (off + class->size <= PAGE_SIZE)
kunmap_atomic(area->vm_addr);
else
zs_copy_unmap_object(area->vm_buf, page, off, class->size);
zs_copy_unmap_object(area->vm_buf, page, off, class->size);
put_cpu_var(zs_map_area);
}
EXPORT_SYMBOL_GPL(zs_unmap_object);
Expand Down

0 comments on commit 1031233

Please sign in to comment.