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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 D5B7DC3815B for ; Mon, 20 Apr 2020 20:31:55 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 48AB9206E9 for ; Mon, 20 Apr 2020 20:31:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CSrYF4gw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48AB9206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 495df02cVqzDqqK for ; Tue, 21 Apr 2020 06:31:52 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linaro.org (client-ip=2a00:1450:4864:20::144; helo=mail-lf1-x144.google.com; envelope-from=anders.roxell@linaro.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=CSrYF4gw; dkim-atps=neutral Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 495dbp4tskzDq9J for ; Tue, 21 Apr 2020 06:29:56 +1000 (AEST) Received: by mail-lf1-x144.google.com with SMTP id l11so9201625lfc.5 for ; Mon, 20 Apr 2020 13:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wlD7exmpP2wJ9RvD3qhW6lLoxeeNIloAY3kkOGxGrPg=; b=CSrYF4gwenMWMaslCcQijRCNO9eq1UfvXXSV8pttbEiArbr/aQ0aFZA3NJEU462YCW ta5FSBuZKNh3DjHJ9A+mTPvAqqcxx8gsP38e2aO+vWiQFGoU+OZBQPi5EAKOFGJQ9FJj Vj0bLG8tDjADXIf3/IHx2bOqwK0ghVn+Kk1WRa2/rhWY7yuPOAVIzb8+OB+1AXr7/mDV nPN9r/51dJd8TEtzmYhidX88xsTU+niNazjYNoDQ5+L3ER1iCQuriV+bIdRjpF61vIIh PYP3+KLT6Gdt17ScXYNgHxdjm+9KFieAZARtrDpZtitChEwJQ6XlOk4yvS9U0YGCd6pb P9Nw== 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=wlD7exmpP2wJ9RvD3qhW6lLoxeeNIloAY3kkOGxGrPg=; b=WbfypH/gefUlCxe6EaAwnJ83ENFqIuvsnnygL+HnUg30HEFLHsnyGLYQ6Azy2rBw+q P4nKEqiquq2fNFBiWNzzDYMp3xEqGdQ0t3It4iQMFtCMI8oKYAbHujlqKZkInk6yt62B NWJNQFaUvY5KBYRB2hDQA4Jy7l6HC2gwwFSHbtILu4G4K/1FrvO9dW3XalDhvAad6YR/ 1Wg/Ap1ZM+zohXtFraOTDqwtqYad/23AdHjsrM8O7HGIXp2DbBPxWDQSazZFSBdJY3a/ sN6Eh10x33Pqo+y33Jy9JrvBkqG/k2JBDlOAhPM2WpPfulX5GVTMU+PDW4RcGD7oGPV5 B9yw== X-Gm-Message-State: AGi0PuaoebR8B9Fa6sQ/lsF4ZmgrfjJjZBpb0ahfBre/hLZz/JR/jZYL 0Dk8iM1REWxczL0bDWx+cB9OlqSMMP0SoamG4836yw== X-Google-Smtp-Source: APiQypLQCUkv6jgt7apw+kFJDyvgCCL6sERDkdJtPaDNmQPtni41e7GpE29ZEcuR1aLfVCe6v6zEwl2b/z0I/2n6J3c= X-Received: by 2002:a05:6512:1109:: with SMTP id l9mr11730849lfg.12.1587414591448; Mon, 20 Apr 2020 13:29:51 -0700 (PDT) MIME-Version: 1.0 References: <20200417185049.275845-1-mike.kravetz@oracle.com> <5E312000-05D8-4C5D-A7C0-DDDE1842CB0E@lca.pw> <4c36c6ce-3774-78fa-abc4-b7346bf24348@oracle.com> In-Reply-To: <4c36c6ce-3774-78fa-abc4-b7346bf24348@oracle.com> From: Anders Roxell Date: Mon, 20 Apr 2020 22:29:40 +0200 Message-ID: Subject: Re: [PATCH v3 0/4] Clean up hugetlb boot command line processing To: Mike Kravetz Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-doc@vger.kernel.org, Catalin Marinas , Dave Hansen , Heiko Carstens , Peter Xu , Linux-MM , Paul Mackerras , sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org, Will Deacon , Mina Almasry , linux-s390@vger.kernel.org, Jonathan Corbet , Christian Borntraeger , Ingo Molnar , Longpeng , Albert Ou , Vasily Gorbik , Qian Cai , Paul Walmsley , Thomas Gleixner , Linux ARM , Nitesh Narayan Lal , Randy Dunlap , LKML , Palmer Dabbelt , Andrew Morton , linuxppc-dev , "David S.Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Mon, 20 Apr 2020 at 20:23, Mike Kravetz wrote: > > On 4/20/20 8:34 AM, Qian Cai wrote: > > > > > >> On Apr 17, 2020, at 2:50 PM, Mike Kravetz wrote: > >> > >> Longpeng(Mike) reported a weird message from hugetlb command line processing > >> and proposed a solution [1]. While the proposed patch does address the > >> specific issue, there are other related issues in command line processing. > >> As hugetlbfs evolved, updates to command line processing have been made to > >> meet immediate needs and not necessarily in a coordinated manner. The result > >> is that some processing is done in arch specific code, some is done in arch > >> independent code and coordination is problematic. Semantics can vary between > >> architectures. > >> > >> The patch series does the following: > >> - Define arch specific arch_hugetlb_valid_size routine used to validate > >> passed huge page sizes. > >> - Move hugepagesz= command line parsing out of arch specific code and into > >> an arch independent routine. > >> - Clean up command line processing to follow desired semantics and > >> document those semantics. > >> > >> [1] https://lore.kernel.org/linux-mm/20200305033014.1152-1-longpeng2@huawei.com > >> > >> Mike Kravetz (4): > >> hugetlbfs: add arch_hugetlb_valid_size > >> hugetlbfs: move hugepagesz= parsing to arch independent code > >> hugetlbfs: remove hugetlb_add_hstate() warning for existing hstate > >> hugetlbfs: clean up command line processing > > > > Reverted this series fixed many undefined behaviors on arm64 with the config, > > > > https://raw.githubusercontent.com/cailca/linux-mm/master/arm64.config > > > > [ 54.172683][ T1] UBSAN: shift-out-of-bounds in ./include/linux/hugetlb.h:555:34 > > [ 54.180411][ T1] shift exponent 4294967285 is too large for 64-bit type 'unsigned long' > > [ 54.188885][ T1] CPU: 130 PID: 1 Comm: swapper/0 Not tainted 5.7.0-rc2-next-20200420 #1 > > [ 54.197284][ T1] Hardware name: HPE Apollo 70 /C01_APACHE_MB , BIOS L50_5.13_1.11 06/18/2019 > > [ 54.207888][ T1] Call trace: > > [ 54.211100][ T1] dump_backtrace+0x0/0x224 > > [ 54.215565][ T1] show_stack+0x20/0x2c > > [ 54.219651][ T1] dump_stack+0xfc/0x184 > > [ 54.223829][ T1] __ubsan_handle_shift_out_of_bounds+0x304/0x344 > > [ 54.230204][ T1] hugetlb_add_hstate+0x3ec/0x414 > > huge_page_size at include/linux/hugetlb.h:555 > > (inlined by) hugetlb_add_hstate at mm/hugetlb.c:3301 > > [ 54.235191][ T1] hugetlbpage_init+0x14/0x30 > > [ 54.239824][ T1] do_one_initcall+0x6c/0x144 > > [ 54.244446][ T1] do_initcall_level+0x158/0x1c4 > > [ 54.249336][ T1] do_initcalls+0x68/0xb0 > > [ 54.253597][ T1] do_basic_setup+0x28/0x30 > > [ 54.258049][ T1] kernel_init_freeable+0x19c/0x228 > > [ 54.263188][ T1] kernel_init+0x14/0x208 > > [ 54.267473][ T1] ret_from_fork+0x10/0x18 > > While rearranging the code (patch 3 in series), I made the incorrect > assumption that CONT_XXX_SIZE == (1UL << CONT_XXX_SHIFT). However, > this is not the case. Does the following patch fix these issues? > > From b75cb4a0852e208bee8c4eb347dc076fcaa88859 Mon Sep 17 00:00:00 2001 > From: Mike Kravetz > Date: Mon, 20 Apr 2020 10:41:18 -0700 > Subject: [PATCH] arm64/hugetlb: fix hugetlb initialization > > When calling hugetlb_add_hstate() to initialize a new hugetlb size, > be sure to use correct huge pages size order. > > Signed-off-by: Mike Kravetz > --- > arch/arm64/mm/hugetlbpage.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c > index 9ca840527296..a02411a1f19a 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -453,11 +453,11 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma, > static int __init hugetlbpage_init(void) > { > #ifdef CONFIG_ARM64_4K_PAGES > - hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); > + hugetlb_add_hstate(ilog2(PUD_SIZE) - PAGE_SHIFT); > #endif > - hugetlb_add_hstate(CONT_PMD_SHIFT - PAGE_SHIFT); > - hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT); > - hugetlb_add_hstate(CONT_PTE_SHIFT - PAGE_SHIFT); > + hugetlb_add_hstate(ilog2(CONT_PMD_SIZE) - PAGE_SHIFT); > + hugetlb_add_hstate(ilog2(PMD_SIZE) - PAGE_SHIFT); > + hugetlb_add_hstate(ilog2(CONT_PTE_SIZE) - PAGE_SHIFT); > > return 0; > } I build this for an arm64 kernel and ran it in qemu and it worked. Cheers, Anders