[-mmotm] arm64: skip kmemleak for KASAN again
diff mbox series

Message ID 20181226020550.63712-1-cai@lca.pw
State New
Headers show
Series
  • [-mmotm] arm64: skip kmemleak for KASAN again
Related show

Commit Message

Qian Cai Dec. 26, 2018, 2:05 a.m. UTC
Due to 871ac3d540f (kasan: initialize shadow to 0xff for tag-based
mode), kmemleak is broken again with KASAN. It needs a similar fix
from e55058c2983 (mm/memblock.c: skip kmemleak for kasan_init()).

Signed-off-by: Qian Cai <cai@lca.pw>
---
 arch/arm64/mm/kasan_init.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andrey Konovalov Dec. 27, 2018, 3:21 p.m. UTC | #1
On Wed, Dec 26, 2018 at 3:06 AM Qian Cai <cai@lca.pw> wrote:
>
> Due to 871ac3d540f (kasan: initialize shadow to 0xff for tag-based
> mode), kmemleak is broken again with KASAN. It needs a similar fix
> from e55058c2983 (mm/memblock.c: skip kmemleak for kasan_init()).
>
> Signed-off-by: Qian Cai <cai@lca.pw>

Hi Qian,

Sorry, didn't see your first kmemleak fix. I can merge this fix into
my series if I end up resending it.

In any case:

Acked-by: Andrey Konovalov <andreyknvl@google.com>

Thanks!

> ---
>  arch/arm64/mm/kasan_init.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c
> index 48d8f2fa0d14..4b55b15707a3 100644
> --- a/arch/arm64/mm/kasan_init.c
> +++ b/arch/arm64/mm/kasan_init.c
> @@ -47,8 +47,7 @@ static phys_addr_t __init kasan_alloc_raw_page(int node)
>  {
>         void *p = memblock_alloc_try_nid_raw(PAGE_SIZE, PAGE_SIZE,
>                                                 __pa(MAX_DMA_ADDRESS),
> -                                               MEMBLOCK_ALLOC_ACCESSIBLE,
> -                                               node);
> +                                               MEMBLOCK_ALLOC_KASAN, node);
>         return __pa(p);
>  }
>
> --
> 2.17.2 (Apple Git-113)
>

Patch
diff mbox series

diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c
index 48d8f2fa0d14..4b55b15707a3 100644
--- a/arch/arm64/mm/kasan_init.c
+++ b/arch/arm64/mm/kasan_init.c
@@ -47,8 +47,7 @@  static phys_addr_t __init kasan_alloc_raw_page(int node)
 {
 	void *p = memblock_alloc_try_nid_raw(PAGE_SIZE, PAGE_SIZE,
 						__pa(MAX_DMA_ADDRESS),
-						MEMBLOCK_ALLOC_ACCESSIBLE,
-						node);
+						MEMBLOCK_ALLOC_KASAN, node);
 	return __pa(p);
 }