Commit 99155188 authored by Minchan Kim's avatar Minchan Kim Committed by Greg Kroah-Hartman

staging: zsmalloc: Fix TLB coherency and build problem

Recently, Matt Sealey reported he fail to build zsmalloc caused by
using of local_flush_tlb_kernel_range which are architecture dependent
function so !CONFIG_SMP in ARM couldn't implement it so it ends up
build error following as.

  MODPOST 216 modules
  LZMA    arch/arm/boot/compressed/piggy.lzma
  AS      arch/arm/boot/compressed/lib1funcs.o
ERROR: "v7wbi_flush_kern_tlb_range"
[drivers/staging/zsmalloc/zsmalloc.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
make: *** Waiting for unfinished jobs....

The reason we used that function is copy method by [1]
was really slow in ARM but at that time.

More severe problem is ARM can prefetch speculatively on other CPUs
so under us, other TLBs can have an entry only if we do flush local
CPU. Russell King pointed that. Thanks!
We don't have many choices except using flush_tlb_kernel_range.

My experiment in ARMv7 processor 4 core didn't make any difference with
zsmapbench[2] between local_flush_tlb_kernel_range and flush_tlb_kernel_range
but still page-table based is much better than copy-based.

* bigger is better.

1. local_flush_tlb_kernel_range: 3918795 mappings
2. flush_tlb_kernel_range : 3989538 mappings
3. copy-based: 635158 mappings

This patch replace local_flush_tlb_kernel_range with
flush_tlb_kernel_range which are avaialbe in all architectures
because we already have used it in vmalloc allocator which are
generic one so build problem should go away and performane loss
shoud be void.

[1] f553646a, zsmalloc: add page table mapping method
[2] https://github.com/spartacus06/zsmapbench

Cc: stable@vger.kernel.org
Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Konrad Rzeszutek Wilk <konrad@darnok.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
Reported-by: default avatarMatt Sealey <matt@genesi-usa.com>
Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6200964
...@@ -222,11 +222,9 @@ struct zs_pool { ...@@ -222,11 +222,9 @@ struct zs_pool {
/* /*
* By default, zsmalloc uses a copy-based object mapping method to access * By default, zsmalloc uses a copy-based object mapping method to access
* allocations that span two pages. However, if a particular architecture * allocations that span two pages. However, if a particular architecture
* 1) Implements local_flush_tlb_kernel_range() and 2) Performs VM mapping * performs VM mapping faster than copying, then it should be added here
* faster than copying, then it should be added here so that * so that USE_PGTABLE_MAPPING is defined. This causes zsmalloc to use
* USE_PGTABLE_MAPPING is defined. This causes zsmalloc to use page table * page table mapping rather than copying for object mapping.
* mapping rather than copying
* for object mapping.
*/ */
#if defined(CONFIG_ARM) #if defined(CONFIG_ARM)
#define USE_PGTABLE_MAPPING #define USE_PGTABLE_MAPPING
...@@ -663,7 +661,7 @@ static inline void __zs_unmap_object(struct mapping_area *area, ...@@ -663,7 +661,7 @@ static inline void __zs_unmap_object(struct mapping_area *area,
flush_cache_vunmap(addr, end); flush_cache_vunmap(addr, end);
unmap_kernel_range_noflush(addr, PAGE_SIZE * 2); unmap_kernel_range_noflush(addr, PAGE_SIZE * 2);
local_flush_tlb_kernel_range(addr, end); flush_tlb_kernel_range(addr, end);
} }
#else /* USE_PGTABLE_MAPPING */ #else /* USE_PGTABLE_MAPPING */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment