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=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 06303C4742C for ; Mon, 16 Nov 2020 15:45:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6DB3B2078E for ; Mon, 16 Nov 2020 15:45:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="C4zcZnUO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DB3B2078E 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 94B816B0078; Mon, 16 Nov 2020 10:45:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D33A6B007B; Mon, 16 Nov 2020 10:45:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 773C96B007D; Mon, 16 Nov 2020 10:45:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 3CECB6B0078 for ; Mon, 16 Nov 2020 10:45:26 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C8F338249980 for ; Mon, 16 Nov 2020 15:45:25 +0000 (UTC) X-FDA: 77490705810.18.ear23_2b13bd22732a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 881B0100ED3D0 for ; Mon, 16 Nov 2020 15:45:25 +0000 (UTC) X-HE-Tag: ear23_2b13bd22732a X-Filterd-Recvd-Size: 7581 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 16 Nov 2020 15:45:24 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id h2so24176353wmm.0 for ; Mon, 16 Nov 2020 07:45:24 -0800 (PST) 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=KbFqzMvWkwy7nQ4a/oXAq0hKgif40IyQfOuqmDIS5m0=; b=C4zcZnUOBUlYavXgkmhztysqv+lt/KIffwhcnzK2ETTGlQbv5gWCnIw7Ey0Ej8u8UJ zHJnaO7sle5chY/EkWyzM0KgeeIgzLwDk+PVLxkYr/+JgGOzzvneRMq5Sl2dTVty7w8S 0ZLyZwtzk0wOe98xMC0w3Jjm9PZtgvFandJpz2PG2wzQX6nGCQTaJ6yixXzJL1Q6FDiK lSohOQ7CoVcVUlAZQJuM6lTN9uOfU33esKvS/dlmsRKkPmfW3U93/C4FgQGYpXx7c3EH 8o776dW3f/36hutiF9yDVk6xP3CncUKi0mQpTygVuax/nXf757x6FmCkbgb0ST5bY+oB 2c9A== 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=KbFqzMvWkwy7nQ4a/oXAq0hKgif40IyQfOuqmDIS5m0=; b=oH0wbU4x7liBVuWrQi81Aksc7OftiwfG6Fth6nC479Ql1YqW83AOaeP2gouKoNuM4i EU0ymYsu72+Q8DUgVu+EndDiGxS4qCihbz8YP2Ms+a7E+dPaWPjF0i/MPxnk1AKkuWwz 87oPBhTLDKrRAmwWlmTq9/3Ogo2fyuLZLUomVX2GDm2Q13NffJdND6F/iI+CGygemLfJ n7RJaRkp+6q1phS/H2qPWFghZ+kzn1FkA6sFa5/YZaqEIwGX4fXl6UuSnfhLiL0xrKp6 0TwJqBigR0Lz2Cpo4GNuXesxpPWKE9OLRyaun/52pj8z1AqtM6mKODQorIrsWV194sjy 8A5A== X-Gm-Message-State: AOAM532hrlkjZeX6SYAa39uDwa1ZyFdJGzAjy7tQd/gTTdABUhM7TU2q 2Byji9ma2t1P65Y5zFwa57ES/w== X-Google-Smtp-Source: ABdhPJxy1Yn9VRBEdUbtcQKiw7w0OFwQsb6saiT5KDQPwGECAmrFhdKV3SE1tEy0gi/FDLvyz7GAkw== X-Received: by 2002:a1c:f20d:: with SMTP id s13mr16738373wmc.156.1605541523649; Mon, 16 Nov 2020 07:45:23 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id h62sm23337450wrh.82.2020.11.16.07.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:45:22 -0800 (PST) Date: Mon, 16 Nov 2020 16:45:17 +0100 From: Marco Elver To: Andrey Konovalov Cc: Andrew Morton , Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH mm v3 18/19] kasan, mm: allow cache merging with no metadata Message-ID: <20201116154517.GG1357314@elver.google.com> References: <6f0a1e72783ddac000ac08e7315b1d7c0ca4ec51.1605305978.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6f0a1e72783ddac000ac08e7315b1d7c0ca4ec51.1605305978.git.andreyknvl@google.com> User-Agent: Mutt/1.14.6 (2020-07-11) 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, Nov 13, 2020 at 11:20PM +0100, Andrey Konovalov wrote: > The reason cache merging is disabled with KASAN is because KASAN puts its > metadata right after the allocated object. When the merged caches have > slightly different sizes, the metadata ends up in different places, which > KASAN doesn't support. > > It might be possible to adjust the metadata allocation algorithm and make > it friendly to the cache merging code. Instead this change takes a simpler > approach and allows merging caches when no metadata is present. Which is > the case for hardware tag-based KASAN with kasan.mode=prod. > > Co-developed-by: Vincenzo Frascino > Signed-off-by: Vincenzo Frascino > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/Ia114847dfb2244f297d2cb82d592bf6a07455dba Reviewed-by: Marco Elver > --- > include/linux/kasan.h | 21 +++++++++++++++++++-- > mm/kasan/common.c | 11 +++++++++++ > mm/slab_common.c | 3 ++- > 3 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 16cf53eac29b..173a8e81d001 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -81,17 +81,30 @@ struct kasan_cache { > }; > > #ifdef CONFIG_KASAN_HW_TAGS > + > DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); > + > static __always_inline bool kasan_enabled(void) > { > return static_branch_likely(&kasan_flag_enabled); > } > -#else > + > +#else /* CONFIG_KASAN_HW_TAGS */ > + > static inline bool kasan_enabled(void) > { > return true; > } > -#endif > + > +#endif /* CONFIG_KASAN_HW_TAGS */ > + > +slab_flags_t __kasan_never_merge(void); > +static __always_inline slab_flags_t kasan_never_merge(void) > +{ > + if (kasan_enabled()) > + return __kasan_never_merge(); > + return 0; > +} > > void __kasan_unpoison_range(const void *addr, size_t size); > static __always_inline void kasan_unpoison_range(const void *addr, size_t size) > @@ -238,6 +251,10 @@ static inline bool kasan_enabled(void) > { > return false; > } > +static inline slab_flags_t kasan_never_merge(void) > +{ > + return 0; > +} > static inline void kasan_unpoison_range(const void *address, size_t size) {} > static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} > static inline void kasan_free_pages(struct page *page, unsigned int order) {} > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index cf874243efab..a5a4dcb1254d 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -87,6 +87,17 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark) > } > #endif /* CONFIG_KASAN_STACK */ > > +/* > + * Only allow cache merging when stack collection is disabled and no metadata > + * is present. > + */ > +slab_flags_t __kasan_never_merge(void) > +{ > + if (kasan_stack_collection_enabled()) > + return SLAB_KASAN; > + return 0; > +} > + > void __kasan_alloc_pages(struct page *page, unsigned int order) > { > u8 tag; > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 0b5ae1819a8b..075b23ce94ec 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -54,7 +55,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, > */ > #define SLAB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ > SLAB_TRACE | SLAB_TYPESAFE_BY_RCU | SLAB_NOLEAKTRACE | \ > - SLAB_FAILSLAB | SLAB_KASAN) > + SLAB_FAILSLAB | kasan_never_merge()) > > #define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ > SLAB_CACHE_DMA32 | SLAB_ACCOUNT) > -- > 2.29.2.299.gdc1121823c-goog >