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, 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 7B2F7C388F9 for ; Wed, 11 Nov 2020 15:13:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BCBF7206A1 for ; Wed, 11 Nov 2020 15:13:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gCOH6uGa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCBF7206A1 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 BB1CB6B0070; Wed, 11 Nov 2020 10:13:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B643B6B0073; Wed, 11 Nov 2020 10:13:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A79C46B0074; Wed, 11 Nov 2020 10:13:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id 7BBC36B0070 for ; Wed, 11 Nov 2020 10:13:45 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 268581EE6 for ; Wed, 11 Nov 2020 15:13:45 +0000 (UTC) X-FDA: 77472482010.08.doll40_2509e82272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id EB02C1819E764 for ; Wed, 11 Nov 2020 15:13:44 +0000 (UTC) X-HE-Tag: doll40_2509e82272fe X-Filterd-Recvd-Size: 9205 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 15:13:44 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id c17so2828938wrc.11 for ; Wed, 11 Nov 2020 07:13:43 -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=p+INv8JEk5XPkG3ax0MxxlvUdmFmE55+jTOg5CXTsRM=; b=gCOH6uGacfEGAlGZE5LqTC3tTkpdWZ1awdWHzQ8/nU3bavxaDN+dvvIqQQCDtIn4E+ 3RccuUGS3SlpCsZL/zgllI5FQey6ukHD5asCGHApC5TICTWXprEaVlcXu2mVzAOmVa7V yqOtn83ZQdRPRd+UiACgcmhKaDL7eaaGlxYTZR5MyymcXS1t4tK7TA7FJKeeq1UidxBT ybeMeXhNb63l2HWe8omDpdT3bOXVwQR3Lv/8z5U7wSeqbCrsknV92vkmuZSayjkuTYyk 2N7rCakFWaEz6IlkpMF+r2qYsZUYOydIB4wG/GN4dNOblyjF/AUDbQEXxiCanhKBuXXi Upjg== 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=p+INv8JEk5XPkG3ax0MxxlvUdmFmE55+jTOg5CXTsRM=; b=E/QNPdQweVU5iAKMZcPmvPpy1BFYp1IHUtTzBV35n1mBwOVZjI08lI8spt+NdTZ05P KSeHyNFGB/6BfuhMpCo50gFAHF/FzEudMmDWWgDiqpmDQ5giehpNNcVUs4QXjzWsoIbx XJDAEbBDOuKv3sNzOR4vWZIkakv6qYwoQ125slTMt0aXuReo2GURWSMMEUQ9zr36hGMN cp5wl4uRKkGpvD7hV1wz338g08iSC8nJt6sFLz+avhSZz5St4nzDSticpbabTHJc5SlP Juo6w2BXoSIc7TwWH8QvepQbol4lYu/fQ3gOtow8Bdu5RMDOxRDNd7WQz7L2K9LMBoA2 ilpg== X-Gm-Message-State: AOAM531Qif2p/Ks6l8qkLtbtRoK/MwIWBM87CBns8rIMZq++8ePnTpEy 7a6yWoolGF9ei9rkZGzfmpC5Uw== X-Google-Smtp-Source: ABdhPJyT0sGWjPC6z/N8eDyDtVf0jkrEfp0riVXnnt/LmxwMaGfpcHd9dqUAYqGcWbLufSEkVWMBFg== X-Received: by 2002:adf:db4a:: with SMTP id f10mr15496651wrj.420.1605107622540; Wed, 11 Nov 2020 07:13:42 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id p13sm2763952wrt.73.2020.11.11.07.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 07:13:41 -0800 (PST) Date: Wed, 11 Nov 2020 16:13:36 +0100 From: Marco Elver To: Andrey Konovalov Cc: Dmitry Vyukov , Alexander Potapenko , Catalin Marinas , Will Deacon , Vincenzo Frascino , Evgenii Stepanov , Andrey Ryabinin , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 19/20] kasan, mm: allow cache merging with no metadata Message-ID: <20201111151336.GA517454@elver.google.com> References: <936c0c198145b663e031527c49a6895bd21ac3a0.1605046662.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <936c0c198145b663e031527c49a6895bd21ac3a0.1605046662.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 Tue, Nov 10, 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. > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/Ia114847dfb2244f297d2cb82d592bf6a07455dba > --- > include/linux/kasan.h | 26 ++++++++++++++++++++++++-- > mm/kasan/common.c | 11 +++++++++++ > mm/slab_common.c | 11 ++++++++--- > 3 files changed, 43 insertions(+), 5 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 534ab3e2935a..c754eca356f7 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -81,17 +81,35 @@ struct kasan_cache { > }; > > #ifdef CONFIG_KASAN_HW_TAGS > + > DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); > + > static inline kasan_enabled(void) > { > return static_branch_likely(&kasan_flag_enabled); > } > -#else > + > +slab_flags_t __kasan_never_merge(slab_flags_t flags); > +static inline slab_flags_t kasan_never_merge(slab_flags_t flags) > +{ > + if (kasan_enabled()) > + return __kasan_never_merge(flags); > + return flags; > +} > + > +#else /* CONFIG_KASAN_HW_TAGS */ > + > static inline kasan_enabled(void) > { > return true; > } > -#endif > + > +static inline slab_flags_t kasan_never_merge(slab_flags_t flags) > +{ > + return flags; > +} > + > +#endif /* CONFIG_KASAN_HW_TAGS */ > > void __kasan_alloc_pages(struct page *page, unsigned int order); > static inline void kasan_alloc_pages(struct page *page, unsigned int order) > @@ -240,6 +258,10 @@ static inline kasan_enabled(void) > { > return false; > } > +static inline slab_flags_t kasan_never_merge(slab_flags_t flags) > +{ > + return flags; > +} > static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} > static inline void kasan_free_pages(struct page *page, unsigned int order) {} > static inline void kasan_cache_create(struct kmem_cache *cache, > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 940b42231069..25b18c145b06 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -81,6 +81,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(slab_flags_t flags) > +{ > + if (kasan_stack_collection_enabled()) > + return flags; > + return flags & ~SLAB_KASAN; > +} > + > 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 f1b0c4a22f08..3042ee8ea9ce 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -49,12 +50,16 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, > slab_caches_to_rcu_destroy_workfn); > > /* > - * Set of flags that will prevent slab merging > + * Set of flags that will prevent slab merging. > + * Use slab_never_merge() instead. > */ > #define SLAB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ > SLAB_TRACE | SLAB_TYPESAFE_BY_RCU | SLAB_NOLEAKTRACE | \ > SLAB_FAILSLAB | SLAB_KASAN) Rather than changing this to require using slab_never_merge() which removes SLAB_KASAN, could we not just have a function kasan_never_merge() that returns KASAN-specific flags that should never result in merging -- because as-is now, making kasan_never_merge() remove the SLAB_KASAN flag seems the wrong way around. Could we not just do this: #define SLAB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ SLAB_TRACE | SLAB_TYPESAFE_BY_RCU | SLAB_NOLEAKTRACE | \ SLAB_FAILSLAB | kasan_never_merge()) ?? Of course that might be problematic if this always needs to be a compile-time constant, but currently that's not a requirement. > +/* KASAN allows merging in some configurations and will remove SLAB_KASAN. */ > +#define slab_never_merge() (kasan_never_merge(SLAB_NEVER_MERGE)) Braces unnecessary. > #define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ > SLAB_CACHE_DMA32 | SLAB_ACCOUNT) > > @@ -164,7 +169,7 @@ static unsigned int calculate_alignment(slab_flags_t flags, > */ > int slab_unmergeable(struct kmem_cache *s) > { > - if (slab_nomerge || (s->flags & SLAB_NEVER_MERGE)) > + if (slab_nomerge || (s->flags & slab_never_merge())) > return 1; > > if (s->ctor) > @@ -198,7 +203,7 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, > size = ALIGN(size, align); > flags = kmem_cache_flags(size, flags, name, NULL); > > - if (flags & SLAB_NEVER_MERGE) > + if (flags & slab_never_merge()) > return NULL; > > list_for_each_entry_reverse(s, &slab_caches, list) { > -- > 2.29.2.222.g5d2a92d10f8-goog >