Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1964650pxj; Sun, 16 May 2021 09:40:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybshhfr/sr6c4WijqZ2DiKTSeJbV3RvjJOT82KIcSmB1Yrm2DQ2/hkeIc5a8J9t7UlBoaf X-Received: by 2002:a05:6602:4c:: with SMTP id z12mr1778210ioz.191.1621183216639; Sun, 16 May 2021 09:40:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621183216; cv=none; d=google.com; s=arc-20160816; b=jvPgATv4TZCjFwaENWZVcwT3vk8QHRctVjBBEC1UDfkV+zfPzcqmkkdBADvpHafyac WfYA1B+/xsUhrYzw81tuD624LSY9UQ5C6E0OyhtLx3NpEGjXsYs1VnlZSl50i3QM9l4D /nfamkkaJ5uDPBomYDRAAqjdcVqdHwayb/bcgFOf2mMRtpzBatw/nfGhFn2NaQxasl5A ri0uMotb2YRArOMT+v5yexlG8H8FDh8zXz7RuW+tQsFd5UBIefiQBIEuHejF2qmXxtyr xOJMgijaK6/JtSHnDSjZNwtMgIVuluBctqWJ554rSTFbEK/ByK0wHVf8MrEZHTk8XJRp g12w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:to:from:date :dkim-signature; bh=ol06G4nr1oo7MVn8heW3nWJm+xuuLewzgqmixnQS5zA=; b=pX3VGTLEkQEJndkVTNPyb9gRRMzQ008sm98EEUCePXNA4pd3Q5V70uSpZ038CrAKfM 3FyOO9/QxAyklBSsBVaiRXJgG2R3DW0Qmj9/rXjLfDOjOpkZYqz+jwpyCTxcHW94xYAx GkHrf/bC/GHqh1hZ2UfrLg45214Bqg/nrRaMGiJXttnDI2kY14vAVhmI1DWZ2fzz7B8X 9fMCwxbGYqf0GwKdRqyY95kBWBxgnO1L/X3M0gKnDj253rfvNI+PPHZSmlS3bHYx603i AH1DW7U8kiP109J2BqCpSluZpZAynXZgn3tJUl9rDiDQW6OgpvsNgB506AUGeG9Qqa+O /Veg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mail.ustc.edu.cn header.s=dkim header.b=aKYU5Aej; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mail.ustc.edu.cn Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w9si15415726ilv.15.2021.05.16.09.40.03; Sun, 16 May 2021 09:40:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mail.ustc.edu.cn header.s=dkim header.b=aKYU5Aej; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mail.ustc.edu.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230410AbhEPN0d (ORCPT + 99 others); Sun, 16 May 2021 09:26:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbhEPN0b (ORCPT ); Sun, 16 May 2021 09:26:31 -0400 Received: from ustc.edu.cn (email6.ustc.edu.cn [IPv6:2001:da8:d800::8]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8473FC061573 for ; Sun, 16 May 2021 06:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.ustc.edu.cn; s=dkim; h=Received:Date:From:To:Subject: Message-ID:In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding; bh=ol06G4nr1oo7MVn8heW3nWJm+xuuLewzgq mixnQS5zA=; b=aKYU5AejENmlnO2F4v2j4l1Aun/VW+VfkhGftLw6NMNTx5YP3o lb0I7b/VmYHwkfBbO5hBqAOxjCxWWjqQfTZ5u7SlA+Fl4DvC/EsruNDUpvFGO+Xx dtOqecXA7wy28Vh+n5l1RMaJo6oph4GK3J+dk05J7eMICbDSCjts2JLNg= Received: from xhacker (unknown [101.86.20.15]) by newmailweb.ustc.edu.cn (Coremail) with SMTP id LkAmygDX3JgWHaFgcOLoAA--.17748S2; Sun, 16 May 2021 21:24:38 +0800 (CST) Date: Sun, 16 May 2021 21:19:22 +0800 From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] riscv: mm: init: Consolidate vars, functions Message-ID: <20210516211922.2110232e@xhacker> In-Reply-To: <20210516211556.43c00055@xhacker> References: <20210516211556.43c00055@xhacker> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CM-TRANSID: LkAmygDX3JgWHaFgcOLoAA--.17748S2 X-Coremail-Antispam: 1UD129KBjvJXoW3AFy3Cr15CF43CrW5ArW3Awb_yoWxurWrpr WkJF1UGF4UXFyqgayxJr98uryrZwn7Wry3tF42k34kA3ZxCr1fWr1jgr4Svry0grWkWa1f ZrZ5ta9rZa17trUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyFb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E 4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rV W3JVWrJr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8 JrUvcSsGvfC2KfnxnUUI43ZEXa7IU56UDtUUUUU== X-CM-SenderInfo: xmv2xttqjtqzxdloh3xvwfhvlgxou0/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 16 May 2021 21:15:56 +0800 Jisheng Zhang wrote: > From: Jisheng Zhang > > Consolidate the following items in init.c > > Staticize global vars as much as possible; > Add __initdata mark if the global var isn't needed after init > Add __init mark if the func isn't needed after init > Add __ro_after_init if the global var is read only after init Hi Alexandre, I think kernel_virt_addr can be removed, users can directly use the KERNEL_LINK_ADDR MACRO. Maybe I miss the reason of intrducing it in commit 2bfc6cd81bd17e43 ("riscv: Move kernel mapping outside of linear mapping"), could you please comment? Thanks in advance > > Signed-off-by: Jisheng Zhang > --- > arch/riscv/include/asm/set_memory.h | 2 +- > arch/riscv/mm/init.c | 36 +++++++++++++++-------------- > 2 files changed, 20 insertions(+), 18 deletions(-) > > diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h > index 086f757e8ba3..9d4d455726d4 100644 > --- a/arch/riscv/include/asm/set_memory.h > +++ b/arch/riscv/include/asm/set_memory.h > @@ -27,7 +27,7 @@ static inline int set_memory_rw_nx(unsigned long addr, int numpages) { return 0; > #endif > > #if defined(CONFIG_64BIT) && defined(CONFIG_STRICT_KERNEL_RWX) > -void protect_kernel_linear_mapping_text_rodata(void); > +void __init protect_kernel_linear_mapping_text_rodata(void); > #else > static inline void protect_kernel_linear_mapping_text_rodata(void) {} > #endif > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 4c4c92ce0bb8..eac2d5c27b3e 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -53,7 +53,7 @@ struct pt_alloc_ops { > #endif > }; > > -static phys_addr_t dma32_phys_limit __ro_after_init; > +static phys_addr_t dma32_phys_limit __initdata; > > static void __init zone_sizes_init(void) > { > @@ -184,7 +184,7 @@ extern char _sdata[], _edata[]; > #endif /* CONFIG_XIP_KERNEL */ > > #ifdef CONFIG_MMU > -static struct pt_alloc_ops _pt_ops __ro_after_init; > +static struct pt_alloc_ops _pt_ops __initdata; > > #ifdef CONFIG_XIP_KERNEL > #define pt_ops (*(struct pt_alloc_ops *)XIP_FIXUP(&_pt_ops)) > @@ -200,13 +200,13 @@ EXPORT_SYMBOL(va_pa_offset); > #endif > /* Offset between kernel mapping virtual address and kernel load address */ > #ifdef CONFIG_64BIT > -unsigned long va_kernel_pa_offset; > +unsigned long va_kernel_pa_offset __ro_after_init; > EXPORT_SYMBOL(va_kernel_pa_offset); > #endif > #ifdef CONFIG_XIP_KERNEL > #define va_kernel_pa_offset (*((unsigned long *)XIP_FIXUP(&va_kernel_pa_offset))) > #endif > -unsigned long va_kernel_xip_pa_offset; > +unsigned long va_kernel_xip_pa_offset __ro_after_init; > EXPORT_SYMBOL(va_kernel_xip_pa_offset); > #ifdef CONFIG_XIP_KERNEL > #define va_kernel_xip_pa_offset (*((unsigned long *)XIP_FIXUP(&va_kernel_xip_pa_offset))) > @@ -216,7 +216,7 @@ EXPORT_SYMBOL(pfn_base); > > pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > -pte_t fixmap_pte[PTRS_PER_PTE] __page_aligned_bss; > +static pte_t fixmap_pte[PTRS_PER_PTE] __page_aligned_bss; > > pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); > > @@ -253,7 +253,7 @@ static inline pte_t *__init get_pte_virt_fixmap(phys_addr_t pa) > return (pte_t *)set_fixmap_offset(FIX_PTE, pa); > } > > -static inline pte_t *get_pte_virt_late(phys_addr_t pa) > +static inline pte_t *__init get_pte_virt_late(phys_addr_t pa) > { > return (pte_t *) __va(pa); > } > @@ -272,7 +272,7 @@ static inline phys_addr_t __init alloc_pte_fixmap(uintptr_t va) > return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); > } > > -static phys_addr_t alloc_pte_late(uintptr_t va) > +static phys_addr_t __init alloc_pte_late(uintptr_t va) > { > unsigned long vaddr; > > @@ -296,10 +296,10 @@ static void __init create_pte_mapping(pte_t *ptep, > > #ifndef __PAGETABLE_PMD_FOLDED > > -pmd_t trampoline_pmd[PTRS_PER_PMD] __page_aligned_bss; > -pmd_t fixmap_pmd[PTRS_PER_PMD] __page_aligned_bss; > -pmd_t early_pmd[PTRS_PER_PMD] __initdata __aligned(PAGE_SIZE); > -pmd_t early_dtb_pmd[PTRS_PER_PMD] __initdata __aligned(PAGE_SIZE); > +static pmd_t trampoline_pmd[PTRS_PER_PMD] __page_aligned_bss; > +static pmd_t fixmap_pmd[PTRS_PER_PMD] __page_aligned_bss; > +static pmd_t early_pmd[PTRS_PER_PMD] __initdata __aligned(PAGE_SIZE); > +static pmd_t early_dtb_pmd[PTRS_PER_PMD] __initdata __aligned(PAGE_SIZE); > > #ifdef CONFIG_XIP_KERNEL > #define trampoline_pmd ((pmd_t *)XIP_FIXUP(trampoline_pmd)) > @@ -319,7 +319,7 @@ static pmd_t *__init get_pmd_virt_fixmap(phys_addr_t pa) > return (pmd_t *)set_fixmap_offset(FIX_PMD, pa); > } > > -static pmd_t *get_pmd_virt_late(phys_addr_t pa) > +static pmd_t *__init get_pmd_virt_late(phys_addr_t pa) > { > return (pmd_t *) __va(pa); > } > @@ -336,7 +336,7 @@ static phys_addr_t __init alloc_pmd_fixmap(uintptr_t va) > return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); > } > > -static phys_addr_t alloc_pmd_late(uintptr_t va) > +static phys_addr_t __init alloc_pmd_late(uintptr_t va) > { > unsigned long vaddr; > > @@ -454,14 +454,16 @@ asmlinkage void __init __copy_data(void) > #error "setup_vm() is called from head.S before relocate so it should not use absolute addressing." > #endif > > -uintptr_t load_pa, load_sz; > +static uintptr_t load_pa __initdata; > +static uintptr_t load_sz __initdata; > #ifdef CONFIG_XIP_KERNEL > #define load_pa (*((uintptr_t *)XIP_FIXUP(&load_pa))) > #define load_sz (*((uintptr_t *)XIP_FIXUP(&load_sz))) > #endif > > #ifdef CONFIG_XIP_KERNEL > -uintptr_t xiprom, xiprom_sz; > +static uintptr_t xiprom __inidata; > +static uintptr_t xiprom_sz __initdata; > #define xiprom_sz (*((uintptr_t *)XIP_FIXUP(&xiprom_sz))) > #define xiprom (*((uintptr_t *)XIP_FIXUP(&xiprom))) > > @@ -646,7 +648,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) > } > > #if defined(CONFIG_64BIT) && defined(CONFIG_STRICT_KERNEL_RWX) > -void protect_kernel_linear_mapping_text_rodata(void) > +void __init protect_kernel_linear_mapping_text_rodata(void) > { > unsigned long text_start = (unsigned long)lm_alias(_start); > unsigned long init_text_start = (unsigned long)lm_alias(__init_text_begin); > @@ -858,7 +860,7 @@ static void __init reserve_crashkernel(void) > * reserved once we call early_init_fdt_scan_reserved_mem() > * later on. > */ > -static int elfcore_hdr_setup(struct reserved_mem *rmem) > +static int __init elfcore_hdr_setup(struct reserved_mem *rmem) > { > elfcorehdr_addr = rmem->base; > elfcorehdr_size = rmem->size;