From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3B36C4727F for ; Thu, 1 Oct 2020 23:10:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7E375206C1 for ; Thu, 1 Oct 2020 23:10:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="m1YEkqOP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E375206C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 017F06B0073; Thu, 1 Oct 2020 19:10:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBC756B0074; Thu, 1 Oct 2020 19:10:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA97D6B0075; Thu, 1 Oct 2020 19:10:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0182.hostedemail.com [216.40.44.182]) by kanga.kvack.org (Postfix) with ESMTP id A162C6B0073 for ; Thu, 1 Oct 2020 19:10:55 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 33C55248D for ; Thu, 1 Oct 2020 23:10:55 +0000 (UTC) X-FDA: 77324903670.27.dolls34_1a088ff2719f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 215EA3D668 for ; Thu, 1 Oct 2020 23:10:55 +0000 (UTC) X-HE-Tag: dolls34_1a088ff2719f X-Filterd-Recvd-Size: 6724 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 23:10:54 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id x191so54402qkb.3 for ; Thu, 01 Oct 2020 16:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=LrSFyHjUGw2UiTx9NykDJbmC1IL+xpnwwfDCTvI2cF8=; b=m1YEkqOPjG8lbk6SmIJL2HmndWhXfci8ZUFS67zCdH0cfD+FIpTQ67GPK5js7+xvPC lumKgKLgLG8Hz0LRLNx3GIjMgH32Tl78UvC+UtYFK0FgK4h9KmvumG9WzYU6EBmBoEK/ TplclwGXKGreTF3zjs3xRmVHH2fOWvU2e0RPJlD/6mMjFyDFRWZbLisbPSgj6VzOFsGY TNfLu+jK1AzkaRdA43XjxFxm7KB8LfORJyiFHEIz7Bta2z7Ry1yxwgPxXWFi02lKEy3t d12PAuN1yoYjW3Rh7b5KGeynJ+RMYF+vPRPhtsEbjDcgTSypbDZj56vlu3zMGzbT03it Pmqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LrSFyHjUGw2UiTx9NykDJbmC1IL+xpnwwfDCTvI2cF8=; b=It1QhK7l+KDc8NIAVdaCkYmqIe8mg7ktOdV6aOaqBKtJEjo19R0hFMTiyNy5LJRAGV iOj7U2c8nvVTchjKD4VGG4fzaB85LQKemnxlyQSLa5PZ1ujffxRje60ZANVZlxPE3Bqd qTU+jMpJrMhm6PCQDK6eIe3cknMISJmKp3i79Qle9yzNxSC93h5JfnlQMPgyMtrzJoJ9 qRjlnp11CuYCBOfPfTtXipu4ydTBYx9GzE15epXoLj6CchM9K5xlPcz1cbL2lMbEX62F 5LmJ2A2OGR/rP+Lg5G/jFuqu/YedBNPR3JVLBq/07m2Y5pBlb3CdVh1n7Hd7/MXNUq4D FVkg== X-Gm-Message-State: AOAM532gz6OMYgxzSuidkpM9vL8sMw76PNebX91rJjnL6ByG5E8CLsVQ 22RegorV1Z4KZNiDrj5TZ7moEi/5RfWn21J1 X-Google-Smtp-Source: ABdhPJw0hHBfphvgPGxtO7JuQ9rqxWX54h2HBEFUVxNPmzCdjK4YBP9INtDxJBdJIQjb8GO8Q7GB0uJTj3rgIdc7 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:9e0e:: with SMTP id p14mr9650649qve.25.1601593853704; Thu, 01 Oct 2020 16:10:53 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:05 +0200 In-Reply-To: Message-Id: <443425c7e907f0a3b5bece8e4315cd70b93170c0.1601593784.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 04/39] kasan: shadow declarations only for software modes From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" 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: This is a preparatory commit for the upcoming addition of a new hardware tag-based (MTE-based) KASAN mode. Group shadow-related KASAN function declarations and only define them for the two existing software modes. No functional changes for software modes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I864be75a88b91b443c55e9c2042865e15703e164 --- include/linux/kasan.h | 45 ++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index bd5b4965a269..1ff2717a8547 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -10,9 +10,20 @@ struct vm_struct; struct task_struct; #ifdef CONFIG_KASAN +#include +#endif + +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) #include -#include + +/* Software KASAN implementations use shadow memory. */ + +#ifdef CONFIG_KASAN_SW_TAGS +#define KASAN_SHADOW_INIT 0xFF +#else +#define KASAN_SHADOW_INIT 0 +#endif extern unsigned char kasan_early_shadow_page[PAGE_SIZE]; extern pte_t kasan_early_shadow_pte[PTRS_PER_PTE]; @@ -29,6 +40,23 @@ static inline void *kasan_mem_to_shadow(const void *addr) + KASAN_SHADOW_OFFSET; } +int kasan_add_zero_shadow(void *start, unsigned long size); +void kasan_remove_zero_shadow(void *start, unsigned long size); + +#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ + +static inline int kasan_add_zero_shadow(void *start, unsigned long size) +{ + return 0; +} +static inline void kasan_remove_zero_shadow(void *start, + unsigned long size) +{} + +#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ + +#ifdef CONFIG_KASAN + /* Enable reporting bugs after kasan_disable_current() */ extern void kasan_enable_current(void); @@ -69,9 +97,6 @@ struct kasan_cache { int free_meta_offset; }; -int kasan_add_zero_shadow(void *start, unsigned long size); -void kasan_remove_zero_shadow(void *start, unsigned long size); - size_t __ksize(const void *); static inline void kasan_unpoison_slab(const void *ptr) { @@ -137,14 +162,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, return false; } -static inline int kasan_add_zero_shadow(void *start, unsigned long size) -{ - return 0; -} -static inline void kasan_remove_zero_shadow(void *start, - unsigned long size) -{} - static inline void kasan_unpoison_slab(const void *ptr) { } static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } @@ -152,8 +169,6 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } #ifdef CONFIG_KASAN_GENERIC -#define KASAN_SHADOW_INIT 0 - void kasan_cache_shrink(struct kmem_cache *cache); void kasan_cache_shutdown(struct kmem_cache *cache); void kasan_record_aux_stack(void *ptr); @@ -168,8 +183,6 @@ static inline void kasan_record_aux_stack(void *ptr) {} #ifdef CONFIG_KASAN_SW_TAGS -#define KASAN_SHADOW_INIT 0xFF - void kasan_init_tags(void); void *kasan_reset_tag(const void *addr); -- 2.28.0.709.gb0816b6eb0-goog