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 8C650C433E2 for ; Tue, 15 Sep 2020 21:16:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 29B902078E for ; Tue, 15 Sep 2020 21:16:32 +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="hMw9RQ1d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29B902078E 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 BAC8590006B; Tue, 15 Sep 2020 17:16:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5CEA900012; Tue, 15 Sep 2020 17:16:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A72DE90006B; Tue, 15 Sep 2020 17:16:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id 92BD0900012 for ; Tue, 15 Sep 2020 17:16:31 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 49FBC3489 for ; Tue, 15 Sep 2020 21:16:31 +0000 (UTC) X-FDA: 77266554582.02.man81_1d11c1227114 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 21B7F1005DE99 for ; Tue, 15 Sep 2020 21:16:31 +0000 (UTC) X-HE-Tag: man81_1d11c1227114 X-Filterd-Recvd-Size: 6762 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 21:16:30 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id f12so4020115qtq.5 for ; Tue, 15 Sep 2020 14:16:30 -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=CRuZK+9yjNiKO3/D2O90q00ovcGW/0GaRtF/oaFCa6M=; b=hMw9RQ1dm2tX2wxDoS+iGFKc6VjnZ0XSq5Et2xcn9Si1ATKtqSzmGft3iR27ujVutM 6Pmv9Ouek8j/oMRKz9BmvZ7pHOYOe6Lqj7XAOJ+IVmxsC1pGbjA11jnsHJo+2P3BeD7U ssDvbd51P7yEcYy2VrkEPQOC1NGoueMpaJQ5NMWy/P26Q+4Eur2f8WwuoSAjAISHRjgs 4RFp88PAKRndNiG30G5JrdImqqcM8yXxseTQ3P3rk5mKHk51srzaCdnLOHyzHH11eFdB Z56rbIIDpE49gN6dYAIcfwB4B6ezKY9w/+af2eDNmCwV76JcqLbQzvBbSbEiYiI9oDjM YJVw== 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=CRuZK+9yjNiKO3/D2O90q00ovcGW/0GaRtF/oaFCa6M=; b=QBVQNgpBcHpbElWl4ipluFIiiLPuwyrXqB1PWY70fvhJ48ZFtpQ435uuP14lXidFAI vvbGE4VzfItx3JaSovXA3ljmjY5091WlMBmazBlREHxtHNh7q/hdRYB+y+zx2VltPyI7 J8btzzVTxqHadsrDe4SxfJxbz0ZDQ0Fsa6Evc1Nt+MntiJ/6vTo5MlDJzEHq/Fy7l2QO fI5S+uWQ7Bl4N+uZHdpsQI9CKVBl7VWaCjOMeGyT5fhfW7bjY4K6U4tNEjeQ1x1TlJp/ twcrX8DjNCXZNaIFKor4G1ISEXm8/o7yUBvOt+qhjaRrrmHqaMGShnQfLPy147kSxY1Q Bz3w== X-Gm-Message-State: AOAM532TzhEDsvQIM3MSHuYm3wPn7Pw+H46AO41BbNHYwNl+TI1ubja7 SzOZkBKWO7IEZ9SvLrmimQMOg0QuheQ8dD98 X-Google-Smtp-Source: ABdhPJyN5unj5rLtoXzfox4mXS2M3S/SaZl+8R1nGGjQ6/HS4oOUtG9N8+ab9YhNGQBGWUztUka8v9nB9tQGSTvy X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4527:: with SMTP id l7mr20524343qvu.2.1600204589991; Tue, 15 Sep 2020 14:16:29 -0700 (PDT) Date: Tue, 15 Sep 2020 23:15:45 +0200 In-Reply-To: Message-Id: <6ad13f9f94e1a2f84f603e0e374582b89a44a75e.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 03/37] 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-Rspamd-Queue-Id: 21B7F1005DE99 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 --- Change-Id: I864be75a88b91b443c55e9c2042865e15703e164 --- include/linux/kasan.h | 44 ++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index bd5b4965a269..44a9aae44138 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -3,16 +3,24 @@ #define _LINUX_KASAN_H #include +#include struct kmem_cache; struct page; struct vm_struct; struct task_struct; -#ifdef CONFIG_KASAN +#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 +37,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 +94,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 +159,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 +166,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 +180,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.618.gf4bc123cb7-goog