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=-17.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, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 B8F47C388F9 for ; Wed, 11 Nov 2020 13:22:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E782E20756 for ; Wed, 11 Nov 2020 13:22:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="I8TMNct/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E782E20756 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 356E66B0068; Wed, 11 Nov 2020 08:22:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 32D896B006C; Wed, 11 Nov 2020 08:22:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2468D6B006E; Wed, 11 Nov 2020 08:22:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0253.hostedemail.com [216.40.44.253]) by kanga.kvack.org (Postfix) with ESMTP id EC3116B0068 for ; Wed, 11 Nov 2020 08:22:06 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 945D1180AD804 for ; Wed, 11 Nov 2020 13:22:06 +0000 (UTC) X-FDA: 77472200652.17.sand19_610295e272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 75083180D0184 for ; Wed, 11 Nov 2020 13:22:06 +0000 (UTC) X-HE-Tag: sand19_610295e272fe X-Filterd-Recvd-Size: 11096 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 13:22:05 +0000 (UTC) Received: by mail-qv1-f66.google.com with SMTP id ek7so839135qvb.6 for ; Wed, 11 Nov 2020 05:22:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=+bz5ZIdNzpU0ai7uZOTCO8K/nvk/MwhwV4tVntYFBxU=; b=I8TMNct/OSdKmpCOZ3HD9K/tKxJD1ALDaOzC8e/kyKSXEbezfBMmhXlgFNEgKcQgO7 0q3ZMqUHniCGv7KpPfamJDyg+yOJqEETrhZw5X7OaqowclTbLzp2ZerMUmMFmIHVGXPC FUauCeETbbipXOU9j29RkqxQPiU+rIvZO5H4etJjIA4VUKnV6yfTZGH/NaZZvX2/s9EQ cvM6Bz8aW1UWw0owW1hjmbMA06tAUreB+WH+u6FZlvNdO+cZsi2ulbecrXKyrxG7KK4B rlyfOF90AtXOuE9zeNms7c0DzfM0UN+IFUvEZedz3Ij9/NrWIfHK4N6YVSYstJpCc+g4 Qzyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=+bz5ZIdNzpU0ai7uZOTCO8K/nvk/MwhwV4tVntYFBxU=; b=HqJvLN/Us2CutjzQdIITZy7n5puUQFOiyIXZsD4f18Ets0jtLc+NsU3E4tD+eEc2f7 3mcBEdHHZd/V9xuxIdMn6r7wstx64qTbmzJ1Xn/3108GxEyz91vQG4vwO/paFV8mL1Si 9emnGTgu42dYfW/Ln7TsEn9j7WOh/UEJS8cFykD6He5BIOetKU/bOyHM3Ny714XWwz4N KOMadZv1hMdmJryLaLNua7SvnmMXNjSH+DmOe0vkNnkRI5RlMzmw888FDqFVVNO7nujt kNOHathHQmDplvbV/MEvQGBmBduYRLtSAI+yQ9DFVrjDOCs4zq0AMoK/XaAZENGnRier cwQw== X-Gm-Message-State: AOAM531nm3eZZ8JwZK7WvdBpyc00JpLvBaOKgcoJ7XR0BYelrTnbWMwp /6XT1NdY5GbuI9cHPUDnj6eyzHFVUFO8o6GWiSIR3Q== X-Google-Smtp-Source: ABdhPJwe8xPs0etNN1pHXsV4nXiqxllXHt2B3lVDekaoqd041s/GEY/SgbNHtKb2osgsT7DLYBjv1i2wkRgxVmIyELQ= X-Received: by 2002:a05:6214:d43:: with SMTP id 3mr3584715qvr.38.1605100924596; Wed, 11 Nov 2020 05:22:04 -0800 (PST) MIME-Version: 1.0 References: <4d261d4cbd9842c51cb6f9b36cadc9054cabe86b.1605046192.git.andreyknvl@google.com> In-Reply-To: <4d261d4cbd9842c51cb6f9b36cadc9054cabe86b.1605046192.git.andreyknvl@google.com> From: Alexander Potapenko Date: Wed, 11 Nov 2020 14:21:52 +0100 Message-ID: Subject: Re: [PATCH v9 03/44] kasan: group vmalloc code To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 Tue, Nov 10, 2020 at 11:11 PM Andrey Konovalov w= rote: > > 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 Reviewed-by: Alexander Potapenko > --- > 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 30d343b4a40a..59538e795df4 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -75,19 +75,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); > > @@ -156,9 +143,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; > @@ -211,13 +195,16 @@ static inline void *kasan_reset_tag(const void *add= r) > #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) > { > @@ -232,7 +219,25 @@ static inline void kasan_release_vmalloc(unsigned lo= ng 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 =3D (unsigned long)kasan_mem_to_shadow(addr); > - scaled_size =3D (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_= SHIFT; > - shadow_size =3D round_up(scaled_size, PAGE_SIZE); > - > - if (WARN_ON(!PAGE_ALIGNED(shadow_start))) > - return -EINVAL; > - > - ret =3D __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 |=3D 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, unsi= gned 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 =3D (unsigned long)kasan_mem_to_shadow(addr); > + scaled_size =3D (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_= SHIFT; > + shadow_size =3D round_up(scaled_size, PAGE_SIZE); > + > + if (WARN_ON(!PAGE_ALIGNED(shadow_start))) > + return -EINVAL; > + > + ret =3D __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 |=3D 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.29.2.222.g5d2a92d10f8-goog > --=20 Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Stra=C3=9Fe, 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg