From: Kefeng Wang <wangkefeng.wang@huawei.com> To: <will@kernel.org>, <catalin.marinas@arm.com>, <ryabinin.a.a@gmail.com>, <andreyknvl@gmail.com>, <dvyukov@google.com>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org> Cc: <kasan-dev@googlegroups.com>, <linux-mm@kvack.org>, <elver@google.com>, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH v3 1/3] vmalloc: Choose a better start address in vm_area_register_early() Date: Mon, 9 Aug 2021 17:37:48 +0800 [thread overview] Message-ID: <20210809093750.131091-2-wangkefeng.wang@huawei.com> (raw) In-Reply-To: <20210809093750.131091-1-wangkefeng.wang@huawei.com> 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 the end of existing address range in vmlist as the start address instead of VMALLOC_START to avoid the BUG_ON. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- mm/vmalloc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d5cd52805149..1e8fe08725b8 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2238,11 +2238,17 @@ void __init vm_area_add_early(struct vm_struct *vm) */ void __init vm_area_register_early(struct vm_struct *vm, size_t align) { - static size_t vm_init_off __initdata; - unsigned long addr; - - addr = ALIGN(VMALLOC_START + vm_init_off, align); - vm_init_off = PFN_ALIGN(addr + vm->size) - VMALLOC_START; + struct vm_struct *head = vmlist, *curr, *next; + unsigned long addr = ALIGN(VMALLOC_START, align); + + while (head != NULL) { + next = head->next; + curr = head; + head = next; + addr = ALIGN((unsigned long)curr->addr + curr->size, align); + if (next && (unsigned long)next->addr - addr > vm->size) + break; + } vm->addr = (void *)addr; -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Kefeng Wang <wangkefeng.wang@huawei.com> To: <will@kernel.org>, <catalin.marinas@arm.com>, <ryabinin.a.a@gmail.com>, <andreyknvl@gmail.com>, <dvyukov@google.com>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org> Cc: <kasan-dev@googlegroups.com>, <linux-mm@kvack.org>, <elver@google.com>, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH v3 1/3] vmalloc: Choose a better start address in vm_area_register_early() Date: Mon, 9 Aug 2021 17:37:48 +0800 [thread overview] Message-ID: <20210809093750.131091-2-wangkefeng.wang@huawei.com> (raw) In-Reply-To: <20210809093750.131091-1-wangkefeng.wang@huawei.com> 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 the end of existing address range in vmlist as the start address instead of VMALLOC_START to avoid the BUG_ON. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- mm/vmalloc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d5cd52805149..1e8fe08725b8 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2238,11 +2238,17 @@ void __init vm_area_add_early(struct vm_struct *vm) */ void __init vm_area_register_early(struct vm_struct *vm, size_t align) { - static size_t vm_init_off __initdata; - unsigned long addr; - - addr = ALIGN(VMALLOC_START + vm_init_off, align); - vm_init_off = PFN_ALIGN(addr + vm->size) - VMALLOC_START; + struct vm_struct *head = vmlist, *curr, *next; + unsigned long addr = ALIGN(VMALLOC_START, align); + + while (head != NULL) { + next = head->next; + curr = head; + head = next; + addr = ALIGN((unsigned long)curr->addr + curr->size, align); + if (next && (unsigned long)next->addr - addr > vm->size) + break; + } vm->addr = (void *)addr; -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-08-09 9:32 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-09 9:37 [PATCH v3 0/3] arm64: support page mapping percpu first chunk allocator Kefeng Wang 2021-08-09 9:37 ` Kefeng Wang 2021-08-09 9:37 ` Kefeng Wang [this message] 2021-08-09 9:37 ` [PATCH v3 1/3] vmalloc: Choose a better start address in vm_area_register_early() Kefeng Wang 2021-08-25 17:59 ` Catalin Marinas 2021-08-25 17:59 ` Catalin Marinas 2021-08-27 8:36 ` Kefeng Wang 2021-08-27 8:36 ` Kefeng Wang 2021-08-09 9:37 ` [PATCH v3 2/3] arm64: Support page mapping percpu first chunk allocator Kefeng Wang 2021-08-09 9:37 ` Kefeng Wang 2021-08-25 18:08 ` Catalin Marinas 2021-08-25 18:08 ` Catalin Marinas 2021-08-09 9:37 ` [PATCH v3 3/3] kasan: arm64: Fix pcpu_page_first_chunk crash with KASAN_VMALLOC Kefeng Wang 2021-08-09 9:37 ` Kefeng Wang 2021-08-09 11:10 ` Kefeng Wang 2021-08-09 11:10 ` Kefeng Wang 2021-08-09 11:21 ` Marco Elver 2021-08-09 11:21 ` Marco Elver 2021-08-09 11:21 ` Marco Elver 2021-08-09 13:34 ` Kefeng Wang 2021-08-09 13:34 ` Kefeng Wang 2021-08-09 18:21 ` Andrey Konovalov 2021-08-09 18:21 ` Andrey Konovalov 2021-08-09 18:21 ` Andrey Konovalov 2021-08-12 6:07 ` [PATCH v3 0/3] arm64: support page mapping percpu first chunk allocator Kefeng Wang 2021-08-12 6:07 ` Kefeng Wang 2021-08-23 2:29 ` Kefeng Wang 2021-08-23 2:29 ` Kefeng Wang 2021-08-25 18:11 ` Catalin Marinas 2021-08-25 18:11 ` Catalin Marinas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210809093750.131091-2-wangkefeng.wang@huawei.com \ --to=wangkefeng.wang@huawei.com \ --cc=andreyknvl@gmail.com \ --cc=catalin.marinas@arm.com \ --cc=dvyukov@google.com \ --cc=elver@google.com \ --cc=kasan-dev@googlegroups.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=ryabinin.a.a@gmail.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.