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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 66B3FC433DF for ; Mon, 12 Oct 2020 20:45:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3148D214DB for ; Mon, 12 Oct 2020 20:45:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qERCmJ8f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388652AbgJLUpg (ORCPT ); Mon, 12 Oct 2020 16:45:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730852AbgJLUpZ (ORCPT ); Mon, 12 Oct 2020 16:45:25 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E79A6C0613DA for ; Mon, 12 Oct 2020 13:45:24 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id f4so13447807qta.12 for ; Mon, 12 Oct 2020 13:45:24 -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=Dg3fFyToLX3tIMZJi0YCB3YwOPKd2+CK9QdyHU5e4JA=; b=qERCmJ8fvsBb++AchaKnq6TY/JoXWPPtbnPaFsa/yfcfH8xSMEpXFGjNOlH20XEd21 ayIT7JsZ5BoQgxZtfIT+GKIAt9eeB+WqZcHTWqOrPH9Rq6udvZKpE05Z0iljdcFID6gQ NCfaBNUeHiSDIUpwPoqcdWknj0H+fBA5I6fZmffiMZKnZ9ebw9KhHhJ59+y7fElQsSGH qUZ9dm198j/+pLGOe0UUoaFYKMFR6nplWnf6sk7RSpop900kP97v/BcDQMwIbDl2PT3U EtXETKtAZZGF6Ku/TCs6Tg3YUEaNurwhLhq1OOXKaWqJR2JONYl2zdffBanZ3gEBgF0N raFg== 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=Dg3fFyToLX3tIMZJi0YCB3YwOPKd2+CK9QdyHU5e4JA=; b=izOsGPAygWGMc8uI2dONuYT6YJWQ4LFE/wmduUw2PnUBwn+zxf0dOCV9IgSrN+ni7m KJbutyKCTxP5BDBQ9QQgorulUHzwFZlJXol5Y4+eqfX+I4Bjbis1PkEpMLyRqQR6zf8t wiG2j2CVAcKZdH4QhCqc1/3T+8I3f8xF58a6rbnsegl+RvzaJehAPnFdteZ2TQ7VC+sj GqjMG/xXu/Ja3oJHqJXiNsaWlGgMMVWOAkuhfhFRbOnpDNv9WMbRn+HeAqIEwb6uB9TP 0qRdOTutHgC7pCIlq1neUsQb7IEZrfKkoFYKHE5/Gq0KzGR+y8i2CkPlA2y9DwmrSdQJ 2XFg== X-Gm-Message-State: AOAM530Rvz9BB1XW7EFH1M8pahzSRDB0852a44bAi5Gxu6J8BP0m0PQa p01elHTwwIWSvijS9QQgZk+TJDnfy5Fi0zfP X-Google-Smtp-Source: ABdhPJwiGsWe0AOptpPV27b4/88pIqhZUlCgUQEgveC4QfJ8BkEqR03wzYVYpFX61iF4UYX7MZx+CCASAwvkQKKE Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:48c6:: with SMTP id v6mr3522338qvx.11.1602535524090; Mon, 12 Oct 2020 13:45:24 -0700 (PDT) Date: Mon, 12 Oct 2020 22:44:19 +0200 In-Reply-To: Message-Id: <9732d5bcae79d9ea644faea900d96d1e5a58bb5d.1602535397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH v5 13/40] kasan: shadow declarations only for software modes From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: Vincenzo Frascino , kasan-dev@googlegroups.com, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.1011.ga647a8990f-goog