From patchwork Tue Jun 26 13:15:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10488895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E0BFA60386 for ; Tue, 26 Jun 2018 13:15:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1AC028907 for ; Tue, 26 Jun 2018 13:15:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5A632893E; Tue, 26 Jun 2018 13:15:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 552E42893B for ; Tue, 26 Jun 2018 13:15:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF64A6B026A; Tue, 26 Jun 2018 09:15:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CCEE26B026B; Tue, 26 Jun 2018 09:15:41 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B47EA6B026D; Tue, 26 Jun 2018 09:15:41 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id 58F576B026B for ; Tue, 26 Jun 2018 09:15:41 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id t139-v6so816150wmt.6 for ; Tue, 26 Jun 2018 06:15:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=YhNLQluC3zPdVMeBvR8Lp3d958WDaREzBrtKu3hGG6k=; b=NsD7LNZQz5eOv4NQqcjy/g+FNHM+AkC1VdPZJWh0Bl1tU2v0rNheJbQ2qwMgIwcC9q /S1znClrDGn+TPHiJpf31COgxrg7Tw6miQBC0jpwqkiZ+X+0VNVSkxf9LTRGh+bFC8du e2actdgXU8qn2IaAcPvS78gkaeWTsUlB7GwaXfCHKNorp2A7htxIUY2gmSCMxtm6hvh6 G2NMtqFvz/yox5/NscLr9hGY/nQPHWwBklxfxR0Ncx/piu66A9vyqOhtUGovk3cjdZOM LD9BwqsOY0+s6SLNYarObqhlVOrKfZOPfYZVsRE48fvmRbs0M5RWvdP7r6SVTPvuyZ/s Qr2A== X-Gm-Message-State: APt69E2huSYtG99ScEE0tqfk0LQ3LRHbIrJfR9ywSRYUbj56S4j2kuWN VyjMQcpo8TxbzbjrRKXoxLJxWSNZ058suVbpLM6ph7Jw9I4bPlvm/KAbfJG6RJcbzi0wy/F/O8l tuOQO9Gks1E/0QnShaeby7WP6hwoiTS4KBsI3tTyY8LPQFTr+ZrTXOCyqMPNzZNv1x/hgg7atvW Zza3G/jCzaJS56h9JzHnP5g7+pKGkjyi8fgV5d0FLV8SaOgmROGlggxXv6z0DK1a5ea4DZvWgc5 ewZslIkm9ceQj7o7kV/dNz9SGXqZVB4A3jnJtmUs6EC1WJp4bOuZCe28r+NVPrHE8U3PPBUTBlt PdpnxiIl9StYtfUCjJ2FuBzHzlEtJGqm+mM6HgVEQu8pdkq8wxxk+B3dC2iR7l6mb5ZoGC33pp9 K X-Received: by 2002:adf:d149:: with SMTP id b9-v6mr1475573wri.17.1530018940921; Tue, 26 Jun 2018 06:15:40 -0700 (PDT) X-Received: by 2002:adf:d149:: with SMTP id b9-v6mr1475535wri.17.1530018940178; Tue, 26 Jun 2018 06:15:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530018940; cv=none; d=google.com; s=arc-20160816; b=1CdXYMbi/t5JjADmFVFPLabAPL0taSJRVisc4VVa3pr52A4gsb53v/t3zqqmx9cbvl a04c8bMTEWsYnFca/kVUYv0U1+Bey/kV5aAcFrifgZdHJxjyZ85PGJITNz86CFFyJiWr wlm7Rk4C4juK54AMWHbOv2kISLPcr4yT9PcAGdUgsvpGXJSRaqBN29B4qLrcyKaV0u+7 KUHitk66WSoa5O3ED4Kg+WF+1Q1OrH4mkwqJ5X3l6WoxRr8HZwZGRl1aTS7vT96kIGRb dmUhRcseNwTX/LGDVp15B/HvBmrigarhCqQY6P1dB3QOXAr+SLHi9EpMPGUw+b4i0OUf QS9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=YhNLQluC3zPdVMeBvR8Lp3d958WDaREzBrtKu3hGG6k=; b=UKCYrckHqpnyI67rAlrZaBjUYkcISb/Y0KGjS3olzTz9UPJcoc/tSSoFpMaAtFxnl6 Sbm6L439R8eNsxWOqKZd122FHev01RO7Oli2+CVkcRixw8H/wjx1GqsAgsFJTAV0xGFf e58jc6/yZMTWtIfD+lKMvEvd3UmUJFyKin6iehh9F71KSzbbpm6dtlIveAktTFfsIw0t GWtFXFQF90F9U+oK9lyaPo/JZtdEZvUwSKHADhAtUuD2+lLhCXcu9ZvhubI5V7jnLzZ6 JYVtYFUPBK7jHWDpajG9CAWfpzrjI34TXgrCkmb4RJfmJCNH5RpwTpA+LD9R+x2RnZ3N R96w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=RwV4diPI; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x5-v6sor794598wrs.77.2018.06.26.06.15.40 for (Google Transport Security); Tue, 26 Jun 2018 06:15:40 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=RwV4diPI; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YhNLQluC3zPdVMeBvR8Lp3d958WDaREzBrtKu3hGG6k=; b=RwV4diPI5VZPDDv5Zq8UsZ/Wk67TJvBxzP6g9IZUzZGKVf+VNmstYYfQWZsJZ/V0k5 kAGn6M69HRK9FZmOqol0Eujoa+GaZYCZXTCNBVvhD0E2dshKwkWAu1lPbilKNvNtAgRC 9sa+ZHs0eVFwO+Jc5oKtsJPREpBD2NVSdf1bsCDNzGPHXBvBig5iOm9PGRfd6gKMgupm +5g2h6ETCHP7/i9e/AUa3UezW+aAi2E4ZUz5XIr3RXUMzmWrdXUHKChNE1ij00G1qdSo BPejbwPfDWDB0ZVftjMIp3fLSmKWo7+XACY67IRLpaUtBvgzIIQ5rVx7RGuZe+qSw13u 0NcA== X-Google-Smtp-Source: AAOMgpe73aw5AlVm35tCVu9KNcKwev8Ou8kNvcNlIjMYYsOqNt5bqVLG2IwOrZEwRCFZ4OVr7mUFFg== X-Received: by 2002:adf:88e3:: with SMTP id g32-v6mr1411208wrg.62.1530018939538; Tue, 26 Jun 2018 06:15:39 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id w15-v6sm2162639wrn.25.2018.06.26.06.15.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:15:38 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Andrey Konovalov Subject: [PATCH v4 04/17] khwasan, arm64: adjust shadow size for CONFIG_KASAN_HW Date: Tue, 26 Jun 2018 15:15:14 +0200 Message-Id: <7bd08c76830e4cd23f90d1ed25721fca3c5f3205.1530018818.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: References: X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP KWHASAN uses 1 shadow byte for 16 bytes of kernel memory, so it requires 1/16th of the kernel virtual address space for the shadow memory. This commit sets KASAN_SHADOW_SCALE_SHIFT to 4 when KHWASAN is enabled. Signed-off-by: Andrey Konovalov --- arch/arm64/Makefile | 2 +- arch/arm64/include/asm/memory.h | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 45272266dafb..191a649f34e7 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -93,7 +93,7 @@ endif # KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) # - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) # in 32-bit arithmetic -KASAN_SHADOW_SCALE_SHIFT := 3 +KASAN_SHADOW_SCALE_SHIFT := $(if $(CONFIG_KASAN_HW), 4, 3) KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 32))) \ + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 49d99214f43c..6d084431b7f7 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -74,12 +74,17 @@ #define KERNEL_END _end /* - * KASAN requires 1/8th of the kernel virtual address space for the shadow - * region. KASAN can bloat the stack significantly, so double the (minimum) - * stack size when KASAN is in use. + * KASAN and KHWASAN require 1/8th and 1/16th of the kernel virtual address + * space for the shadow region respectively. They can bloat the stack + * significantly, so double the (minimum) stack size when they are in use. */ -#ifdef CONFIG_KASAN +#ifdef CONFIG_KASAN_GENERIC #define KASAN_SHADOW_SCALE_SHIFT 3 +#endif +#ifdef CONFIG_KASAN_HW +#define KASAN_SHADOW_SCALE_SHIFT 4 +#endif +#ifdef CONFIG_KASAN #define KASAN_SHADOW_SIZE (UL(1) << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) #define KASAN_THREAD_SHIFT 1 #else