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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 3F199C4332F for ; Fri, 10 Sep 2021 05:30:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D0A666113A for ; Fri, 10 Sep 2021 05:30:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D0A666113A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 1273D6B0071; Fri, 10 Sep 2021 01:30:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01D57940007; Fri, 10 Sep 2021 01:30:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C75286B0073; Fri, 10 Sep 2021 01:30:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0139.hostedemail.com [216.40.44.139]) by kanga.kvack.org (Postfix) with ESMTP id A41876B0071 for ; Fri, 10 Sep 2021 01:30:15 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 39177181D6044 for ; Fri, 10 Sep 2021 05:30:15 +0000 (UTC) X-FDA: 78570537990.38.26CC9B0 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf02.hostedemail.com (Postfix) with ESMTP id 5DECE7001A08 for ; Fri, 10 Sep 2021 05:30:14 +0000 (UTC) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4H5PZW36g6z8t09; Fri, 10 Sep 2021 13:29:39 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Fri, 10 Sep 2021 13:30:11 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Fri, 10 Sep 2021 13:30:10 +0800 From: Kefeng Wang To: , , , , , , , , , , CC: , Kefeng Wang Subject: [PATCH v4 1/3] vmalloc: Choose a better start address in vm_area_register_early() Date: Fri, 10 Sep 2021 13:33:52 +0800 Message-ID: <20210910053354.26721-2-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210910053354.26721-1-wangkefeng.wang@huawei.com> References: <20210910053354.26721-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5DECE7001A08 Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com X-Stat-Signature: nwowtum3rhhu13mkzd3bg8f4j5ssphxj X-HE-Tag: 1631251814-202214 Content-Transfer-Encoding: quoted-printable 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: There are some fixed locations in the vmalloc area be reserved in ARM(see iotable_init()) and ARM64(see map_kernel()), but for pcpu_page_first_chunk(), it calls vm_area_register_early() and choose VMALLOC_START as the start address of vmap area which could be conflicted with above address, then could trigger a BUG_ON in vm_area_add_early(). Let's choose a suit start address by traversing the vmlist. Signed-off-by: Kefeng Wang --- mm/vmalloc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d77830ff604c..5ee3cbeffa26 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2272,15 +2272,21 @@ void __init vm_area_add_early(struct vm_struct *v= m) */ void __init vm_area_register_early(struct vm_struct *vm, size_t align) { - static size_t vm_init_off __initdata; - unsigned long addr; + unsigned long addr =3D ALIGN(VMALLOC_START, align); + struct vm_struct *cur, **p; =20 - addr =3D ALIGN(VMALLOC_START + vm_init_off, align); - vm_init_off =3D PFN_ALIGN(addr + vm->size) - VMALLOC_START; + BUG_ON(vmap_initialized); =20 - vm->addr =3D (void *)addr; + for (p =3D &vmlist; (cur =3D *p) !=3D NULL; p =3D &cur->next) { + if ((unsigned long)cur->addr - addr >=3D vm->size) + break; + addr =3D ALIGN((unsigned long)cur->addr + cur->size, align); + } =20 - vm_area_add_early(vm); + BUG_ON(addr > VMALLOC_END - vm->size); + vm->addr =3D (void *)addr; + vm->next =3D *p; + *p =3D vm; } =20 static void vmap_init_free_space(void) --=20 2.26.2