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=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 C49A2C43462 for ; Fri, 23 Apr 2021 16:57:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A790E6134F for ; Fri, 23 Apr 2021 16:57:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242529AbhDWQ5q (ORCPT ); Fri, 23 Apr 2021 12:57:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbhDWQ5l (ORCPT ); Fri, 23 Apr 2021 12:57:41 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 146B2C061574 for ; Fri, 23 Apr 2021 09:57:05 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id j14-20020a17090a694eb0290152d92c205dso1549299pjm.0 for ; Fri, 23 Apr 2021 09:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=s4J0wdi9ub8j1oFLJOVRAwtlpmptPrFHS6TmHCwX3xA=; b=NATfmSnLVo4Cw+x2lN8iymNNeofocLO2KywuMLPqVJDldRBNI8F0w3X3NuSlH1tTiE EGA3973nQ06R/ATohpU70266PED+c77QfnRyqpD1YPnNKqHS7UmbHao1gwmH8x6oto0p 5eUda067oP2iUQoC/hz7Y4jjKpqi4+7HN+Bblwihk6asUra55FsdkY6sXt0MkvA7PiHh ks6ZsFKzJ6PyrjwbgtOb5tyPo64XbrmyYZLxU1Vs8ElpZabW1ekCTiA/tDQ/czJW9mo2 yW2Nt8FO7BoueqvJYwzFoMr/wBwtq0cJ4v22XhvAuuRGuaKZeyKWEfbPHjNTGDLitDCq 6pOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=s4J0wdi9ub8j1oFLJOVRAwtlpmptPrFHS6TmHCwX3xA=; b=h/b8XY5Xc/lnm/B08enCaT/CK8YXjnURqY2WTMn8OhI8Bn5UerIBbx8VG0pZ3nUZeK MviG/Doy4oyMhzo1ugomX9h2g1mIVAhHjyEVu9INix/u8LYQ0is2hn/xMI1e/vrRxbva d2rH/GriOPPpV6tXWrz8ZRawNVMfPdKWTYFVNrRUmaIJiC/pGKRHq8DN+rvfbuk7xfgl 5J6A27Iijn6OjZ1zbtmvuEBBOL+dBS1N4QXoxH82athGLas0Du/88bbEah2VXLlsb5mn +L2EzQAWmkFzd4i3ub+wclW+L6/Sma55dxC9DOsZhiMaEocGz+D4PXWvBh/3s7Yf3rut Bv7A== X-Gm-Message-State: AOAM531McbUTl/CUazvoLJr/lSWQksP39uaE8iENieVqvwalBRriIN3X 9IY+3Wuel4uQpFOO90+n6Lb9TaPK+nol14D8 X-Google-Smtp-Source: ABdhPJxiPufCe11ABw4MtTLg0HTEpl9JUqO3+Qr3RXVHJigtgt3sFz8+f55Sn+o//L/fQ1m8p2uCEA== X-Received: by 2002:a17:902:e8d1:b029:ec:824a:404e with SMTP id v17-20020a170902e8d1b02900ec824a404emr5085166plg.61.1619197024421; Fri, 23 Apr 2021 09:57:04 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id a20sm5299988pfk.46.2021.04.23.09.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 09:57:03 -0700 (PDT) Date: Fri, 23 Apr 2021 09:57:03 -0700 (PDT) X-Google-Original-Date: Fri, 23 Apr 2021 09:57:02 PDT (-0700) Subject: Re: [PATCH] riscv: Fix 32b kernel caused by 64b kernel mapping moving outside linear mapping In-Reply-To: <66e9a8e0-5764-2eea-4070-bad3fb7ee48e@ghiti.fr> CC: anup@brainfault.org, corbet@lwn.net, Paul Walmsley , aou@eecs.berkeley.edu, Arnd Bergmann , aryabinin@virtuozzo.com, glider@google.com, dvyukov@google.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-arch@vger.kernel.org, linux-mm@kvack.org From: Palmer Dabbelt To: alex@ghiti.fr Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 23 Apr 2021 01:34:02 PDT (-0700), alex@ghiti.fr wrote: > Le 4/20/21 à 12:18 AM, Anup Patel a écrit : >> On Sat, Apr 17, 2021 at 10:52 PM Alexandre Ghiti wrote: >>> >>> Fix multiple leftovers when moving the kernel mapping outside the linear >>> mapping for 64b kernel that left the 32b kernel unusable. >>> >>> Fixes: 4b67f48da707 ("riscv: Move kernel mapping outside of linear mapping") >>> Signed-off-by: Alexandre Ghiti >> >> Quite a few #ifdef but I don't see any better way at the moment. Maybe we can >> clean this later. Otherwise looks good to me. Agreed. I'd recently sent out a patch set that got NACK'd because we're supposed to be relying on the compiler to optimize away references that can be staticly determined to not be exercised, which is probably the way forward to getting rid of a lot of of preprocessor stuff. That all seems very fragile and is a bigger problem than this, though, so it's probably best to do it as its own thing. >> Reviewed-by: Anup Patel > > Thanks Anup! > > @Palmer: This is not on for-next yet and then rv32 is broken. This does > not apply immediately on top of for-next though, so if you need a new > version, I can do that. But this squashes nicely with the patch it fixes > if you prefer. Thanks. I just hadn't gotten to this one yet, but as you pointed out it's probably best to just squash it. It's in the version on for-next now, it caused few conflicts but I think I got everything sorted out. Now that everything is in I'm going to stop rewriting this stuff, as it touches pretty much the whole tree. I don't have much of a patch back log as of right now, and as the new stuff will be on top of it that will make everyone's lives easier. > > Let me know, I can do that very quickly. > > Alex > >> >> Regards, >> Anup >> >>> --- >>> arch/riscv/include/asm/page.h | 9 +++++++++ >>> arch/riscv/include/asm/pgtable.h | 16 ++++++++++++---- >>> arch/riscv/mm/init.c | 25 ++++++++++++++++++++++++- >>> 3 files changed, 45 insertions(+), 5 deletions(-) >>> >>> diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h >>> index 22cfb2be60dc..f64b61296c0c 100644 >>> --- a/arch/riscv/include/asm/page.h >>> +++ b/arch/riscv/include/asm/page.h >>> @@ -90,15 +90,20 @@ typedef struct page *pgtable_t; >>> >>> #ifdef CONFIG_MMU >>> extern unsigned long va_pa_offset; >>> +#ifdef CONFIG_64BIT >>> extern unsigned long va_kernel_pa_offset; >>> +#endif >>> extern unsigned long pfn_base; >>> #define ARCH_PFN_OFFSET (pfn_base) >>> #else >>> #define va_pa_offset 0 >>> +#ifdef CONFIG_64BIT >>> #define va_kernel_pa_offset 0 >>> +#endif >>> #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT) >>> #endif /* CONFIG_MMU */ >>> >>> +#ifdef CONFIG_64BIT >>> extern unsigned long kernel_virt_addr; >>> >>> #define linear_mapping_pa_to_va(x) ((void *)((unsigned long)(x) + va_pa_offset)) >>> @@ -112,6 +117,10 @@ extern unsigned long kernel_virt_addr; >>> (_x < kernel_virt_addr) ? \ >>> linear_mapping_va_to_pa(_x) : kernel_mapping_va_to_pa(_x); \ >>> }) >>> +#else >>> +#define __pa_to_va_nodebug(x) ((void *)((unsigned long) (x) + va_pa_offset)) >>> +#define __va_to_pa_nodebug(x) ((unsigned long)(x) - va_pa_offset) >>> +#endif >>> >>> #ifdef CONFIG_DEBUG_VIRTUAL >>> extern phys_addr_t __virt_to_phys(unsigned long x); >>> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h >>> index 80e63a93e903..5afda75cc2c3 100644 >>> --- a/arch/riscv/include/asm/pgtable.h >>> +++ b/arch/riscv/include/asm/pgtable.h >>> @@ -16,19 +16,27 @@ >>> #else >>> >>> #define ADDRESS_SPACE_END (UL(-1)) >>> -/* >>> - * Leave 2GB for kernel and BPF at the end of the address space >>> - */ >>> + >>> +#ifdef CONFIG_64BIT >>> +/* Leave 2GB for kernel and BPF at the end of the address space */ >>> #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END - SZ_2G + 1) >>> +#else >>> +#define KERNEL_LINK_ADDR PAGE_OFFSET >>> +#endif >>> >>> #define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) >>> #define VMALLOC_END (PAGE_OFFSET - 1) >>> #define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) >>> >>> -/* KASLR should leave at least 128MB for BPF after the kernel */ >>> #define BPF_JIT_REGION_SIZE (SZ_128M) >>> +#ifdef CONFIG_64BIT >>> +/* KASLR should leave at least 128MB for BPF after the kernel */ >>> #define BPF_JIT_REGION_START PFN_ALIGN((unsigned long)&_end) >>> #define BPF_JIT_REGION_END (BPF_JIT_REGION_START + BPF_JIT_REGION_SIZE) >>> +#else >>> +#define BPF_JIT_REGION_START (PAGE_OFFSET - BPF_JIT_REGION_SIZE) >>> +#define BPF_JIT_REGION_END (VMALLOC_END) >>> +#endif >>> >>> /* Modules always live before the kernel */ >>> #ifdef CONFIG_64BIT >>> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c >>> index 093f3a96ecfc..dc9b988e0778 100644 >>> --- a/arch/riscv/mm/init.c >>> +++ b/arch/riscv/mm/init.c >>> @@ -91,8 +91,10 @@ static void print_vm_layout(void) >>> (unsigned long)VMALLOC_END); >>> print_mlm("lowmem", (unsigned long)PAGE_OFFSET, >>> (unsigned long)high_memory); >>> +#ifdef CONFIG_64BIT >>> print_mlm("kernel", (unsigned long)KERNEL_LINK_ADDR, >>> (unsigned long)ADDRESS_SPACE_END); >>> +#endif >>> } >>> #else >>> static void print_vm_layout(void) { } >>> @@ -165,9 +167,11 @@ static struct pt_alloc_ops pt_ops; >>> /* Offset between linear mapping virtual address and kernel load address */ >>> unsigned long va_pa_offset; >>> EXPORT_SYMBOL(va_pa_offset); >>> +#ifdef CONFIG_64BIT >>> /* Offset between kernel mapping virtual address and kernel load address */ >>> unsigned long va_kernel_pa_offset; >>> EXPORT_SYMBOL(va_kernel_pa_offset); >>> +#endif >>> unsigned long pfn_base; >>> EXPORT_SYMBOL(pfn_base); >>> >>> @@ -410,7 +414,9 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) >>> load_sz = (uintptr_t)(&_end) - load_pa; >>> >>> va_pa_offset = PAGE_OFFSET - load_pa; >>> +#ifdef CONFIG_64BIT >>> va_kernel_pa_offset = kernel_virt_addr - load_pa; >>> +#endif >>> >>> pfn_base = PFN_DOWN(load_pa); >>> >>> @@ -469,12 +475,16 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) >>> pa + PMD_SIZE, PMD_SIZE, PAGE_KERNEL); >>> dtb_early_va = (void *)DTB_EARLY_BASE_VA + (dtb_pa & (PMD_SIZE - 1)); >>> #else /* CONFIG_BUILTIN_DTB */ >>> +#ifdef CONFIG_64BIT >>> /* >>> * __va can't be used since it would return a linear mapping address >>> * whereas dtb_early_va will be used before setup_vm_final installs >>> * the linear mapping. >>> */ >>> dtb_early_va = kernel_mapping_pa_to_va(dtb_pa); >>> +#else >>> + dtb_early_va = __va(dtb_pa); >>> +#endif /* CONFIG_64BIT */ >>> #endif /* CONFIG_BUILTIN_DTB */ >>> #else >>> #ifndef CONFIG_BUILTIN_DTB >>> @@ -486,7 +496,11 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) >>> pa + PGDIR_SIZE, PGDIR_SIZE, PAGE_KERNEL); >>> dtb_early_va = (void *)DTB_EARLY_BASE_VA + (dtb_pa & (PGDIR_SIZE - 1)); >>> #else /* CONFIG_BUILTIN_DTB */ >>> +#ifdef CONFIG_64BIT >>> dtb_early_va = kernel_mapping_pa_to_va(dtb_pa); >>> +#else >>> + dtb_early_va = __va(dtb_pa); >>> +#endif /* CONFIG_64BIT */ >>> #endif /* CONFIG_BUILTIN_DTB */ >>> #endif >>> dtb_early_pa = dtb_pa; >>> @@ -571,12 +585,21 @@ static void __init setup_vm_final(void) >>> for (pa = start; pa < end; pa += map_size) { >>> va = (uintptr_t)__va(pa); >>> create_pgd_mapping(swapper_pg_dir, va, pa, >>> - map_size, PAGE_KERNEL); >>> + map_size, >>> +#ifdef CONFIG_64BIT >>> + PAGE_KERNEL >>> +#else >>> + PAGE_KERNEL_EXEC >>> +#endif >>> + ); >>> + >>> } >>> } >>> >>> +#ifdef CONFIG_64BIT >>> /* Map the kernel */ >>> create_kernel_page_table(swapper_pg_dir, PMD_SIZE); >>> +#endif >>> >>> /* Clear fixmap PTE and PMD mappings */ >>> clear_fixmap(FIX_PTE); >>> -- >>> 2.20.1 >>>