Message ID | 20230512145737.985671-4-bjorn@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5180167vqo; Fri, 12 May 2023 08:10:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7KP4X3x4Y2lt554FXsc6J8zytGWM63K14oTD6cc20u7o5aHwdHxLtHqTf1cZ8Gz+PZBdxJ X-Received: by 2002:a17:90a:af86:b0:250:5194:b135 with SMTP id w6-20020a17090aaf8600b002505194b135mr20650706pjq.34.1683904233835; Fri, 12 May 2023 08:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683904233; cv=none; d=google.com; s=arc-20160816; b=i3O5rMvqON0Ukv1BAqHMBgN9g5HAl/slwRWRveJo2b9+KloRQHUsPJk7NrlvUmaeD+ 34xHYMYJv+TBaxKeo+2lAwQ22vX6EtFPPsbKYB3++juXaMgx2fHIbhSUU2Z608DVGWpy X+RuUnhHQesDwyK8j13uERNKGFtlQ4zlB/8PEQTec0Vd2h4Tj3wdCKjuQI/COy5q6RN+ yDZ2atuuJq2X2bCAlHH/xjQeeBSak1v1MmWD0H0e0Ncv7bN/tftK9Mvyyc1qeMN/ro24 5n/ugp6EOy4KIzRp9PjvOavG3ClUV3p1zeYJthpA3qeqvw1JFmMHrfmumzJjZvIdR1tF tgBA== 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:date:subject:cc:to:from :dkim-signature; bh=HpZgKr5fu0P/l7DuXAWJOQwuEwXmxH+7XtfSyg24V+Y=; b=nDIbFiGJzrbJ6OBpiff2/LLf8OLQ0S+7EN0DVYw0h+MtrytJ+KzDdaIHQPR2zoycA2 8YhYj8alSfLD3dMgTfU90xQER92cm6MHXKgQlgHvoEg85M0nzliO3tFL80YK21oUfY3i 51XfB7GtdqkaZd/SH8XDl23bSVTIJsE6OGs8sxKIYijfI5Fke5IpY6tEluz/nB0yVRM2 +v5Z55Tr46loA03KXeUECXNusZA/BM7qwjnG0WgeUWotWW0ixEhFsnG/rDXRsYlV4X3N /msw6BnBld3GWcFRuSZjwwc04TKNrrn4r1/RzZ6zy3WokaLkU8GoN6l6AoPw3EEYu9KQ oYkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YPQSWSrA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j184-20020a6380c1000000b0050f736a8d3dsi10465637pgd.64.2023.05.12.08.10.21; Fri, 12 May 2023 08:10:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YPQSWSrA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241437AbjELO6X (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Fri, 12 May 2023 10:58:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241623AbjELO6H (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 12 May 2023 10:58:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5A3E35B3 for <linux-kernel@vger.kernel.org>; Fri, 12 May 2023 07:58:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 629A461137 for <linux-kernel@vger.kernel.org>; Fri, 12 May 2023 14:58:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F83CC433D2; Fri, 12 May 2023 14:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683903485; bh=aaVyrjFt4Z24qTU7IkdzOXPq++vuBvyBWDRYOQbS9VA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPQSWSrA4888qRlom2V9n0E4yFAcDlwO6kLEPA1Z3/jN+kNGhPXLeY8aFL0ESQTul RMyaIs6qUO82q50vSJrCQWrwL5FL7Zd2It0w/k09t7jeuI9/8zofE8JzaXyKCEZlUs 6vZOfEid0lLW22Wa0vb8u5t7SQjIJphqI/J9HwOCpQIywm81oMLE6fnM89OUtnUkFn j8XQGA0U7Xt+BTOHhoHC7wsFBB8N8mbrfH+4xlCjWl8xkta+DzSiBxsCwtLgzfktYM MaJ2hhSLpdhYY4k+7RXHrTEDITwtEA6t4tJs5cfx65BsquOpd3IWQp5793KvR6uCq6 t5vc9nXQmqCFQ== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org> To: Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, linux-riscv@lists.infradead.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn@rivosinc.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, David Hildenbrand <david@redhat.com>, Oscar Salvador <osalvador@suse.de>, virtualization@lists.linux-foundation.org, linux@rivosinc.com, Alexandre Ghiti <alexghiti@rivosinc.com> Subject: [PATCH 3/7] riscv: mm: Refactor create_linear_mapping_range() for hot add Date: Fri, 12 May 2023 16:57:33 +0200 Message-Id: <20230512145737.985671-4-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230512145737.985671-1-bjorn@kernel.org> References: <20230512145737.985671-1-bjorn@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765701565742645769?= X-GMAIL-MSGID: =?utf-8?q?1765701565742645769?= |
Series |
riscv: Memory Hot(Un)Plug support
|
|
Commit Message
Björn Töpel
May 12, 2023, 2:57 p.m. UTC
From: Björn Töpel <bjorn@rivosinc.com> Add a parameter to the direct map setup function, so it can be used in arch_add_memory() later. Signed-off-by: Björn Töpel <bjorn@rivosinc.com> --- arch/riscv/mm/init.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
Comments
On Fri, 12 May 2023 07:57:33 PDT (-0700), bjorn@kernel.org wrote: > From: Björn Töpel <bjorn@rivosinc.com> > > Add a parameter to the direct map setup function, so it can be used in > arch_add_memory() later. > > Signed-off-by: Björn Töpel <bjorn@rivosinc.com> > --- > arch/riscv/mm/init.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index e974ff6ef036..aea8ccb3f4ae 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -1247,18 +1247,19 @@ 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) > +static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t end, > + struct mhp_params *params) Sorry if I missed a v2, but it looks like this fails to build under CONFIG_MEMORY_HOTPLUG=n (as struct mhp_params isn't defined) -- unless I screwed up some merge conflict, but doesn't look like it here. I'm getting CC arch/riscv/mm/init.o arch/riscv/mm/init.c:1252:58: warning: ‘struct mhp_params’ declared inside parameter list will not be visible outside of this definition or declaration 1252 | struct mhp_params *params) | ^~~~~~~~~~ arch/riscv/mm/init.c: In function ‘create_linear_mapping_range’: arch/riscv/mm/init.c:1261:42: error: invalid use of undefined type ‘struct mhp_params’ 1261 | pgprot = params ? params->pgprot : pgprot_from_va(va); | ^~ make[3]: *** [scripts/Makefile.build:252: arch/riscv/mm/init.o] Error 1 make[2]: *** [scripts/Makefile.build:494: arch/riscv/mm] Error 2 make[1]: *** [scripts/Makefile.build:494: arch/riscv] Error 2 make: *** [Makefile:2026: .] Error 2 patchwork is saying something similar <https://gist.github.com/conor-pwbot/9ed9a564e63d824aed1786050ee06558>. > { > phys_addr_t pa; > uintptr_t va, map_size; > > for (pa = start; pa < end; pa += map_size) { > + pgprot_t pgprot; > + > va = (uintptr_t)__va(pa); > + pgprot = params ? params->pgprot : pgprot_from_va(va); > map_size = best_map_size(pa, end - pa); > - > - create_pgd_mapping(swapper_pg_dir, va, pa, map_size, > - pgprot_from_va(va)); > + create_pgd_mapping(swapper_pg_dir, va, pa, map_size, pgprot); > } > } > > @@ -1288,13 +1289,12 @@ static void __init create_linear_mapping_page_table(void) > if (end >= __pa(PAGE_OFFSET) + memory_limit) > end = __pa(PAGE_OFFSET) + memory_limit; > > - create_linear_mapping_range(start, end); > + create_linear_mapping_range(start, end, NULL); > } > > #ifdef CONFIG_STRICT_KERNEL_RWX > - create_linear_mapping_range(ktext_start, ktext_start + ktext_size); > - create_linear_mapping_range(krodata_start, > - krodata_start + krodata_size); > + create_linear_mapping_range(ktext_start, ktext_start + ktext_size, NULL); > + create_linear_mapping_range(krodata_start, krodata_start + krodata_size, NULL); > > memblock_clear_nomap(ktext_start, ktext_size); > memblock_clear_nomap(krodata_start, krodata_size);
Palmer Dabbelt <palmer@dabbelt.com> writes: > On Fri, 12 May 2023 07:57:33 PDT (-0700), bjorn@kernel.org wrote: >> From: Björn Töpel <bjorn@rivosinc.com> >> >> Add a parameter to the direct map setup function, so it can be used in >> arch_add_memory() later. >> >> Signed-off-by: Björn Töpel <bjorn@rivosinc.com> >> --- >> arch/riscv/mm/init.c | 18 +++++++++--------- >> 1 file changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c >> index e974ff6ef036..aea8ccb3f4ae 100644 >> --- a/arch/riscv/mm/init.c >> +++ b/arch/riscv/mm/init.c >> @@ -1247,18 +1247,19 @@ 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) >> +static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t end, >> + struct mhp_params *params) > > Sorry if I missed a v2, but it looks like this fails to build under > CONFIG_MEMORY_HOTPLUG=n (as struct mhp_params isn't defined) -- unless I > screwed up some merge conflict, but doesn't look like it here. > > I'm getting > > CC arch/riscv/mm/init.o > arch/riscv/mm/init.c:1252:58: warning: ‘struct mhp_params’ declared inside parameter list will not be visible outside of this definition or declaration > 1252 | struct mhp_params *params) > | ^~~~~~~~~~ > arch/riscv/mm/init.c: In function ‘create_linear_mapping_range’: > arch/riscv/mm/init.c:1261:42: error: invalid use of undefined type ‘struct mhp_params’ > 1261 | pgprot = params ? params->pgprot : pgprot_from_va(va); > | ^~ > make[3]: *** [scripts/Makefile.build:252: arch/riscv/mm/init.o] Error 1 > make[2]: *** [scripts/Makefile.build:494: arch/riscv/mm] Error 2 > make[1]: *** [scripts/Makefile.build:494: arch/riscv] Error 2 > make: *** [Makefile:2026: .] Error 2 > > patchwork is saying something similar > <https://gist.github.com/conor-pwbot/9ed9a564e63d824aed1786050ee06558>. Yup! Thanks for pointing that out. This series has a bunch of more issues, that need to be resolved in a v2. Björn
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index e974ff6ef036..aea8ccb3f4ae 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1247,18 +1247,19 @@ 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) +static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t end, + struct mhp_params *params) { phys_addr_t pa; uintptr_t va, map_size; for (pa = start; pa < end; pa += map_size) { + pgprot_t pgprot; + va = (uintptr_t)__va(pa); + pgprot = params ? params->pgprot : pgprot_from_va(va); map_size = best_map_size(pa, end - pa); - - create_pgd_mapping(swapper_pg_dir, va, pa, map_size, - pgprot_from_va(va)); + create_pgd_mapping(swapper_pg_dir, va, pa, map_size, pgprot); } } @@ -1288,13 +1289,12 @@ static void __init create_linear_mapping_page_table(void) if (end >= __pa(PAGE_OFFSET) + memory_limit) end = __pa(PAGE_OFFSET) + memory_limit; - create_linear_mapping_range(start, end); + create_linear_mapping_range(start, end, NULL); } #ifdef CONFIG_STRICT_KERNEL_RWX - create_linear_mapping_range(ktext_start, ktext_start + ktext_size); - create_linear_mapping_range(krodata_start, - krodata_start + krodata_size); + create_linear_mapping_range(ktext_start, ktext_start + ktext_size, NULL); + create_linear_mapping_range(krodata_start, krodata_start + krodata_size, NULL); memblock_clear_nomap(ktext_start, ktext_size); memblock_clear_nomap(krodata_start, krodata_size);