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=-18.9 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, URIBL_BLOCKED,USER_AGENT_SANE_1,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 5754AC47420 for ; Thu, 1 Oct 2020 17:27:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7370221EF for ; Thu, 1 Oct 2020 17:27:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UbnsuLPi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7370221EF 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 25EC1900009; Thu, 1 Oct 2020 13:27:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20F10900003; Thu, 1 Oct 2020 13:27:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 125BE900009; Thu, 1 Oct 2020 13:27:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id D96C5900003 for ; Thu, 1 Oct 2020 13:27:43 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 71AB4824999B for ; Thu, 1 Oct 2020 17:27:43 +0000 (UTC) X-FDA: 77324038806.05.jam30_470a2742719d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 5104E1801E392 for ; Thu, 1 Oct 2020 17:27:43 +0000 (UTC) X-HE-Tag: jam30_470a2742719d X-Filterd-Recvd-Size: 10222 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 17:27:42 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id e16so6749581wrm.2 for ; Thu, 01 Oct 2020 10:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=z6gRseKf/QBoG3LPhRd6/dtXrjTURXY+qNj3glhnuQo=; b=UbnsuLPi5hU64uZg9IXopaK3JdjQM0OaDR9n4BFkhsiLIz3aqWk1BLa4jxuK85MBYE WhpGKDWx74cUHxAWb1RcUq/BQotQD6VRCRsUy7oTAgacJ02M+lerEQAe8Gbc+ce4fDKz hC0g0vdS0XIg6jmOxkeiWme9MgBoi/8ZFfuEOIdj6AOAL0OlvG78OUG/LPhEukVPfrub s5HUU+ytoKF/IksTibXXMHYTDumW3ZxGFYZ9jiWmhLB2sxjZruz0ZvREaS5HvpUdFUlx YNKMspCQU+nKI/KUSZFjX04OlU9nJR7sEWCnO0a6vX8I2xa10BHM/PB2RU6Ro1c39mbu PEPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=z6gRseKf/QBoG3LPhRd6/dtXrjTURXY+qNj3glhnuQo=; b=XAYmKzd6WxpqY6kZZ6Pu/jmy8kP8xC69J4psouEqdvbLFwXhlwtsZ1zRpzSD2dTO4t wD5RWTmKD+PgpEj/SyGGgScLOcMBu0K1vPpI0HrdGECNZRrhVAzt6Tki7sp371Waeo0L tN3CEk+9FdrdWF1moQ5nCMkMOKo/eO0evabYjUoW8Rl9O+tbEb6wb7DQYRxMYCCSWCXg IYZTKAi1dCZ9FpS55GMmZ4E0NPKirxaUytbcEYhwX9XBb0xM1eNRJrp1LO6LRUTr50Ay QX8uWGmFjNYqlbQgOiPEVtg6Q4iFJMN0Q03321OH6jKi4TTDrsrcL52a3sS/Z6RRSLcp k5oA== X-Gm-Message-State: AOAM530dIAyuEP2ZUo2K0cVZQSQHExkzbvWjP6v1XdFJABpRUZnEXx5i 00qOwz+tSns86qaHktjtnAbAtg== X-Google-Smtp-Source: ABdhPJx4A6tTU5GGX3z/cw+YnaHIuzcei1dwoeDaJQ+rtSh9ar+uXSKPfDSE0hWaOJVeE/cDssWWlw== X-Received: by 2002:adf:dd0b:: with SMTP id a11mr9987807wrm.422.1601573260984; Thu, 01 Oct 2020 10:27:40 -0700 (PDT) Received: from elver.google.com ([100.105.32.75]) by smtp.gmail.com with ESMTPSA id p3sm772060wmm.40.2020.10.01.10.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 10:27:40 -0700 (PDT) Date: Thu, 1 Oct 2020 19:27:34 +0200 From: elver@google.com To: Andrey Konovalov Cc: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com, Andrey Ryabinin , Alexander Potapenko , 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 Subject: Re: [PATCH v3 03/39] kasan: group vmalloc code Message-ID: <20201001172734.GA4162920@elver.google.com> References: <4f59e6ddef35c6a3b93b0951a47e7e9b8a680667.1600987622.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4f59e6ddef35c6a3b93b0951a47e7e9b8a680667.1600987622.git.andreyknvl@google.com> User-Agent: Mutt/1.14.5 (2020-06-23) 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: On Fri, Sep 25, 2020 at 12:50AM +0200, Andrey Konovalov wrote: > This is a preparatory commit for the upcoming addition of a new hardware > tag-based (MTE-based) KASAN mode. > > Group all vmalloc-related function declarations in include/linux/kasan.h, > and their implementations in mm/kasan/common.c. > > No functional changes. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver > --- > Change-Id: Ie20b6c689203cd6de4fd7f2c465ec081c00c5f15 > --- > include/linux/kasan.h | 41 +++++++++++++---------- > mm/kasan/common.c | 78 ++++++++++++++++++++++--------------------- > 2 files changed, 63 insertions(+), 56 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 087fba34b209..bd5b4965a269 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -69,19 +69,6 @@ struct kasan_cache { > int free_meta_offset; > }; > > -/* > - * These functions provide a special case to support backing module > - * allocations with real shadow memory. With KASAN vmalloc, the special > - * case is unnecessary, as the work is handled in the generic case. > - */ > -#ifndef CONFIG_KASAN_VMALLOC > -int kasan_module_alloc(void *addr, size_t size); > -void kasan_free_shadow(const struct vm_struct *vm); > -#else > -static inline int kasan_module_alloc(void *addr, size_t size) { return 0; } > -static inline void kasan_free_shadow(const struct vm_struct *vm) {} > -#endif > - > int kasan_add_zero_shadow(void *start, unsigned long size); > void kasan_remove_zero_shadow(void *start, unsigned long size); > > @@ -150,9 +137,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, > return false; > } > > -static inline int kasan_module_alloc(void *addr, size_t size) { return 0; } > -static inline void kasan_free_shadow(const struct vm_struct *vm) {} > - > static inline int kasan_add_zero_shadow(void *start, unsigned long size) > { > return 0; > @@ -205,13 +189,16 @@ static inline void *kasan_reset_tag(const void *addr) > #endif /* CONFIG_KASAN_SW_TAGS */ > > #ifdef CONFIG_KASAN_VMALLOC > + > int kasan_populate_vmalloc(unsigned long addr, unsigned long size); > void kasan_poison_vmalloc(const void *start, unsigned long size); > void kasan_unpoison_vmalloc(const void *start, unsigned long size); > void kasan_release_vmalloc(unsigned long start, unsigned long end, > unsigned long free_region_start, > unsigned long free_region_end); > -#else > + > +#else /* CONFIG_KASAN_VMALLOC */ > + > static inline int kasan_populate_vmalloc(unsigned long start, > unsigned long size) > { > @@ -226,7 +213,25 @@ static inline void kasan_release_vmalloc(unsigned long start, > unsigned long end, > unsigned long free_region_start, > unsigned long free_region_end) {} > -#endif > + > +#endif /* CONFIG_KASAN_VMALLOC */ > + > +#if defined(CONFIG_KASAN) && !defined(CONFIG_KASAN_VMALLOC) > + > +/* > + * These functions provide a special case to support backing module > + * allocations with real shadow memory. With KASAN vmalloc, the special > + * case is unnecessary, as the work is handled in the generic case. > + */ > +int kasan_module_alloc(void *addr, size_t size); > +void kasan_free_shadow(const struct vm_struct *vm); > + > +#else /* CONFIG_KASAN && !CONFIG_KASAN_VMALLOC */ > + > +static inline int kasan_module_alloc(void *addr, size_t size) { return 0; } > +static inline void kasan_free_shadow(const struct vm_struct *vm) {} > + > +#endif /* CONFIG_KASAN && !CONFIG_KASAN_VMALLOC */ > > #ifdef CONFIG_KASAN_INLINE > void kasan_non_canonical_hook(unsigned long addr); > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 33d863f55db1..89e5ef9417a7 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -536,44 +536,6 @@ void kasan_kfree_large(void *ptr, unsigned long ip) > /* The object will be poisoned by page_alloc. */ > } > > -#ifndef CONFIG_KASAN_VMALLOC > -int kasan_module_alloc(void *addr, size_t size) > -{ > - void *ret; > - size_t scaled_size; > - size_t shadow_size; > - unsigned long shadow_start; > - > - shadow_start = (unsigned long)kasan_mem_to_shadow(addr); > - scaled_size = (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_SHIFT; > - shadow_size = round_up(scaled_size, PAGE_SIZE); > - > - if (WARN_ON(!PAGE_ALIGNED(shadow_start))) > - return -EINVAL; > - > - ret = __vmalloc_node_range(shadow_size, 1, shadow_start, > - shadow_start + shadow_size, > - GFP_KERNEL, > - PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE, > - __builtin_return_address(0)); > - > - if (ret) { > - __memset(ret, KASAN_SHADOW_INIT, shadow_size); > - find_vm_area(addr)->flags |= VM_KASAN; > - kmemleak_ignore(ret); > - return 0; > - } > - > - return -ENOMEM; > -} > - > -void kasan_free_shadow(const struct vm_struct *vm) > -{ > - if (vm->flags & VM_KASAN) > - vfree(kasan_mem_to_shadow(vm->addr)); > -} > -#endif > - > #ifdef CONFIG_MEMORY_HOTPLUG > static bool shadow_mapped(unsigned long addr) > { > @@ -685,6 +647,7 @@ core_initcall(kasan_memhotplug_init); > #endif > > #ifdef CONFIG_KASAN_VMALLOC > + > static int kasan_populate_vmalloc_pte(pte_t *ptep, unsigned long addr, > void *unused) > { > @@ -923,4 +886,43 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, > (unsigned long)shadow_end); > } > } > + > +#else /* CONFIG_KASAN_VMALLOC */ > + > +int kasan_module_alloc(void *addr, size_t size) > +{ > + void *ret; > + size_t scaled_size; > + size_t shadow_size; > + unsigned long shadow_start; > + > + shadow_start = (unsigned long)kasan_mem_to_shadow(addr); > + scaled_size = (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_SHIFT; > + shadow_size = round_up(scaled_size, PAGE_SIZE); > + > + if (WARN_ON(!PAGE_ALIGNED(shadow_start))) > + return -EINVAL; > + > + ret = __vmalloc_node_range(shadow_size, 1, shadow_start, > + shadow_start + shadow_size, > + GFP_KERNEL, > + PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE, > + __builtin_return_address(0)); > + > + if (ret) { > + __memset(ret, KASAN_SHADOW_INIT, shadow_size); > + find_vm_area(addr)->flags |= VM_KASAN; > + kmemleak_ignore(ret); > + return 0; > + } > + > + return -ENOMEM; > +} > + > +void kasan_free_shadow(const struct vm_struct *vm) > +{ > + if (vm->flags & VM_KASAN) > + vfree(kasan_mem_to_shadow(vm->addr)); > +} > + > #endif > -- > 2.28.0.681.g6f77f65b4e-goog >