From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 495623C5539 for ; Fri, 5 Jun 2026 18:35:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780684521; cv=none; b=IDrHF/+An5T//tmO0GGyQaKQX68O96ZqtoiZjDsKwcDyqBo6U7XXrOyZsj2bLqw3FwunPckuHgp9RBK9X8jz/qwPaZlbkgGZHoA0LTpKYu8+quWd5TKS2VYHMF7KbaHLJRUYA+RqYgcFSw4b313d617t7DD6KTNBboZWJT75IVE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780684521; c=relaxed/simple; bh=/UBD4SRfV209W6yXQvvrQH869Z4vAO+5/8zGi2mGhRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MvCfYRS2Ab5GSdmixdhxwPz/E98clwKPid7u+5ZqO+9aHRvFhsnUHQcL+gojrcjxJ0uX6Y6XSLEYe8cSt54OJ5osAFfY67oblunmpNPB4hEiu+tpS1uzHSMiIFRlvNW7q2VMf4xeQQwBRBXlzIUzI/ph1gLkb/UXD/nYjlwsldo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XfzK9R9w; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XfzK9R9w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B14F11F00898; Fri, 5 Jun 2026 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780684519; bh=R6yDcpji1C+GYUKGpWyVAnr/m2Kie2TV2BOTVneeC1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XfzK9R9w/+8j97Px+AmChM/ZPMAXQowShQTxBd5VUEBg+YEwWjMWhB0B6YsyVkPO+ GjB/7x0yCdaGCzZ8sxAZ/EE/hxP8QlxBiOJJ+gwE8p+KWWB/VuK1lk07m0UZTjsWBq cyHcRCjsUdF7+sZjLUA5E55RAgute94fLjtEcDtAbM7hQ1TM76OZEObpy+PL8+M66m kHWBuG90PapNjA3UsFO8LNgzplcVXSfi45kX9pPIaZiK7SocUu9CDbiBCr5JQDEXIZ OFbQtfkQS4PwE3ghGzotdfuDdTBG3uACNcT5bA+3546BO52jNNQK4scjWbvzP3++qY swHEtglvX23lw== From: Pratyush Yadav To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Alexander Graf , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , Jason Miu , Jork Loeser Cc: kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 03/18] kho: return virtual address of mem_map Date: Fri, 5 Jun 2026 20:34:36 +0200 Message-ID: <20260605183501.3884950-4-pratyush@kernel.org> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog In-Reply-To: <20260605183501.3884950-1-pratyush@kernel.org> References: <20260605183501.3884950-1-pratyush@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Pratyush Yadav (Google)" Currently it is only used by kho_populate(), which doesn't care whether the address is virtual or physical and only cares that it exists and is valid. In coming patches, more callers will be added, all of which will need the virtual address. Make things simpler by directly returning the virtual address. Rename kho_get_mem_map_phys() to kho_get_mem_map() to accurately reflect what it returns. Signed-off-by: Pratyush Yadav (Google) --- kernel/liveupdate/kexec_handover.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index e8454dc5b489..d8dd0ede4f87 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -509,10 +509,11 @@ static int __init kho_preserved_memory_reserve(unsigned long key) return 0; } -/* Returns physical address of the preserved memory map from FDT */ -static phys_addr_t __init kho_get_mem_map_phys(const void *fdt) +/* Returns virtual address of the preserved memory map from FDT */ +static __init void *kho_get_mem_map(const void *fdt) { const void *mem_ptr; + phys_addr_t mem_map_phys; int len; mem_ptr = fdt_getprop(fdt, 0, KHO_FDT_MEMORY_MAP_PROP_NAME, &len); @@ -521,7 +522,11 @@ static phys_addr_t __init kho_get_mem_map_phys(const void *fdt) return 0; } - return get_unaligned((const u64 *)mem_ptr); + mem_map_phys = get_unaligned((const u64 *)mem_ptr); + if (!mem_map_phys) + return NULL; + + return phys_to_virt(mem_map_phys); } /* @@ -1644,8 +1649,7 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, { unsigned int scratch_cnt = scratch_len / sizeof(*kho_scratch); struct kho_scratch *scratch = NULL; - phys_addr_t mem_map_phys; - void *fdt = NULL; + void *fdt = NULL, *mem_map; bool populated = false; int err; @@ -1668,8 +1672,8 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, goto unmap_fdt; } - mem_map_phys = kho_get_mem_map_phys(fdt); - if (!mem_map_phys) + mem_map = kho_get_mem_map(fdt); + if (!mem_map) goto unmap_fdt; scratch = early_memremap(scratch_phys, scratch_len); -- 2.54.0.1032.g2f8565e1d1-goog