From nobody Tue Sep 9 21:30:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B14DE1F55F8 for ; Sun, 7 Sep 2025 07:00:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757228436; cv=none; b=NoiVkdIRzLo1jNJoqkr4vqgqAsZZH0quDZKkG2cFJc2sqE30sTMoorsT6bHdWoT0Nu2Y75itkDXdBjFX74tq6meIb+L8X7vCfTNL9bKTX3qDcsWptentL4h4oGmHfF9ZgS8moz6eg1msOCUYnzjZiBpnmvswKZ94urL9ueBADy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757228436; c=relaxed/simple; bh=C3NlxNYz6bfCABhEIee3Vq9GbnEKAONZKNFONpPiN3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U7Q/rBOcEjvwrlWcDKAwguU97hJ4wKUwxS5wHTpgK6lLyct4i8WYPLysgyc5QYCaTZIauWYn0Jn3ItBtmT4YmPhrL2dJzfPdDD10S6ejN5n0oFDghD5XZ7+xkBRt3J9Da4QQJRm2zO0YP19NwFG6tQKJ5JIVSoyLB/CgIFSmUEQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L+GFJd57; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L+GFJd57" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BB81C4CEF0; Sun, 7 Sep 2025 07:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757228436; bh=C3NlxNYz6bfCABhEIee3Vq9GbnEKAONZKNFONpPiN3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L+GFJd57FHStAx/OTPu1bR/rH7JaPjT7G4TukR1LSAMtHgjk/Qt/7IGGznoGvvkkP ygPeIcefuWpuWlpPgq8eGOt1+9wnFQvUp+3kjEKk+mtrjH+p93VPhhvmaSrTXEt/KY nFszmHwkVUN5lU/ioEXXJTufA+3i49fu8IE/E/cmiwKgNp5WQBg3S8SuWYHDJCeNSm vl8N03RC39N7GrDJAvXIaR9FAIri6XF1nSA7dAX0CZvb5hysuMQH/YkjjAhzHgakje /MIY6t/1rvrlGGUk+bHm76OHvuiGRCHnzFO39I82lMyOnWV84f1iHcH8wgLLD2Ii+I twEkTFHNZoEiw== 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 v2 2/2] lib/test_kho: use kho_preserve_vmalloc instead of storing addresses in fdt Date: Sun, 7 Sep 2025 10:00:19 +0300 Message-ID: <20250907070022.2177974-3-rppt@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250907070022.2177974-1-rppt@kernel.org> References: <20250907070022.2177974-1-rppt@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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D { static int kho_test_save_data(struct kho_test_state *state, void *fdt) { phys_addr_t *folios_info __free(kvfree) =3D NULL; + phys_addr_t folios_info_phys; int err =3D 0; =20 - folios_info =3D kvmalloc_array(state->nr_folios, sizeof(*folios_info), - GFP_KERNEL); + folios_info =3D vmalloc_array(state->nr_folios, sizeof(*folios_info)); if (!folios_info) return -ENOMEM; =20 + err =3D kho_preserve_vmalloc(folios_info, &folios_info_phys); + if (err) + return err; + for (int i =3D 0; i < state->nr_folios; i++) { struct folio *folio =3D state->folios[i]; unsigned int order =3D folio_order(folio); @@ -89,11 +94,14 @@ static int kho_test_save_data(struct kho_test_state *st= ate, void *fdt) err |=3D fdt_begin_node(fdt, "data"); err |=3D fdt_property(fdt, "nr_folios", &state->nr_folios, sizeof(state->nr_folios)); - err |=3D fdt_property(fdt, "folios_info", folios_info, - state->nr_folios * sizeof(*folios_info)); + err |=3D fdt_property(fdt, "folios_info", &folios_info_phys, + sizeof(folios_info_phys)); err |=3D fdt_property(fdt, "csum", &state->csum, sizeof(state->csum)); err |=3D fdt_end_node(fdt); =20 + if (!err) + state->folios_info =3D no_free_ptr(folios_info); + return err; } =20 @@ -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 =3D 0; int len; @@ -212,8 +221,12 @@ static int kho_test_restore_data(const void *fdt, int = node) if (!old_csum || len !=3D sizeof(*old_csum)) return -EINVAL; =20 - folios_info =3D fdt_getprop(fdt, node, "folios_info", &len); - if (!folios_info || len !=3D sizeof(*folios_info) * *nr_folios) + folios_info_phys =3D fdt_getprop(fdt, node, "folios_info", &len); + if (!folios_info_phys || len !=3D sizeof(*folios_info_phys)) + return -EINVAL; + + folios_info =3D kho_restore_vmalloc(*folios_info_phys); + if (!folios_info) return -EINVAL; =20 for (int i =3D 0; i < *nr_folios; i++) { @@ -233,6 +246,8 @@ static int kho_test_restore_data(const void *fdt, int n= ode) folio_put(folio); } =20 + vfree(folios_info); + if (csum !=3D *old_csum) return -EINVAL; =20 @@ -291,6 +306,7 @@ static void kho_test_cleanup(void) folio_put(kho_test_state.folios[i]); =20 kvfree(kho_test_state.folios); + vfree(kho_test_state.folios_info); } =20 static void __exit kho_test_exit(void) --=20 2.50.1