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 D733CC04FFE for ; Tue, 14 May 2024 14:05:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 684698D0025; Tue, 14 May 2024 10:05:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 633AA8D000D; Tue, 14 May 2024 10:05:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 508548D0025; Tue, 14 May 2024 10:05:21 -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 30F168D000D for ; Tue, 14 May 2024 10:05:21 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D10091A1218 for ; Tue, 14 May 2024 14:05:20 +0000 (UTC) X-FDA: 82117173600.28.AF99DA0 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 2191240013 for ; Tue, 14 May 2024 14:05:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tutFg42F; spf=pass (imf11.hostedemail.com: domain of bjorn@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=bjorn@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715695519; a=rsa-sha256; cv=none; b=riRjGnd/DBnCsG0hlpkZAInC6V+2AiF5SdtAEbBxKlNdLJZm9McMHJtLq3aHwCd30t9Ygx b7+HpjTw0k07PrJL7rIJG2R/IddwbgerMgDkE2QsNuVLILGtPII6ek/pk6CQ8x6lfgQSMY WPm+u8HfAZl55Hox+jaqctcF9dmnlY4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tutFg42F; spf=pass (imf11.hostedemail.com: domain of bjorn@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=bjorn@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715695519; 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=d96B3AWmv3rJbTmg3844gH356qrKf2Yi/vSAtG1DPGU=; b=H2BgvEkOhmQhTud2BYUk39mgiSzU8npiJOYNR40KcRmwzT2/LYs7jCJ/CRRa6tR4qT55lp FgK22PT123u3XS6WHELeOm9dEvDvUkYkf6UzfE8vBuqHstopgx0pXzo10WhVCZU8xZJm5V wJ4PlZf9p8reppznXfhmMmMQHwX0pCk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 3183261276; Tue, 14 May 2024 14:05:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B219C32781; Tue, 14 May 2024 14:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715695518; bh=pGRP84KXNHRvDwj4d3tBEvZ5yXWiOvKEJ5ie6tEwIpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tutFg42F+WZxo8OqjmYracQbf76JUHyChIpewLcaBxxXzAHL9f9NzUzxKpCwPQPMp JAOf7a5DMjRYICN6Zd3nayVU2QucQqYBCAI8sN3NmvDZjznrg3QP+0FsKPkhBf5X1d DjQUz7i2J5ltDjh2koA8AsRmQ0kDN4rVWu0JQFdPf4Vmy6PaVJo12jabRGD99LsIn6 QsnhffWfY2J+BIqE97O1tmA6XlKvqzaJOazwfm63YK7bQUZNkTJ0dnTNMdXBkL3W1n IXNollIatVKhq1PFO/MKuIo9s9ffetE+5TaxWGUT6CgxwvGg7EYhSFKTurXIn/mT0T 2VnjGlsE++ceA== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Alexandre Ghiti , Albert Ou , David Hildenbrand , Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Andrew Bresticker , Chethan Seshadri , Lorenzo Stoakes , Oscar Salvador , Santosh Mamila , Sivakumar Munnangi , Sunil V L , linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux-foundation.org Subject: [PATCH v2 3/8] riscv: mm: Refactor create_linear_mapping_range() for memory hot add Date: Tue, 14 May 2024 16:04:41 +0200 Message-Id: <20240514140446.538622-4-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240514140446.538622-1-bjorn@kernel.org> References: <20240514140446.538622-1-bjorn@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2191240013 X-Stat-Signature: w913wyirjjnzeukhgtwky71moxrjezz3 X-HE-Tag: 1715695518-528934 X-HE-Meta: U2FsdGVkX1973WKnxKasRLaOpDPq6kt9lbNfajU5MrH73WBrI8BsEHuMt9stEXaBcUUV6Xvx6UCZ9T7ntbmnsG3VCGJcBhVoVSJpNWe3bvXy1rMZYFrMTS3ofU7uQlXhuUM8Y2QUJrOn9jQ/A0WqgXFbxw9c1CCrREGVPGfPv3NE10KU0Vh8pz2Ev56HFFQ9KQmaq/pzL4iOgRIjYhJ8FzagXs2vEXfsC/4uPJaf5itSbrvvdpTmHcPm11NvxeavQw34lFQXZTmZisuXsa9cROu/0TXmhsUv11AWvjNT3TdT8hNNtMnKwVH9YWbCKTFDCZDP6k1OMHEGPWREDKjFq0+5DdrkzO9CpIkWe9IIs4j8IGl3vIMmghO+3CZegaJG3px5n0D6DgA5JfUTTJuYDfZfMwdqblhDD9QzxIRK7qdsE6shUlCkRfu3EYkc9OFF8lQpazbt4IvIZx4b8gZTBXDUT8dVfROCve2uoOHpU+ZlucERRnD2+h4KvfLyXm62Ervl8Z0GRYud0onmLigF0DNa3tSeqL/HqLC5ddXV+wfhA1RU6QpE2S1PmDYH8mL46beGkn6DLY+JYGpTm+vtM8h1ZlOEutW+8J4lcCbGrN+5X60h/ccEnnjxhnTh0+sEpR4I5XjQrVCmR1l2Te8+ndsjRGz1eY27bviPzkafw6WhyqpPa0233wjkpXMDY6Gel5JsWrG2cA2CuVXdHHkj+W7lbr7xM1nTRafKI44U+jWy7hU0dwCg3F9J8oXfnLeFKeiWRgx3NCZ2ie3aOaH7V7pUzYpIiEAUFCFg3wcoo3LWp0EHw2py+xw4yDkCQupXCPX9BBICmHVmiQfLe001Dt4F7izH55xtMrR7bE8P9sQi7t5Q25cjUEjFi53uru1vDqa7bGHu9d5Nb7DpqiSanaN9zD/hCjvqtO4oNA3BwPWYddqPP4850kRjDMuZEKMlsLL3jzlpB4Mv+YHmhTx kQemdeMm cd/nKyI9Qd7cL/eJb3dJieimWl55Eo8Ck5riq/3I1CywgfskD37Ov3vYylmq7cJuctq6UmdP9KPsxTqa0DU/a8AD8IzvBdraayWseao2YZ+ntI0qVs+Qq/sCGff3hQiNNiZic/EdxzNNObxUIpyLXk/hiOvamIzHr78hS9jbsnCjroX3Crv2ep3Fq/FtVuEMvS9tDwPsmwYO1KvHg274yTtMM6qcnsZXI5xq/DBlhKKEgFa+Vg6rQSk4YuCgGBb7T2FYqrHKNLGRZHssLtVdnGNHvmPFcvHoHQTKRf8M/NimWiz6Dn7DHqCu53vLFzc8WjMpNHu58ilMikDCGr5TpvnAsiuJdAUgmsWY5YbKyKIZhTGTzNmall/JDDmCK2UJSccS1VuaeIwYbQ9E= 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: 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 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index c969427eab88..6f72b0b2b854 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1227,7 +1227,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) } static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t end, - uintptr_t fixed_map_size) + uintptr_t fixed_map_size, const pgprot_t *pgprot) { phys_addr_t pa; uintptr_t va, map_size; @@ -1238,7 +1238,7 @@ static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t best_map_size(pa, va, end - pa); create_pgd_mapping(swapper_pg_dir, va, pa, map_size, - pgprot_from_va(va)); + pgprot ? *pgprot : pgprot_from_va(va)); } } @@ -1282,22 +1282,19 @@ 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, 0); + create_linear_mapping_range(start, end, 0, NULL); } #ifdef CONFIG_STRICT_KERNEL_RWX - create_linear_mapping_range(ktext_start, ktext_start + ktext_size, 0); - create_linear_mapping_range(krodata_start, - krodata_start + krodata_size, 0); + create_linear_mapping_range(ktext_start, ktext_start + ktext_size, 0, NULL); + create_linear_mapping_range(krodata_start, krodata_start + krodata_size, 0, NULL); memblock_clear_nomap(ktext_start, ktext_size); memblock_clear_nomap(krodata_start, krodata_size); #endif #ifdef CONFIG_KFENCE - create_linear_mapping_range(kfence_pool, - kfence_pool + KFENCE_POOL_SIZE, - PAGE_SIZE); + create_linear_mapping_range(kfence_pool, kfence_pool + KFENCE_POOL_SIZE, PAGE_SIZE, NULL); memblock_clear_nomap(kfence_pool, KFENCE_POOL_SIZE); #endif -- 2.40.1