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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01F47C25B74 for ; Tue, 21 May 2024 12:35:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 600CC6B0088; Tue, 21 May 2024 08:35:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 587146B0098; Tue, 21 May 2024 08:35:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D9826B009E; Tue, 21 May 2024 08:35:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1BE486B0088 for ; Tue, 21 May 2024 08:35:49 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9C563A11AC for ; Tue, 21 May 2024 12:35:48 +0000 (UTC) X-FDA: 82142349576.27.B3389FD Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by imf23.hostedemail.com (Postfix) with ESMTP id B6462140008 for ; Tue, 21 May 2024 12:35:46 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wnvUD6aC; dmarc=none; spf=pass (imf23.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716294946; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1WWapkkThh/Y99F52WW+zEVSnw2Q3pRRIZyBMEsctj8=; b=dj5g+riycCZ1977AEdWr5pu8tj/DZc0ZGK/IMQF2NySlVdynD8Y2lGuj1vVYoLYFwJjz6J 7iFTfqRj3KCWV+GO0MKCBoJtKjThPLPYlv7Vp90Z6NDCjzkZ48TB87rPnOs3Bb+sEZGYMU oYOZ0m7D5M4JYwVc/d+LmgmtGmP++Jo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wnvUD6aC; dmarc=none; spf=pass (imf23.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716294946; a=rsa-sha256; cv=none; b=ja6MfuaQV+HIZRq98LtGw3VDyFJNmlRBjsA5MJqHSo/CN+Cb3RDvIXPb39AeYTmqO1aPe2 F/bqfibUm/FXCoWttUg11OspIqVfkmFUPQlONzn3HpEDDOLpajK+qs6OgT8ypYtDSzrOba 3CYBR3G95NbdLclFV6wcWmxcnOThx3s= Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a5a4bc9578cso813650366b.2 for ; Tue, 21 May 2024 05:35:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1716294945; x=1716899745; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=1WWapkkThh/Y99F52WW+zEVSnw2Q3pRRIZyBMEsctj8=; b=wnvUD6aC4KUt2te9ocOQ83f+EQjABsSGcEOTw7G1JxjrDJwLO6w/eAnX+IWtqzJyrX LvZyHAXIAQVZbPbOU60fRiB8JNAkJ+wbVCgNPHOKvYKX/u9eCr9jV6nqUQdZaAkr0etk Dup9S69NHx8EqO9LgU9jgMVGM9kK9WQDzDCjulIn8OVEs1rWtbeKIyCT8ZaIeP+eYugv 8wIuCv+6Ey/oICkgkuGnDXyBDurl7Idn7jRvjjCENCcMSAkVA2DhcabsJIIfa/bPJQIB 55sUwo3GsyITtYeLvT343/TGLXIFYZuGW9DG6RMBrZKB7ahh0tJgANgE0R7w6YiPvdmQ RODw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716294945; x=1716899745; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1WWapkkThh/Y99F52WW+zEVSnw2Q3pRRIZyBMEsctj8=; b=MwAptZti46Dwi6krcCuHnUwLLX15lBFw3Lq/5rAfVvIt5lE9CgNkgzDlOelFz6torA +at6liLsSG/MMLWDEVIGTaWWFHLytL5q7ckeuWgHwhnN6QAXCyJkSP98XzlBLNJTDWM2 tRQDpo0IBBh7C8QKF9SH4cxUQqMjkCP6I6qcgRIoFR2Fl55G2+SSd3kYmU3HSXyhX+pD xC3ItiWAT43lDJHERvi6pMdCYsLniB4Suaiq677dwEePGZ/yAt+WZG6130dvi3GIaEAN qiutZ7Bl8MXdFkGw86Ps0rBhhaGKVe0wsk8nMrY1b615wNltNt0B1qGB9J2oQlK3YTMU WiMg== X-Forwarded-Encrypted: i=1; AJvYcCUMIuuJ70hrNskNpSdZDaAIp8EwCJnN32co3Z+Pc/PfanZd7r3xLi91wGYBovh9knd/fTxHmJ7fmPbG72Tdmj8AYOg= X-Gm-Message-State: AOJu0YwMvEBYfGlJiwu+c3ufo4Z/PTYbYqIYTwUnlprp7/kDzAhFa0cI UdSNVl2qrxZ378xIGBoCzE2SZxILoWYYNmJI3sCvt1mnGb6SCbmvHbTVe3zA88LBPt2BP3LTJ3K PcLjkZ2eyar6Y6j2tWTLL6bhxRx3n0n8hSPyHfQ== X-Google-Smtp-Source: AGHT+IEAnwtcawhGsvoiDU5egcp+8BWpo/0gaVCuP0mcubsH7FN3B4W2sdAU3nQcpY7za33qaVUAyqjvbYRuIWmtcsE= X-Received: by 2002:a17:907:2d13:b0:a59:c577:c5c3 with SMTP id a640c23a62f3a-a5a2d57a48emr3475611566b.29.1716294945079; Tue, 21 May 2024 05:35:45 -0700 (PDT) MIME-Version: 1.0 References: <20240521114830.841660-1-bjorn@kernel.org> <20240521114830.841660-4-bjorn@kernel.org> In-Reply-To: <20240521114830.841660-4-bjorn@kernel.org> From: Alexandre Ghiti Date: Tue, 21 May 2024 14:35:34 +0200 Message-ID: Subject: Re: [PATCH v3 3/9] riscv: mm: Change attribute from __init to __meminit for page functions To: =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= Cc: Albert Ou , David Hildenbrand , Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org, Oscar Salvador , =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= , Andrew Bresticker , Chethan Seshadri , Lorenzo Stoakes , Santosh Mamila , Sivakumar Munnangi , Sunil V L , linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux-foundation.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: B6462140008 X-Stat-Signature: 6gwy96u9ajica6sczky4954qwbbc8hop X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1716294946-943796 X-HE-Meta: U2FsdGVkX19a2tDz2FoJUWswQx6m2g40nj6tZsiKb0f3ocK4PnUSDSQmfLTlUAAnriPRhfgXIvbR35p3EKmUO2B1171t8qu4ToC5E0oRS7aPvc0JQopgSjT2HJgKw7SVRh+Ez+LRHjoiLOb3IXIJigXVwaMyAZbYvQFlbmpHjipca+wXYssv0M+kCDN7nqWT3gCGuidbRiA7xRpE5sm8/K6mybRQQrWWnN9QQJxpe9uLbjqDjrq3jTc0NsnlHowqqZBy7shm88kSaQTzLp35o4OT88aePPX5yaeOsqYMJDmmUNQLEZEzIb6sDw7ar8zqT0R5dat84/5W6w/Hosn53uxBChcY6ChBrYzwrLFlDptKjh+JNma7B6OWMOes0+3XkfSMbAdF0Jq9w9oMGUC0OkK2H5rRmcOPxx+IwWiKhsrzGN/4HAgqCQ3/HAqaC9StSqq5mdy/ugPBNEfi/QmIntqfPsn5homLlR9HA9eOY0vYDATC7jE3IMUb+BElTMUbodBhZhxg4mPbQNVVZ4zjKyK9WIhmEYuGIGBPjWTSGiYZTuDmTEUHJI3Z9IUno6LCIqyuvWlLkRxd2MspwMm5MftHvHLIwhaaBF5WVV7rKWQXnJp4TweQY5RP9dULW87TNWpWyclc40Rcc0bqpXHsWGhF/tZCRDTPP2UoG6jo3JBwGgiayBzFDur1JDoeCVhwFwc3/8CjABRVZew95A07owcwJGlGkR8NFNT8ePgq7Aqec/l01p3y7nS6sRn/VxNAK1hSHzyTY0TfuZJfCk6qhOc6ShVH5cjAdAGQ83yqHVsO1JmP90smrlUZ7E+nqT3pBH2PFCazL7wVxG3N7u/7heVxsXZgrKx+ebkDQXQwqPehslSL4cj8V43VwfYBsHU3uTzvmaWYXCBoNc4Lj/voKzNd7CdIuBfCduEFOukSSwATUNZHaqeAt8SzPLCc40Kgrv5WzSaNWoV3TjP4eTB 99LREpOh LKBLOMf4XJsR0AlnJy0LJPfuVGmrVEOtFm1v0s98RJaAtjBMoTeeS3kRr1Gx63W4E4FXzsF4Ve94ihk+DYI+8cHfvdMmiwozpG1qNlCj9n9MA/+XgG1RxwnAfJC+rmMJTDWEgJT7wJLs+nFiCtE3AJTZaoNoh736FWelOmqECZ0d+KF9Bk6d9F+0c/8/w4vC6HAGEWbBkPgys6xUyO4DslLkwyAVhJAiMFHDJRffu5VlMPCp37SeyPC9w3fTmTN9LxrE3ImCDh1+R7WCBT0vPX9bmVDaLdGaZCJBTi+ks4W4htMWcMtlSBfk6b0lsk3EtD9Y7ySUXEPX6A6V0pNdqQ1PQ7oUEPC71DhZer/NlU2sGoA97n65zCfumSA8ZNdC1s+BEuiaHp4OIFg3osQ0yzTV7du0Imn/PC+E+DY+8vgdZDZt4XHdY5ygacPdH3I1CF+2CVuZmHmzNvC4= 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: List-Subscribe: List-Unsubscribe: On Tue, May 21, 2024 at 1:48=E2=80=AFPM Bj=C3=B6rn T=C3=B6pel wrote: > > From: Bj=C3=B6rn T=C3=B6pel > > Prepare for memory hotplugging support by changing from __init to > __meminit for the page table functions that are used by the upcoming > architecture specific callbacks. > > Changing the __init attribute to __meminit, avoids that the functions > are removed after init. The __meminit attribute makes sure the > functions are kept in the kernel text post init, but only if memory > hotplugging is enabled for the build. > > Reviewed-by: David Hildenbrand > Reviewed-by: Oscar Salvador > Signed-off-by: Bj=C3=B6rn T=C3=B6pel > --- > arch/riscv/include/asm/mmu.h | 4 +-- > arch/riscv/include/asm/pgtable.h | 2 +- > arch/riscv/mm/init.c | 56 ++++++++++++++------------------ > 3 files changed, 28 insertions(+), 34 deletions(-) > > diff --git a/arch/riscv/include/asm/mmu.h b/arch/riscv/include/asm/mmu.h > index 947fd60f9051..c9e03e9da3dc 100644 > --- a/arch/riscv/include/asm/mmu.h > +++ b/arch/riscv/include/asm/mmu.h > @@ -31,8 +31,8 @@ typedef struct { > #define cntx2asid(cntx) ((cntx) & SATP_ASID_MASK) > #define cntx2version(cntx) ((cntx) & ~SATP_ASID_MASK) > > -void __init create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t pa= , > - phys_addr_t sz, pgprot_t prot); > +void __meminit create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t= pa, phys_addr_t sz, > + pgprot_t prot); > #endif /* __ASSEMBLY__ */ > > #endif /* _ASM_RISCV_MMU_H */ > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pg= table.h > index 58fd7b70b903..7933f493db71 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -162,7 +162,7 @@ struct pt_alloc_ops { > #endif > }; > > -extern struct pt_alloc_ops pt_ops __initdata; > +extern struct pt_alloc_ops pt_ops __meminitdata; > > #ifdef CONFIG_MMU > /* Number of PGD entries that a user-mode program can use */ > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index c98010ede810..c969427eab88 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -295,7 +295,7 @@ static void __init setup_bootmem(void) > } > > #ifdef CONFIG_MMU > -struct pt_alloc_ops pt_ops __initdata; > +struct pt_alloc_ops pt_ops __meminitdata; > > pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > @@ -357,7 +357,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 *__init get_pte_virt_late(phys_addr_t pa) > +static inline pte_t *__meminit get_pte_virt_late(phys_addr_t pa) > { > return (pte_t *) __va(pa); > } > @@ -376,7 +376,7 @@ static inline phys_addr_t __init alloc_pte_fixmap(uin= tptr_t va) > return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); > } > > -static phys_addr_t __init alloc_pte_late(uintptr_t va) > +static phys_addr_t __meminit alloc_pte_late(uintptr_t va) > { > struct ptdesc *ptdesc =3D pagetable_alloc(GFP_KERNEL & ~__GFP_HIG= HMEM, 0); > > @@ -384,9 +384,8 @@ static phys_addr_t __init alloc_pte_late(uintptr_t va= ) > return __pa((pte_t *)ptdesc_address(ptdesc)); > } > > -static void __init create_pte_mapping(pte_t *ptep, > - uintptr_t va, phys_addr_t pa, > - phys_addr_t sz, pgprot_t prot) > +static void __meminit create_pte_mapping(pte_t *ptep, uintptr_t va, phys= _addr_t pa, phys_addr_t sz, > + pgprot_t prot) > { > uintptr_t pte_idx =3D pte_index(va); > > @@ -440,7 +439,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 *__init get_pmd_virt_late(phys_addr_t pa) > +static pmd_t *__meminit get_pmd_virt_late(phys_addr_t pa) > { > return (pmd_t *) __va(pa); > } > @@ -457,7 +456,7 @@ static phys_addr_t __init alloc_pmd_fixmap(uintptr_t = va) > return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); > } > > -static phys_addr_t __init alloc_pmd_late(uintptr_t va) > +static phys_addr_t __meminit alloc_pmd_late(uintptr_t va) > { > struct ptdesc *ptdesc =3D pagetable_alloc(GFP_KERNEL & ~__GFP_HIG= HMEM, 0); > > @@ -465,9 +464,9 @@ static phys_addr_t __init alloc_pmd_late(uintptr_t va= ) > return __pa((pmd_t *)ptdesc_address(ptdesc)); > } > > -static void __init create_pmd_mapping(pmd_t *pmdp, > - uintptr_t va, phys_addr_t pa, > - phys_addr_t sz, pgprot_t prot) > +static void __meminit create_pmd_mapping(pmd_t *pmdp, > + uintptr_t va, phys_addr_t pa, > + phys_addr_t sz, pgprot_t prot) > { > pte_t *ptep; > phys_addr_t pte_phys; > @@ -503,7 +502,7 @@ static pud_t *__init get_pud_virt_fixmap(phys_addr_t = pa) > return (pud_t *)set_fixmap_offset(FIX_PUD, pa); > } > > -static pud_t *__init get_pud_virt_late(phys_addr_t pa) > +static pud_t *__meminit get_pud_virt_late(phys_addr_t pa) > { > return (pud_t *)__va(pa); > } > @@ -521,7 +520,7 @@ static phys_addr_t __init alloc_pud_fixmap(uintptr_t = va) > return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); > } > > -static phys_addr_t alloc_pud_late(uintptr_t va) > +static phys_addr_t __meminit alloc_pud_late(uintptr_t va) > { > unsigned long vaddr; > > @@ -541,7 +540,7 @@ static p4d_t *__init get_p4d_virt_fixmap(phys_addr_t = pa) > return (p4d_t *)set_fixmap_offset(FIX_P4D, pa); > } > > -static p4d_t *__init get_p4d_virt_late(phys_addr_t pa) > +static p4d_t *__meminit get_p4d_virt_late(phys_addr_t pa) > { > return (p4d_t *)__va(pa); > } > @@ -559,7 +558,7 @@ static phys_addr_t __init alloc_p4d_fixmap(uintptr_t = va) > return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE); > } > > -static phys_addr_t alloc_p4d_late(uintptr_t va) > +static phys_addr_t __meminit alloc_p4d_late(uintptr_t va) > { > unsigned long vaddr; > > @@ -568,9 +567,8 @@ static phys_addr_t alloc_p4d_late(uintptr_t va) > return __pa(vaddr); > } > > -static void __init create_pud_mapping(pud_t *pudp, > - uintptr_t va, phys_addr_t pa, > - phys_addr_t sz, pgprot_t prot) > +static void __meminit create_pud_mapping(pud_t *pudp, uintptr_t va, phys= _addr_t pa, phys_addr_t sz, > + pgprot_t prot) > { > pmd_t *nextp; > phys_addr_t next_phys; > @@ -595,9 +593,8 @@ static void __init create_pud_mapping(pud_t *pudp, > create_pmd_mapping(nextp, va, pa, sz, prot); > } > > -static void __init create_p4d_mapping(p4d_t *p4dp, > - uintptr_t va, phys_addr_t pa, > - phys_addr_t sz, pgprot_t prot) > +static void __meminit create_p4d_mapping(p4d_t *p4dp, uintptr_t va, phys= _addr_t pa, phys_addr_t sz, > + pgprot_t prot) > { > pud_t *nextp; > phys_addr_t next_phys; > @@ -653,9 +650,8 @@ static void __init create_p4d_mapping(p4d_t *p4dp, > #define create_pmd_mapping(__pmdp, __va, __pa, __sz, __prot) do {} while= (0) > #endif /* __PAGETABLE_PMD_FOLDED */ > > -void __init create_pgd_mapping(pgd_t *pgdp, > - uintptr_t va, phys_addr_t pa, > - phys_addr_t sz, pgprot_t prot) > +void __meminit create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t= pa, phys_addr_t sz, > + pgprot_t prot) > { > pgd_next_t *nextp; > phys_addr_t next_phys; > @@ -680,8 +676,7 @@ void __init create_pgd_mapping(pgd_t *pgdp, > create_pgd_next_mapping(nextp, va, pa, sz, prot); > } > > -static uintptr_t __init best_map_size(phys_addr_t pa, uintptr_t va, > - phys_addr_t size) > +static uintptr_t __meminit best_map_size(phys_addr_t pa, uintptr_t va, p= hys_addr_t size) > { > if (pgtable_l5_enabled && > !(pa & (P4D_SIZE - 1)) && !(va & (P4D_SIZE - 1)) && size >=3D= P4D_SIZE) > @@ -714,7 +709,7 @@ asmlinkage void __init __copy_data(void) > #endif > > #ifdef CONFIG_STRICT_KERNEL_RWX > -static __init pgprot_t pgprot_from_va(uintptr_t va) > +static __meminit pgprot_t pgprot_from_va(uintptr_t va) > { > if (is_va_kernel_text(va)) > return PAGE_KERNEL_READ_EXEC; > @@ -739,7 +734,7 @@ void mark_rodata_ro(void) > set_memory_ro); > } > #else > -static __init pgprot_t pgprot_from_va(uintptr_t va) > +static __meminit pgprot_t pgprot_from_va(uintptr_t va) > { > if (IS_ENABLED(CONFIG_64BIT) && !is_kernel_mapping(va)) > return PAGE_KERNEL; > @@ -1231,9 +1226,8 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) > pt_ops_set_fixmap(); > } > > -static void __init create_linear_mapping_range(phys_addr_t start, > - phys_addr_t end, > - uintptr_t fixed_map_size) > +static void __meminit create_linear_mapping_range(phys_addr_t start, phy= s_addr_t end, > + uintptr_t fixed_map_siz= e) > { > phys_addr_t pa; > uintptr_t va, map_size; > -- > 2.40.1 > You can add: Reviewed-by: Alexandre Ghiti Thanks, Alex