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=-11.2 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,USER_AGENT_SANE_1 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 B5509C388F9 for ; Wed, 11 Nov 2020 19:09:45 +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 360B5206F1 for ; Wed, 11 Nov 2020 19:09:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ik3oHc+C"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="K4eTAtSN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 360B5206F1 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OPW0hv8SV6YkLEjydbCK/5nvTI1DyvNEcUUbUJJmkv0=; b=Ik3oHc+Cgt2a2KTU+OIYMQ7KZ aHG5PKTfeE46yQemrP3MoyUHUBGWJWg35/asP6kN5lYeizIF42hkgZplOJbXeG7lBRa+o+y8EzNom x629Yapr0UJwDKi0BLMfAXgioPSOpjZ9ZJ+ikKLDTxVVgq1vmpnsE69pwrMyrAZVUh+SCgq9PqhSv jJtGL/s/YDzgGnJS1JgWSXx3gfukziER+WuDhi4G0EdZtoyHojv99qPpS5PQ7p/wGY6RVOcgPel1k JSe9LJSV6U+k3Pn6JavD3yjYjxNjOxVSTACZ/QasSBYpY+9jI3DO6TuuImmaeWtdo9abJQvW01xqg XlWR1v88Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcvUW-0004sl-9R; Wed, 11 Nov 2020 19:09:12 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcvUR-0004rN-B3 for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 19:09:10 +0000 Received: by mail-wm1-x343.google.com with SMTP id c16so3338284wmd.2 for ; Wed, 11 Nov 2020 11:09:06 -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=3pzzdEUXqdlUXkCITd16mcn7xREtcEGzt0MbcAZyF9Q=; b=K4eTAtSNaW4ABsK0MqA/oBSfqpOpmAkKezax7uQfKZcTaJ+hBqs19gsrUKLp/FXRJU O760l4QF+zosCex1gestm4r7y6yf0HghWKDx04bnNI5AmE6kUZndcQK/32kGLglEhy9j MOeKPIC3K6zOl0SHsZuAIHhrp4aICC4GMFcLmsVHwq2AckJxCTfIv7KfGbCHP/tT0qFy sE4RszEvcBgy+9xGmuo/ZBlTPaHin8FPDoZrrdBvdz4x6Wxq56YDXL2dCLP1pB06a4V4 lsZTH4rRG5hyHg3IXj05ISjFMgPt8Hg79+16grf2IsCFwJ4JJJSnYUjQ9oBXPSFISNSg bQLQ== 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=3pzzdEUXqdlUXkCITd16mcn7xREtcEGzt0MbcAZyF9Q=; b=BRokwPKH4KbNYBSkhb3A4PpQlhZTr4Kv6Gcw062ClRN9XfU47Mbg5KA7sZhvEtrWrv X/6J2SBmL8Z9FoW4qUvoeo/MTb/80ZSu/VVe2qNvjF+n7PDvTRZBwcdCNDGwYR8GjMfl 2g7j6GiOUgNzGQ5iqMyL9QYGKQMFg3ioEjcG6CX+xMdLHI5bsz/tGjYx9AQWBIQJsJIV EnHxkAP3HQJKQDJWehJOOJKDjk6MstUM0SpwDMBAFHDnynlUjAfsYxHdYwKTHvqe8+pa MHiHAGi99XPVPcegiHJQONUvgwPekTXW/cmknCz4l9Q98PJFFDKOjDPSRmCpIdAMVKV2 yLAg== X-Gm-Message-State: AOAM5332rcUjw8bhJMIx03W10IycZYpz5UFOHE5Ug0ZusX/YVLLC8Rlp esfEls9TN5BOeyv27QHgtScM7w== X-Google-Smtp-Source: ABdhPJwS+C4LRdXb3iKiJxV4xKpwDFm//prTWZiywKw/Bpavh2WuyLygkDLjWVWENWJ3krNCPCfbMA== X-Received: by 2002:a1c:46c5:: with SMTP id t188mr5871850wma.68.1605121745575; Wed, 11 Nov 2020 11:09:05 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id 130sm3739700wmd.18.2020.11.11.11.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 11:09:04 -0800 (PST) Date: Wed, 11 Nov 2020 20:08:59 +0100 From: Marco Elver To: Andrey Konovalov Subject: Re: [PATCH v2 15/20] kasan: don't round_up too much Message-ID: <20201111190859.GQ517454@elver.google.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_140907_433847_6B28F50E X-CRM114-Status: GOOD ( 21.10 ) 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: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Dmitry Vyukov , 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 Tue, Nov 10, 2020 at 11:20PM +0100, Andrey Konovalov wrote: > For hardware tag-based mode kasan_poison_memory() already rounds up the > size. Do the same for software modes and remove round_up() from the common > code. > > Signed-off-by: Andrey Konovalov > Reviewed-by: Dmitry Vyukov > Link: https://linux-review.googlesource.com/id/Ib397128fac6eba874008662b4964d65352db4aa4 > --- > mm/kasan/common.c | 8 ++------ > mm/kasan/shadow.c | 1 + > 2 files changed, 3 insertions(+), 6 deletions(-) Reviewed-by: Marco Elver > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 60793f8695a8..69ab880abacc 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -218,9 +218,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object) > > void __kasan_poison_object_data(struct kmem_cache *cache, void *object) > { > - kasan_poison_memory(object, > - round_up(cache->object_size, KASAN_GRANULE_SIZE), > - KASAN_KMALLOC_REDZONE); > + kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_REDZONE); > } > > /* > @@ -293,7 +291,6 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, > { > u8 tag; > void *tagged_object; > - unsigned long rounded_up_size; > > tag = get_tag(object); > tagged_object = object; > @@ -314,8 +311,7 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, > return true; > } > > - rounded_up_size = round_up(cache->object_size, KASAN_GRANULE_SIZE); > - kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE); > + kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_FREE); > > if (!kasan_stack_collection_enabled()) > return false; > diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c > index 8e4fa9157a0b..3f64c9ecbcc0 100644 > --- a/mm/kasan/shadow.c > +++ b/mm/kasan/shadow.c > @@ -82,6 +82,7 @@ void kasan_poison_memory(const void *address, size_t size, u8 value) > * addresses to this function. > */ > address = kasan_reset_tag(address); > + size = round_up(size, KASAN_GRANULE_SIZE); > > shadow_start = kasan_mem_to_shadow(address); > shadow_end = kasan_mem_to_shadow(address + size); > -- > 2.29.2.222.g5d2a92d10f8-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel