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 6955DEB64DD for ; Wed, 21 Jun 2023 23:57:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E8E08D0003; Wed, 21 Jun 2023 19:57:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96ED88D0002; Wed, 21 Jun 2023 19:57:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 810238D0003; Wed, 21 Jun 2023 19:57:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6D9058D0002 for ; Wed, 21 Jun 2023 19:57:02 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3193B160326 for ; Wed, 21 Jun 2023 23:57:02 +0000 (UTC) X-FDA: 80928418284.07.9BF65A5 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by imf06.hostedemail.com (Postfix) with ESMTP id 5DDEF180003 for ; Wed, 21 Jun 2023 23:57:00 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=dabbelt-com.20221208.gappssmtp.com header.s=20221208 header.b="KShjQV/D"; spf=pass (imf06.hostedemail.com: domain of palmer@dabbelt.com designates 209.85.167.170 as permitted sender) smtp.mailfrom=palmer@dabbelt.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687391820; 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:dkim-signature; bh=Mc4fpIkxrmWFX77cuCPTRDrtxqTugNNR8tCOrUF27gs=; b=sDirLLZP+JgQVEASDWMacI8kXqPS1XyvwO9JcDPwLC4QfxrUq4x826Ko3QkIyaiVbRoQFj 6Hb4llhZVQZ4kxcjkEA2M/TAT1cRfcTbiLlv+/lLG5thtzZc4nW57AmQguHO8QWicMBOxB J240OKEEo8LOBi8aI8V1tYfWyj8P/2s= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=dabbelt-com.20221208.gappssmtp.com header.s=20221208 header.b="KShjQV/D"; spf=pass (imf06.hostedemail.com: domain of palmer@dabbelt.com designates 209.85.167.170 as permitted sender) smtp.mailfrom=palmer@dabbelt.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687391820; a=rsa-sha256; cv=none; b=PcgdDxE7K8zyACbZIGQW6pXaDtPH3E00v9kDWU/IupCsDfMlss9zlRdautbw6x4+kpEDuJ ebCAJTkDKEiI0gDbIFHBXZFKct5Gj8MhfsTxuX8MBWczTsIHniOB4CK4n71edkH3fcyTlz bxeHtjlBwlFtLcHEtQLBshSqn8skaks= Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-38dec65ab50so4822928b6e.2 for ; Wed, 21 Jun 2023 16:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20221208.gappssmtp.com; s=20221208; t=1687391819; x=1689983819; h=content-transfer-encoding:mime-version:message-id:to:from:cc :in-reply-to:subject:date:from:to:cc:subject:date:message-id :reply-to; bh=Mc4fpIkxrmWFX77cuCPTRDrtxqTugNNR8tCOrUF27gs=; b=KShjQV/DDsYujReu9d+W4GKA0cU/AD/qDlM4N9t2PNFTfT+KZ0SvbvPWewsnmhN+eO HU950Yob63NkRBFDBknMNhZHUExpxpxdxFSfhncGEHKxmsuL36GSXmpN2HqBPg+pfwDD K1wthFPr69wYkCr8eaE01uYYyEckU2tN7JocwU2NYyijP0c65Xjnkw/201SXofPLelRI iiQyo+NFfOgSmRpfCKFNEWBZs2QpQVmo/xc91DxLV0Tw3PMAx/X/TMHJAcmFzO65b3Zz iM1v3V8urvB3VKHLZYzb0YQ1VK3c0TU7sS8ky8Ik74hODVWhxX0tRvr140Ch7DVlZjD2 XKPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687391819; x=1689983819; h=content-transfer-encoding:mime-version:message-id:to:from:cc :in-reply-to:subject:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Mc4fpIkxrmWFX77cuCPTRDrtxqTugNNR8tCOrUF27gs=; b=UVWwXyJwEe03BCs3+guRW9ndwG/f33hHpnBsJXKClI/jrrdFAIRsTfuRFwIZVZSjMu A8weo1NGN4eiQ3CbiJr/6AdMVIFiwSTkrw6vmHPYA8yIwGqBViAwtrtYWVsgADNwJwe8 ZA0CgyWJrF2nUg02nJnM1y2QimTyxglO9/zF24E2Lpb4PJWkdwX1T6JuOLzspYISBI9/ oCNFyCUsc4xco/bv8Tn5T1UJKQ1XlsjWGFBqvPMoXCLG+bX3Uzp8eiBm3VG8ACaS1Dgh 4N97sP4IeUEb2me2LEyKpXRdROmHAH1VGZ8+RhUvSpnKqDRMYpoQMxAeUFJCzKJB2URX jWXA== X-Gm-Message-State: AC+VfDyOVd55HY57AukF2pq4aDhUW2CtOaNNG39jwwwON4w2Of6qL+6Y H6ljwsPnd/uusldN/02eXnjUNQ== X-Google-Smtp-Source: ACHHUZ5X0a/eiR5H1ppvpN4jE+a/znwL58JjJPGOLiHuqaFtHFz3LZk9cOq6Vs4tx9xfHwMLmSsgOQ== X-Received: by 2002:aca:2b05:0:b0:39d:5610:b779 with SMTP id i5-20020aca2b05000000b0039d5610b779mr17396238oik.49.1687391819292; Wed, 21 Jun 2023 16:56:59 -0700 (PDT) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id p14-20020a63e64e000000b005533c53f550sm3654119pgj.45.2023.06.21.16.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 16:56:58 -0700 (PDT) Date: Wed, 21 Jun 2023 16:56:58 -0700 (PDT) X-Google-Original-Date: Wed, 21 Jun 2023 16:56:18 PDT (-0700) Subject: Re: [PATCH 3/7] riscv: mm: Refactor create_linear_mapping_range() for hot add In-Reply-To: <20230512145737.985671-4-bjorn@kernel.org> CC: Paul Walmsley , aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org, Bjorn Topel , linux-kernel@vger.kernel.org, linux-mm@kvack.org, david@redhat.com, osalvador@suse.de, virtualization@lists.linux-foundation.org, linux@rivosinc.com, alexghiti@rivosinc.com From: Palmer Dabbelt To: bjorn@kernel.org Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5DDEF180003 X-Rspam-User: X-Stat-Signature: xmjpk95ccxkck49h8bpgtjxrcnsy3fxn X-Rspamd-Server: rspam01 X-HE-Tag: 1687391820-265958 X-HE-Meta: U2FsdGVkX1/f22xlbjsUjXh3xy6FRKaVEK632cBrdVWKSx7vWVGfg0/DKYFh42V7s9JUpazxY97E8dQYDFm/1cd6svwMNV1xsIgQ0Z3Xm6hGDnx3lqcqHeG2e5h/YWui0oJmwBS2otEFGVqf9lDFsx90paZxt6i6SQd3nxdF+ALV58nkak4R//bstPljL8JvrnoMGyZ0i5/nZb9ktghmy0cNqfBR4EWNs7x8iPdylSnvYzdfSCVIvTVGXJERXD73/NaqpG93rIZZ5oM9+Gpmxte+TLEFcRg8KTIoaMDEIjQPlfzBOrOJLUrYzpt/wgHYWiyNLV8eTglz+Eeh1/YKdpMJaOPLxIsSRyWkUT342pzBugT+WGQ14YMJ8s24KPVbDaH7SD9RIFnI7US3txsnlmm3fXdCk8Wa3sUP34FB/Zqc2fUfK1zqrkRZpXBCMz0x3TFRuK13nWVHvlNCXhuguJ85jC5ajIrHVneLxjScaK0PrJQXCLj3fDA1Ufs78ZJ3t0iwzYjruJQ4Fq92OjRblrdNYyTsx1vsb5S5R0+L9V+bSeqkPYemd7e/Aw00KeoNGVLPR7vtQ+VySLTtGmL+M2pgsWQ6k1/eduHXoWqBKwhL6gYo+5ezqA28IOi1J6umF2mJTASiKwPIOS5KeTulY3i5bzPAYchOUZ3k28PNkMwsCEA2i5q9Xt1epmx22qta4eAps2Xg5I+LtXrcKbqcgoMNYk/8QYZGL913trTXFxJYBYtQVLuPC9fdDktqma/4fWcZztKvXrVLTuj0h2I75FyGuBrc6PEHJfepZNLFAb5GFmuNaQWVDP2Bh+6qUjzXH1kjDdHorkXnByMUNHPpTbaXNBXvf6PDFqLeayN47JF0NFBPnaX0THOR+jS0y/EZYEDJpr0MG7KTH6WcDbUzaegSeF5fr6b3bSXr9UZ1hMP2oNzaSbrdqvJYlp9mhjbUv9jpsSSrNmndu5hItT+ QL+hYl7D Szu61QbCltR753ReJrIyl/um0Qtp6Bz0eZMHnhPBxIgUkaianXOm9DaZxYFuetIZp8qLd24BPwXJ2fyaw1FaAK5jTVZhV0otdbXwSrflcQBjkKAJ4pqY2NTVNyWVkFLSmK9DQNyUJoxnP8T6dZT9DSXzfzPkVm0Btfu5U7pig5IXPEN4PozvZCOmIlISQM8i/GaDroyqGe6PAyjKsPs8lrXSOQ3xsbLFtdoh6cLFlpQ7UHop3+ZD5piXOneRIMVRs6grCf40tNYBHCmdrW9eWpQwuBXDshCGo0Ft3AKNbCKRQWv8OzTDROz7rQgE4ss9nKD1CBKrWDbYk48afyWtFctleUSJ4U2AaK2DtE6uqEJbCWuz7JcE2pVAAXLKobPv6pZ3J30uetQv7Ut/occRAYXbWINPlhV4flEhN3PDyjsmK2XYvwY6myfchXZ5SK5VPUBHnJFW1mhV+J5iO1lBR6PxNK/38Rp8NCGrx7QE9imSnOvBAs5hQEHAEV9pX60bE6SC/TMgvkgP4oA437Fnv07cu3s/33lEe1nH+SJckNBn4ZfSNY1mqL06Zud/frPawsN2wA2+4uIPEdPMdugQLZEkNjRlx0wyp0cuE 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: On Fri, 12 May 2023 07:57:33 PDT (-0700), bjorn@kernel.org wrote: > From: Björn Töpel > > 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 > --- > 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 . > { > 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);