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=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 D3FF0C2B9F4 for ; Sat, 19 Jun 2021 13:02:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5B29C6113E for ; Sat, 19 Jun 2021 13:02:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B29C6113E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6D4DB6B006E; Sat, 19 Jun 2021 09:02:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AB856B0070; Sat, 19 Jun 2021 09:02:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 524ED6B0072; Sat, 19 Jun 2021 09:02:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0128.hostedemail.com [216.40.44.128]) by kanga.kvack.org (Postfix) with ESMTP id 1CB166B006E for ; Sat, 19 Jun 2021 09:02:24 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A11C7181AEF0B for ; Sat, 19 Jun 2021 13:02:23 +0000 (UTC) X-FDA: 78270486966.21.FA5BB05 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by imf11.hostedemail.com (Postfix) with ESMTP id 60831200111F for ; Sat, 19 Jun 2021 13:02:23 +0000 (UTC) Received: by mail-lf1-f53.google.com with SMTP id d16so14172896lfn.3 for ; Sat, 19 Jun 2021 06:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=HUeqKt3RtgMevbE/ABbBGv3TkFoWafk2RAOPNGWgrN4=; b=gAsCSsWa6GubxCWdKd9Q3GyoCCuZ7QGqRu45NyFq5pLKuat5VEBAgHWkar7MLfYAzr 7IudI9XdtQUQ+0v1Mz6VtEzb7gO2ClzBjv+W/BdjOdjWDkF7qc13DqzKsTLavJ9p2YGF EDhi5KeE+GNdrWde7rlkgBcv1QWHVOxkptKjI1l4UZwL2gXOmzY0gSjSJBaSy9As0gv9 7ZYAUkP5WvKk9UyRBmVlZAZVSKVMpAlvwGGj21zjpK7n8u08yga5xYKsOsZ0roY/jLDm PX1b4upSbMzodfOZ2Z5SRRD3asUSxDRe9sv4HmMrbTd0fRXz7Q9ddHMVv5YNtwZasCUq 4jOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=HUeqKt3RtgMevbE/ABbBGv3TkFoWafk2RAOPNGWgrN4=; b=ihRmBnx0FHNqvmMCsy9VCWrNuMlNinwrK0rqOkzXpg1gSIz0PNFOJbeHD+oKpazm2L cQ/bZMgVh67Slpib21+48Ms8ls+7CCwxFxWc6Wdx28zWyCmoMj4t4Q//tXgMiScc9NZv UHXz68OeoTyZDVdGNAnvE8F/Qhw2HyE0QRtIj+ooF74ZS3ItGpxX4rFOlzvPTAwxWAH9 mbTnaNDFzXZjSsf0qH+hxjb8gI6GZ/1cOtnvCv3d+kyHBUVo9VISq7oBCltGmXXTVK34 dRLOLqoPsZ7p31UDPbfpDsW/Q7b6NZ9bhS22BCCvYQywz34qdjy9PsUo9CvEbiU77t7A I2Ww== X-Gm-Message-State: AOAM533ilT/RZTdXd21GT0ReXHmm+Z5Ruk33op63KctDYGkxyQMzYfCJ JSbYzAuf2mqufKooRdOyPWQ= X-Google-Smtp-Source: ABdhPJzMpjJ+d5bloX8ZVg5ldjSzC/g9D1/RwMDPpA+UOtFW6NOgjo1K8n0+Z6zl9oF6M7+XVMJcaA== X-Received: by 2002:a19:6902:: with SMTP id e2mr6999176lfc.326.1624107741056; Sat, 19 Jun 2021 06:02:21 -0700 (PDT) Received: from pc638.lan (h5ef52e3d.seluork.dyn.perspektivbredband.net. [94.245.46.61]) by smtp.gmail.com with ESMTPSA id g28sm1223273lfv.142.2021.06.19.06.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jun 2021 06:02:20 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Sat, 19 Jun 2021 15:02:17 +0200 To: Daniel Axtens Cc: akpm@linux-foundation.org, Daniel Axtens , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrey Konovalov , David Gow , Dmitry Vyukov , Uladzislau Rezki Subject: Re: [PATCH] mm/vmalloc: unbreak kasan vmalloc support Message-ID: <20210619130217.GA1915@pc638.lan> References: <20210617081330.98629-1-dja@axtens.net> <1623922742.sam09kpmhp.astroid@bobo.none> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1623922742.sam09kpmhp.astroid@bobo.none> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 60831200111F Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=gAsCSsWa; spf=pass (imf11.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.53 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: citpd9if76zhhzqfw9zornycih4cp1t5 X-HE-Tag: 1624107743-181925 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 Thu, Jun 17, 2021 at 07:40:49PM +1000, Nicholas Piggin wrote: > Excerpts from Daniel Axtens's message of June 17, 2021 6:13 pm: > > In commit 121e6f3258fe ("mm/vmalloc: hugepage vmalloc mappings"), > > __vmalloc_node_range was changed such that __get_vm_area_node was no > > longer called with the requested/real size of the vmalloc allocation, but > > rather with a rounded-up size. > > > > This means that __get_vm_area_node called kasan_unpoision_vmalloc() with > > a rounded up size rather than the real size. This led to it allowing > > access to too much memory and so missing vmalloc OOBs and failing the > > kasan kunit tests. > > > > Pass the real size and the desired shift into __get_vm_area_node. This > > allows it to round up the size for the underlying allocators while > > still unpoisioning the correct quantity of shadow memory. > > > > Adjust the other call-sites to pass in PAGE_SHIFT for the shift value. > > > > Cc: Nicholas Piggin > > Cc: David Gow > > Cc: Dmitry Vyukov > > Cc: Andrey Konovalov > > Cc: Uladzislau Rezki (Sony) > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=213335 > > Fixes: 121e6f3258fe ("mm/vmalloc: hugepage vmalloc mappings") > > Thanks Daniel, good debugging. > > Reviewed-by: Nicholas Piggin > > > Signed-off-by: Daniel Axtens > > --- > > mm/vmalloc.c | 24 ++++++++++++++---------- > > 1 file changed, 14 insertions(+), 10 deletions(-) > > > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > index aaad569e8963..3471cbeb083c 100644 > > --- a/mm/vmalloc.c > > +++ b/mm/vmalloc.c > > @@ -2362,15 +2362,16 @@ static void clear_vm_uninitialized_flag(struct vm_struct *vm) > > } > > > > static struct vm_struct *__get_vm_area_node(unsigned long size, > > - unsigned long align, unsigned long flags, unsigned long start, > > - unsigned long end, int node, gfp_t gfp_mask, const void *caller) > > + unsigned long align, unsigned long shift, unsigned long flags, > > + unsigned long start, unsigned long end, int node, > > + gfp_t gfp_mask, const void *caller) > > { > > struct vmap_area *va; > > struct vm_struct *area; > > unsigned long requested_size = size; > > > > BUG_ON(in_interrupt()); > > - size = PAGE_ALIGN(size); > > + size = ALIGN(size, 1ul << shift); > > if (unlikely(!size)) > > return NULL; > > > > @@ -2402,8 +2403,8 @@ struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, > > unsigned long start, unsigned long end, > > const void *caller) > > { > > - return __get_vm_area_node(size, 1, flags, start, end, NUMA_NO_NODE, > > - GFP_KERNEL, caller); > > + return __get_vm_area_node(size, 1, PAGE_SHIFT, flags, start, end, > > + NUMA_NO_NODE, GFP_KERNEL, caller); > > } > > > > /** > > @@ -2419,7 +2420,8 @@ struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, > > */ > > struct vm_struct *get_vm_area(unsigned long size, unsigned long flags) > > { > > - return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, > > + return __get_vm_area_node(size, 1, PAGE_SHIFT, flags, > > + VMALLOC_START, VMALLOC_END, > > NUMA_NO_NODE, GFP_KERNEL, > > __builtin_return_address(0)); > > } > > @@ -2427,7 +2429,8 @@ struct vm_struct *get_vm_area(unsigned long size, unsigned long flags) > > struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, > > const void *caller) > > { > > - return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, > > + return __get_vm_area_node(size, 1, PAGE_SHIFT, flags, > > + VMALLOC_START, VMALLOC_END, > > NUMA_NO_NODE, GFP_KERNEL, caller); > > } > > > > @@ -2949,9 +2952,9 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, > > } > > > > again: > > - size = PAGE_ALIGN(size); > > - area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | > > - vm_flags, start, end, node, gfp_mask, caller); > > + area = __get_vm_area_node(real_size, align, shift, VM_ALLOC | > > + VM_UNINITIALIZED | vm_flags, start, end, node, > > + gfp_mask, caller); > > if (!area) { > > warn_alloc(gfp_mask, NULL, > > "vmalloc error: size %lu, vm_struct allocation failed", > > @@ -2970,6 +2973,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, > > */ > > clear_vm_uninitialized_flag(area); > > > > + size = PAGE_ALIGN(size); > > kmemleak_vmalloc(area, size, gfp_mask); > > > > return addr; > > -- > > 2.30.2 > > > > Reviewed-by: Uladzislau Rezki (Sony) Indeed hugepage mapping was broken in regard to KASAN. Thanks! -- Vlad Rezki