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 60C76C00A89 for ; Mon, 2 Nov 2020 15:18:41 +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 D6E362222B for ; Mon, 2 Nov 2020 15:18:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lF9z/Agm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="DkhU/qMV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6E362222B 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=pw0rWhn28+RrnOAN8M+sba/YbYZZCGUkNNKp+kPq9Es=; b=lF9z/AgmW1CUAV++4u+VHLs7P FZr7yJTzBZ3oQczDKwHvQ2uyBYoPlmDq2H5+86Wf0qKT1/mw6JUiVWWcNgvX9tJ3jcV85If/IBgAu fv+tCd6NwFx+fv52jD7o+cveDVmWvg4g1n90k2GLDPRd0CmzsLyr9XeAFLfDwiBJVOPZgnSzbyXjp 9UiFUV7U39HgSmj+I8Czf0Gmb/Ygy5QC+Jt3WmRLF05TNKckvnYicfOrVimi8t/Tfl/z96/ivQBaw Oq5+vBYwQnBvaHb9g1Xzz3CrF50jqVmc0p/vrMwQUYxPl0ojV7i9eo6DC2rmlB+VPskncSz3lKRFS BCp6JB+Ig==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZbaF-0008R9-Sx; Mon, 02 Nov 2020 15:17:23 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZbaB-0008PJ-M8 for linux-arm-kernel@lists.infradead.org; Mon, 02 Nov 2020 15:17:22 +0000 Received: by mail-pf1-x441.google.com with SMTP id 10so11374794pfp.5 for ; Mon, 02 Nov 2020 07:17:17 -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=3SSjI8L6tAN7wnaresierGkcZcom6o46dDNzyiPHjlU=; b=DkhU/qMVrvN1fx4wAGkNA9axcRMaO84W+G/hRGQCobjjbFdT50hJC+Y0P1+WsLC/fC nQjYHCHoPj9rXVGzQWB7TF3L7FxjLAfh1rLJIGaWPqojCrRG0UyO/MrQueQN3REsMBzk xy1+ZQCYCtioNMDJCLMNTShS0wp/dl83ZmeYPRRQTr9bOuUbhQ7KBGqBzCZmwqZde+3U OjIDIuDW4ct8N6zFiAhT3BmW1YmvSSl3Ned6jfQhv2SiRUlcE8mMSszc2T9KHg5xG3gl OJI2jAfwQkYpHdrke4KFyQMb2LyDzkNTrO/VuDGvlmGcTc0/fyjQFik6WagkeD6Dp+jf DeKw== 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=3SSjI8L6tAN7wnaresierGkcZcom6o46dDNzyiPHjlU=; b=PU+v41q6bRr7GL6Yoe1aM16HizYDtU2TNXxRHOVCjY+rGkOhS68fpHWkXEBK/H2Cow tMPtGxZr+33Z73PEEvGcrflQAuSH6RwKfb5Xt6feyR5iicK53YwEKSgOmt6+lSnPAz2y nli47O9yK9BkQjkd7lXoWVUgxYGOn/TqbZPqidXU4TPBKAGl8aXypu2ZCqy4tSGQH1Hk HflGXaMm12GP3iGaVE4M8JIi2RCEbMHlhFcNEH53zWYACF+dONx1PnKPDjYSa/IZ+5zN Fag4BmbM6DlFb+SCrH2M8he9VSF9jTj6TbYmo7bHu+Q/6Ica29yqT0CFt/Nu3pQ/8m6N CrEw== X-Gm-Message-State: AOAM530uzILBzddOQtSROaEuysbR/q0N1JDXWpHxhOWDFtJkKS8mhDco 1HZiXUbhJZfCC3LBzBT6ECmNgGkkB7n1v5LOBRStwQ== X-Google-Smtp-Source: ABdhPJyRJC3YZ5USOl/mcJCYzr7fXk7g4cY3TwW4VhXjTLtE65jadiAZBn5mzk3cAxoYI7xitmatRSaV0b0XNSTpUyU= X-Received: by 2002:a63:d456:: with SMTP id i22mr13760189pgj.440.1604330235200; Mon, 02 Nov 2020 07:17:15 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Andrey Konovalov Date: Mon, 2 Nov 2020 16:17:04 +0100 Message-ID: Subject: Re: [PATCH RFC v2 16/21] kasan: optimize poisoning in kmalloc and krealloc To: Dmitry Vyukov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201102_101719_773271_785A3807 X-CRM114-Status: GOOD ( 31.70 ) 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 , Elena Petrova , Linux-MM , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Kostya Serebryany , Alexander Potapenko , Linux ARM , Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , 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 Wed, Oct 28, 2020 at 5:55 PM Dmitry Vyukov wrote: > > On Thu, Oct 22, 2020 at 3:20 PM Andrey Konovalov wrote: > > > > Since kasan_kmalloc() always follows kasan_slab_alloc(), there's no need > > to reunpoison the object data, only to poison the redzone. > > > > This requires changing kasan annotation for early SLUB cache to > > kasan_slab_alloc(). Otherwise kasan_kmalloc() doesn't untag the object. > > This doesn't do any functional changes, as kmem_cache_node->object_size > > is equal to sizeof(struct kmem_cache_node). > > > > Similarly for kasan_krealloc(), as it's called after ksize(), which > > already unpoisoned the object, there's no need to do it again. > > Have you considered doing this the other way around: make krealloc > call __ksize and unpoison in kasan_krealloc? > This has the advantage of more precise poisoning as ksize will > unpoison the whole underlying object. > > But then maybe we will need to move first checks in ksize into __ksize > as we may need them in krealloc as well. This might be a good idea. I won't implement this for the next version, but will look into this after that. Thanks! > > > > > > > Signed-off-by: Andrey Konovalov > > Link: https://linux-review.googlesource.com/id/I4083d3b55605f70fef79bca9b90843c4390296f2 > > --- > > mm/kasan/common.c | 31 +++++++++++++++++++++---------- > > mm/slub.c | 3 +-- > > 2 files changed, 22 insertions(+), 12 deletions(-) > > > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > > index c5ec60e1a4d2..a581937c2a44 100644 > > --- a/mm/kasan/common.c > > +++ b/mm/kasan/common.c > > @@ -360,8 +360,14 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, > > if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) > > tag = assign_tag(cache, object, false, keep_tag); > > > > - /* Tag is ignored in set_tag without CONFIG_KASAN_SW/HW_TAGS */ > > - kasan_unpoison_memory(set_tag(object, tag), size); > > + /* > > + * Don't unpoison the object when keeping the tag. Tag is kept for: > > + * 1. krealloc(), and then the memory has already been unpoisoned via ksize(); > > + * 2. kmalloc(), and then the memory has already been unpoisoned by kasan_kmalloc(). > > + * Tag is ignored in set_tag() without CONFIG_KASAN_SW/HW_TAGS. > > + */ > > + if (!keep_tag) > > + kasan_unpoison_memory(set_tag(object, tag), size); > > kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start, > > KASAN_KMALLOC_REDZONE); > > > > @@ -384,10 +390,9 @@ void * __must_check __kasan_kmalloc(struct kmem_cache *cache, const void *object > > } > > EXPORT_SYMBOL(__kasan_kmalloc); > > > > -void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, > > - gfp_t flags) > > +static void * __must_check ____kasan_kmalloc_large(struct page *page, const void *ptr, > > + size_t size, gfp_t flags, bool realloc) > > { > > - struct page *page; > > unsigned long redzone_start; > > unsigned long redzone_end; > > > > @@ -397,18 +402,24 @@ void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, > > if (unlikely(ptr == NULL)) > > return NULL; > > > > - page = virt_to_page(ptr); > > - redzone_start = round_up((unsigned long)(ptr + size), > > - KASAN_GRANULE_SIZE); > > + redzone_start = round_up((unsigned long)(ptr + size), KASAN_GRANULE_SIZE); > > redzone_end = (unsigned long)ptr + page_size(page); > > > > - kasan_unpoison_memory(ptr, size); > > + /* ksize() in __do_krealloc() already unpoisoned the memory. */ > > + if (!realloc) > > + kasan_unpoison_memory(ptr, size); > > kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start, > > KASAN_PAGE_REDZONE); > > > > return (void *)ptr; > > } > > > > +void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, > > + gfp_t flags) > > +{ > > + return ____kasan_kmalloc_large(virt_to_page(ptr), ptr, size, flags, false); > > +} > > + > > void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flags) > > { > > struct page *page; > > @@ -419,7 +430,7 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag > > page = virt_to_head_page(object); > > > > if (unlikely(!PageSlab(page))) > > - return __kasan_kmalloc_large(object, size, flags); > > + return ____kasan_kmalloc_large(page, object, size, flags, true); > > else > > return ____kasan_kmalloc(page->slab_cache, object, size, > > flags, true); > > diff --git a/mm/slub.c b/mm/slub.c > > index 1d3f2355df3b..afb035b0bf2d 100644 > > --- a/mm/slub.c > > +++ b/mm/slub.c > > @@ -3535,8 +3535,7 @@ static void early_kmem_cache_node_alloc(int node) > > init_object(kmem_cache_node, n, SLUB_RED_ACTIVE); > > init_tracking(kmem_cache_node, n); > > #endif > > - n = kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node), > > - GFP_KERNEL); > > + n = kasan_slab_alloc(kmem_cache_node, n, GFP_KERNEL); > > page->freelist = get_freepointer(kmem_cache_node, n); > > page->inuse = 1; > > page->frozen = 0; > > -- > > 2.29.0.rc1.297.gfa9743e501-goog > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel