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=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 3EC4EC2D0E4 for ; Tue, 17 Nov 2020 13:27:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ACE292078E for ; Tue, 17 Nov 2020 13:27:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cSdVDoum"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Ws9G6B7b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACE292078E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Fs/z9wxoMawiE6GF/uOTu3+icG8atIdqJiaIyNQQE/Y=; b=cSdVDoum6fR+TCs2UJVNpudRZ lXOxHwNdjEqClmF8DP859EzxlJjOh8wLrKSkfliM9mPktaBK+fZKrmfpl2+OxbZAzEC6qldU79/eM rKWYuHj4ezIYpqkWZRCBlTAoUbSzSUdOXzU+cYWvoee77bLEL+m0LRfej1Akb/mYQiG+/sPzP7IOW hF/LEkbRwvcWiLFVMQPatfro3SwbO7P5rWGrsQKqPppa0xKGj+xMlswXm9WwxhAU6x4+bHIXikGCL 381kzKcUD+oZPC/yOrDNzQJ/wpSxNHiYO3qzpGRR3Hc51ETA2OPrm51C6cExKq0P2pgVonWAqbbhE rGmsbOY7w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kf0zP-0002Zl-NK; Tue, 17 Nov 2020 13:25:43 +0000 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kf0zM-0002YI-42 for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2020 13:25:41 +0000 Received: by mail-qk1-x744.google.com with SMTP id k4so10314840qko.13 for ; Tue, 17 Nov 2020 05:25:39 -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; bh=WIETnv3xre8DddqB3eoABg/F+YsdxEpmfCm9JSQKUFk=; b=Ws9G6B7b9T2ql8gNctR3OGyYWvuBi6KB9dYkvha/s4Fdy+VKgIhfUwaNglXhaP6T1e 6QlEGtPHpVS2HMAOYaPpmPDgZ/FKLEV2qVeOHRnL55hiJ45OYnjJp9cEq4LI1ujP1ywv MGtBEhMlob6/Aon+sdujY3CV5/Rw5Eh5tzfEBdx1i+UsA9/39T76sFL1Mq4/OPOdUqqB Z7k1KFGI8V/Zm9VsGDv6GszybCCSg1/KTFJHXqWY37xtH+4qKxRrSvYG6HE72PMu71BY 1GsK03br4KCOGeQPO3QHSfAxPeHtnCmC+y5DYWSEklCdfF475a0BAWQQ4cVFTPllxTN/ m6Wg== 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; bh=WIETnv3xre8DddqB3eoABg/F+YsdxEpmfCm9JSQKUFk=; b=kfQLt369jZslWc0U9oEqvb3P9hq+7bh6QgrDw34cFYBzwnqDNpYTpO52RF45P/Wjgh px5RhTe8mROhGkWDLzl3wo9TZNsH2LNz28ps0I/ITdUuuPZcmSklMofjN4kJkEv6utVS OtSmgxYE1yWFZqlGFf4jAzjQHQoCPuP2P3ju+XJR59Uz3y13AAqIMDbovTLhbJraVmC1 eLoy4TicsnxgpDV2Dy3B5dBuxRTwTqtPU+uEpSBv8uDi+8YTPdBQWtnMO8Q9l+l/qLv1 PB+n593e2abfVNx6yu6nSF7eFbGPCCV6Uqq3mpEyicPfBPixHltYAMFqx+FEUlqMyZa4 Lj4A== X-Gm-Message-State: AOAM533w0ZZdwjgNUq2N2/aZ9hvHiYwlq0JtJi9JLWh6j8XQe7MKdC3u vIQvEce4aijg3La0sO6VOAb2nMRUxsyMjLV1ykWjvw== X-Google-Smtp-Source: ABdhPJxyYRSCHeuJLL6jo54bMELiM3vOiXgrTULSLW30Z9NUQKn0110b8QbG6skCbWCzpB52giTilG3a1QL9Mb0/h7o= X-Received: by 2002:a37:9747:: with SMTP id z68mr18952443qkd.424.1605619538042; Tue, 17 Nov 2020 05:25:38 -0800 (PST) MIME-Version: 1.0 References: <6f0a1e72783ddac000ac08e7315b1d7c0ca4ec51.1605305978.git.andreyknvl@google.com> In-Reply-To: <6f0a1e72783ddac000ac08e7315b1d7c0ca4ec51.1605305978.git.andreyknvl@google.com> From: Dmitry Vyukov Date: Tue, 17 Nov 2020 14:25:26 +0100 Message-ID: Subject: Re: [PATCH mm v3 18/19] kasan, mm: allow cache merging with no metadata To: Andrey Konovalov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201117_082540_247091_92831A96 X-CRM114-Status: GOOD ( 25.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Linux-MM , Alexander Potapenko , Linux ARM , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 13, 2020 at 11:20 PM 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 Somehow gerrit contains an old version... so I was going to independently propose what Marco already proposed as simplification... until I looked at the patch in the email :) Reviewed-by: Dmitry Vyukov > --- > 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel