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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05EB4CA100B for ; Wed, 3 Sep 2025 06:36:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L/NFMtx4Yhan7qfaUDRumI5vWdHH79NVYyphQT29qf0=; b=Za5qGP+vsHfnIVhI7gxt5ODISu k58zy9bZo8Y6Qo8T+FGzfOx8LkTfZ7iqeBdQcZTBJlkDmLE9d+R8FSFtL9WIzdU9Q1KT1IlVSbiRu kvpJQhreHvH5ObO85zh/V4b5liSwC3dSnb0+3O87iBa129Fg7WzeKlVfEMzZ4qnp2iWGBXULTP4Pe NAdcix+/kxG4xmTRXbRQjtOwjOmHnQyIHLN8ftf4hwds9SqywCeAICqoP7JNGDIvCP+4HOxDJTE+m dQEVNtRK32DbDwVGWDWGjmIE4xoTKuVMDtDxIfTp24XGpKeZ4UIHCMlVCoRwZ9+KJBAVvEAR2JgBZ XujQrL7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uth6C-00000004h9n-38pA; Wed, 03 Sep 2025 06:36:04 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uth0r-00000004efa-1Umm for kexec@lists.infradead.org; Wed, 03 Sep 2025 06:30:34 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 028AA44BE4; Wed, 3 Sep 2025 06:30:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B792CC4CEF0; Wed, 3 Sep 2025 06:30:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756881032; bh=C3NlxNYz6bfCABhEIee3Vq9GbnEKAONZKNFONpPiN3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aC+N1oXwxBgKXwGUcqK/EB5vl94l2OaSNEWh5MVcKe9/E3ZEaR3Il3xvniELhXC/u QEjwv5BvLPs/0LpPZgTeF9956fEiZqkVkJH1CteKyNspczWHXrTsgbwdSqpVSW7y3a bjV4uwAzs5j3qtLiKFRj36ghUYj4cbpmvKNvJwjfPg3Gc2t600hWq/Zw42Zd6u1Vow gPAObDgd8sIX6fQ95Fa2bXboBlxUlAUAR/q0sZ1FN088T0nnV3BFvMMv1XeM4kKNfR DkTEZ0nX/vogWZzUXpbt7gdX7X7Hlm9WfJSpdtksE5qf5hUiDk92XCB/enYUB7ESzO jtNDZKFvGUnIw== From: Mike Rapoport To: Andrew Morton Cc: Alexander Graf , Baoquan He , Changyuan Lyu , Chris Li , Jason Gunthorpe , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] lib/test_kho: use kho_preserve_vmalloc instead of storing addresses in fdt Date: Wed, 3 Sep 2025 09:30:18 +0300 Message-ID: <20250903063018.3346652-3-rppt@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250903063018.3346652-1-rppt@kernel.org> References: <20250903063018.3346652-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250902_233033_439112_7D6E8BD5 X-CRM114-Status: GOOD ( 14.59 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org From: "Mike Rapoport (Microsoft)" KHO test stores physical addresses of the preserved folios directly in fdt. Use kho_preserve_vmalloc() instead of it and kho_restore_vmalloc() to retrieve the addresses after kexec. This makes the test more scalable from one side and adds tests coverage for kho_preserve_vmalloc() from the other. Signed-off-by: Mike Rapoport (Microsoft) --- lib/test_kho.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/test_kho.c b/lib/test_kho.c index c2eb899c3b45..10045f5979a0 100644 --- a/lib/test_kho.c +++ b/lib/test_kho.c @@ -32,6 +32,7 @@ module_param(max_mem, long, 0644); struct kho_test_state { unsigned int nr_folios; struct folio **folios; + phys_addr_t *folios_info; struct folio *fdt; __wsum csum; }; @@ -68,13 +69,17 @@ static struct notifier_block kho_test_nb = { static int kho_test_save_data(struct kho_test_state *state, void *fdt) { phys_addr_t *folios_info __free(kvfree) = NULL; + phys_addr_t folios_info_phys; int err = 0; - folios_info = kvmalloc_array(state->nr_folios, sizeof(*folios_info), - GFP_KERNEL); + folios_info = vmalloc_array(state->nr_folios, sizeof(*folios_info)); if (!folios_info) return -ENOMEM; + err = kho_preserve_vmalloc(folios_info, &folios_info_phys); + if (err) + return err; + for (int i = 0; i < state->nr_folios; i++) { struct folio *folio = state->folios[i]; unsigned int order = folio_order(folio); @@ -89,11 +94,14 @@ static int kho_test_save_data(struct kho_test_state *state, void *fdt) err |= fdt_begin_node(fdt, "data"); err |= fdt_property(fdt, "nr_folios", &state->nr_folios, sizeof(state->nr_folios)); - err |= fdt_property(fdt, "folios_info", folios_info, - state->nr_folios * sizeof(*folios_info)); + err |= fdt_property(fdt, "folios_info", &folios_info_phys, + sizeof(folios_info_phys)); err |= fdt_property(fdt, "csum", &state->csum, sizeof(state->csum)); err |= fdt_end_node(fdt); + if (!err) + state->folios_info = no_free_ptr(folios_info); + return err; } @@ -197,7 +205,8 @@ static int kho_test_save(void) static int kho_test_restore_data(const void *fdt, int node) { const unsigned int *nr_folios; - const phys_addr_t *folios_info; + const phys_addr_t *folios_info_phys; + phys_addr_t *folios_info; const __wsum *old_csum; __wsum csum = 0; int len; @@ -212,8 +221,12 @@ static int kho_test_restore_data(const void *fdt, int node) if (!old_csum || len != sizeof(*old_csum)) return -EINVAL; - folios_info = fdt_getprop(fdt, node, "folios_info", &len); - if (!folios_info || len != sizeof(*folios_info) * *nr_folios) + folios_info_phys = fdt_getprop(fdt, node, "folios_info", &len); + if (!folios_info_phys || len != sizeof(*folios_info_phys)) + return -EINVAL; + + folios_info = kho_restore_vmalloc(*folios_info_phys); + if (!folios_info) return -EINVAL; for (int i = 0; i < *nr_folios; i++) { @@ -233,6 +246,8 @@ static int kho_test_restore_data(const void *fdt, int node) folio_put(folio); } + vfree(folios_info); + if (csum != *old_csum) return -EINVAL; @@ -291,6 +306,7 @@ static void kho_test_cleanup(void) folio_put(kho_test_state.folios[i]); kvfree(kho_test_state.folios); + vfree(kho_test_state.folios_info); } static void __exit kho_test_exit(void) -- 2.50.1