From nobody Sun May 24 19:34:21 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DCA82222D0 for ; Thu, 21 May 2026 19:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779391925; cv=none; b=toMU5N3aWJXRlfyi5ONrszKYrKlzDWn83QNoQVZa42rPE3Fucra4T4vsp6aLgekCRapPeJcO8nmHSwVCWXVNSQ43M3cO+796wO2YGH7rljnvdp4unRmGoqGKWNR1/XcFVtQff1QvjUxaDSqRJYQhmhBlJwseKR+33ks5/vI46w8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779391925; c=relaxed/simple; bh=18FiwIHEflHKv8xizMheRh9LgmM2NAO59go2uYWDZXQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HHXG5JMdPUR9P8XFXZEy0zpLkQrlCmYHSs7IKk7Z13bGqSAZfTmlFig/bPbw0Sk+7Am6d/uVQLF4Pc2tyyggKWKZLNOKR62KfTwpJAClJirXUy/8Z9jsj9dLlB3L/YBF8KmD/oD4mHr/6xQrcSGo4aCsDllLo90xp8D4TlKik+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DijOWb5V; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DijOWb5V" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c828cee4fcdso3216931a12.3 for ; Thu, 21 May 2026 12:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779391924; x=1779996724; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Skwk48BYilyHQDMbYjOBqYYKx+CCGojb2mWZPJknBhk=; b=DijOWb5VRPlx/hlcK/BGGuOm1LqTnS1+bWvJYz+mJbRGtvPYZGSA33gW7quMVqCRpM kPqKhXxAiO+HgFxyZwVZwUX8ojoiHK+ga8mruknipvN9pw4lqi6hmQNugKWFCwqqJcEs yL7WmAdCO1E/zskD1JVlQrg1YCDw0l+O8k7eFYTUhGIuv/pUbWvaSifFcAQIFjv1Gze9 p25PHEF7y8TaA3kU9lSjersjQs570KbCYGWXW/0yMo7oH93GVS7mozFFC3PVDj2IgBRq 3Fw9rkZmzsfi+tCNVx47u0lzI2diyJZZghX2JnXiVEdwmU4Ou/YEKlIlZpL14DdZJg6v VKHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779391924; x=1779996724; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Skwk48BYilyHQDMbYjOBqYYKx+CCGojb2mWZPJknBhk=; b=YQCIYmLqwxVNUUiwTO0CeoKyvLuk9qWLXeqUCE436U16KLPttf1lSZG3PI+PpyVK6F jIDPd5v3Rc140VCgUxbAz1rbg4yWG5F+MbOATv+PliCRxrM5eWqg7p4E6s2EoQagnwg8 XAAL2A/Zqv9G7ZkqCkNA4um8RsKyscDLJyhlvR5sXG7UFsxeVhSTrbp2JLxaTQaay94l 3TUsrP6jYTyY8TU+N+6aybNkNgpvCw5DO+/sE+AoUqiWnIjQAkt4UI9ykT4quMpQCRHx sEVPzJV6TDo6BpoBJse/u2DFW3NYnFPBmI7Wz35XnjuOFR1GzOep1dDFMXlYIz/GWMX3 jNoQ== X-Forwarded-Encrypted: i=1; AFNElJ/HkyA4V9DugVNgmeqVxoYF7QqtpS5KmaQWkNNKlQk2zG6sDf1VqpH0oG14SGuWbGtZZNhEsNA9XKeq0EU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyd2Qlm23G2vmfXMuOYd1rq71ftpm6sPvN2QGOjaW1N0kTfNpNp gtEURYa7Ep7sR+tW3ZU33aLhy4AjdGL+qTl4Wt4u9nMBf2kwdL0TIicV2viIBuX/OzfYJFgTLWh CKnb78l2neG7bbg== X-Received: from pggk2.prod.google.com ([2002:a63:d102:0:b0:c74:664d:4080]) (user=skhawaja job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:32a0:b0:39b:a997:9e40 with SMTP id adf61e73a8af0-3b328eeeac0mr350862637.46.1779391923585; Thu, 21 May 2026 12:32:03 -0700 (PDT) Date: Thu, 21 May 2026 19:32:00 +0000 In-Reply-To: <20260521193202.746810-1-skhawaja@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260521193202.746810-1-skhawaja@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260521193202.746810-2-skhawaja@google.com> Subject: [PATCH v2 1/3] kho: Add kunit static stubs From: Samiullah Khawaja To: Pasha Tatashin , Mike Rapoport , Pratyush Yadav , Alexander Graf Cc: Samiullah Khawaja , David Matlack , open list , "open list:KEXEC HANDOVER (KHO)" , "open list:KEXEC HANDOVER (KHO)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add kunit stubs in kho_restore_folio() and kho_restore_pages() so the users can mock these functions in kunit tests. Signed-off-by: Samiullah Khawaja --- kernel/liveupdate/kexec_handover.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index 11855e275397..902019f36c24 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -10,6 +10,8 @@ =20 #define pr_fmt(fmt) "KHO: " fmt =20 +#include + #include #include #include @@ -423,7 +425,11 @@ static struct page *kho_restore_page(phys_addr_t phys,= bool is_folio) */ struct folio *kho_restore_folio(phys_addr_t phys) { - struct page *page =3D kho_restore_page(phys, true); + struct page *page; + + KUNIT_STATIC_STUB_REDIRECT(kho_restore_folio, phys); + + page =3D kho_restore_page(phys, true); =20 return page ? page_folio(page) : NULL; } @@ -445,6 +451,8 @@ struct page *kho_restore_pages(phys_addr_t phys, unsign= ed long nr_pages) const unsigned long end_pfn =3D start_pfn + nr_pages; unsigned long pfn =3D start_pfn; =20 + KUNIT_STATIC_STUB_REDIRECT(kho_restore_pages, phys, nr_pages); + while (pfn < end_pfn) { const unsigned int order =3D min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); --=20 2.54.0.746.g67dd491aae-goog From nobody Sun May 24 19:34:21 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9045F39A047 for ; Thu, 21 May 2026 19:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779391926; cv=none; b=oSbqrSgwyrxsqRYoF/Yul5/rfUZOAMvRgHRTT7bMStKwBFT/jbR6R0/5l/xS6OjU0llTG6CVhxeFocyC8ABnzA2Aks41zehOxAx43tKPS4PsI8LjcQb7D0EuYz5Zq6PGHBdlW1IOsgGxS0UFrLTiB/dkPRguHdiBPmCWr7Dd1Es= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779391926; c=relaxed/simple; bh=WhD+jJXvDqJJs6pNZlYlwoBY2bmSJVd0oXI2uRY+f+Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PkCLrRjMlDCQXtBYxDYfQxXHjJW0cdWVaXc2GZWJDHlMRQDrKIV+S4RWqypdnEWt5fYVjgMlR3Qds0uZgvn6aRH7eWgVdCDmJ11k2n52TfdU6MlfGqrQ+YYC1AHRr3tctKxmf2lQStWqZOWhQts3G9P4kccLRgBmsG5AR7pkuEI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MU2Yy1lP; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MU2Yy1lP" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-837c4eb3bdfso3994403b3a.2 for ; Thu, 21 May 2026 12:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779391925; x=1779996725; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=T5K2FdXzRnABLtF63rsnxGYJOAKntAeJNMkiCQxBi/I=; b=MU2Yy1lPAzupeHmXX28ixvXv+FXVbyYeW2rwNsTZhGk5SPAfmNskNa6IUr0jwi8kh8 lVyOYcCK4gIfoBr38532e08bQe5MmAV2KhER6Ly5529xcXU0JwbI0odoD7IcoReAPphW yhg5d+N7NZTjCwk9gA3ROlRGq7ZP21/IBA01nis5LGnw93/N6dEtzpG3G0vR1uhgx9eK DTUw+Tos1qBQmj0b5JrmECfJWTtD17V9ZdpURSneMbdb1XyClgvd/eele5TPbUqoGVIH kChuBokzT4eCejvuSyFaaxXggmpMqn7lWd1tErFFS0PfiB8qhLSZvUNRBqB0J/nvWW6u SBtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779391925; x=1779996725; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=T5K2FdXzRnABLtF63rsnxGYJOAKntAeJNMkiCQxBi/I=; b=l72LlbmKG8jYoR5JcvyLb4TesMrprjYSK5y1zZDtsvtFQsvq1Dy4lCpZJy3w5rW2Su c4cMXI6Tl5msXyQiZC7Y743cuLoazAh/H0zr6aQRdV6zBUGWyKKEP8UqsnofOaGhlM7D v1A/mgwysaWghSviUcMEeyBE347KzLz6akVtoY88zl30fgA6khwRCMKednSN3iRAjUGz +U1bxOc754fYW6MxwbzZ+LrixFw3kEDiEkn7fbrz1XpEDPahapy6DQtad8uvKJWMAaLC dNiI/z6/dBnu3riWkYbLV2vPiYZiwG+2SxTEtlAezJG4WPv/FHSWYVx5bnY3hDPyx87r 3N+g== X-Forwarded-Encrypted: i=1; AFNElJ8GWlOv3UR7B2EIVLkqBpTO8uL9r/QR6J6I3LJebSjGad1507OM4uMesPQP3kx1xAlRLY3TT8gzEiRVFgg=@vger.kernel.org X-Gm-Message-State: AOJu0YyV2bQm/k4JDd/MxxP73muinPx/42b3JNnPdPirTjTmHp5DeZjn fCrnL6/MIXfxSXs8YHoOb5byu0i3IGGhf/xBecdRHABoYyw0jEgCwW+ZNGSgK0a2/CpTFZa6UjU SVPO4Xdumktlm+A== X-Received: from pfwp44.prod.google.com ([2002:a05:6a00:26ec:b0:83f:75b6:75ac]) (user=skhawaja job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1d81:b0:837:42a6:589d with SMTP id d2e1a72fcca58-8415f129f9amr521581b3a.11.1779391924486; Thu, 21 May 2026 12:32:04 -0700 (PDT) Date: Thu, 21 May 2026 19:32:01 +0000 In-Reply-To: <20260521193202.746810-1-skhawaja@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260521193202.746810-1-skhawaja@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260521193202.746810-3-skhawaja@google.com> Subject: [PATCH v2 2/3] kho: Add helper function to check if pages are preserved From: Samiullah Khawaja To: Pasha Tatashin , Mike Rapoport , Pratyush Yadav , Alexander Graf Cc: Samiullah Khawaja , David Matlack , open list , "open list:KEXEC HANDOVER (KHO)" , "open list:KEXEC HANDOVER (KHO)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Kunit test needs to check whether the pages are preserved after preservation or after unpreserve. The helper function added is only enabled when kunit is enabled. Signed-off-by: Samiullah Khawaja --- include/linux/kexec_handover.h | 5 +++ kernel/liveupdate/kexec_handover.c | 53 ++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index 8968c56d2d73..a3afc74cf41c 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -32,6 +32,11 @@ void kho_restore_free(void *mem); struct folio *kho_restore_folio(phys_addr_t phys); struct page *kho_restore_pages(phys_addr_t phys, unsigned long nr_pages); void *kho_restore_vmalloc(const struct kho_vmalloc *preservation); + +#if IS_ENABLED(CONFIG_KUNIT) +bool kho_test_pages_preserved(phys_addr_t phys, unsigned long nr_pages); +#endif + int kho_add_subtree(const char *name, void *blob, size_t size); void kho_remove_subtree(void *blob); int kho_retrieve_subtree(const char *name, phys_addr_t *phys, size_t *size= ); diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index 902019f36c24..abe201825e83 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) "KHO: " fmt =20 #include +#include =20 #include #include @@ -1775,3 +1776,55 @@ int kho_locate_mem_hole(struct kexec_buf *kbuf, =20 return ret =3D=3D 1 ? 0 : -EADDRNOTAVAIL; } + +#if IS_ENABLED(CONFIG_KUNIT) +static bool _kho_is_pfn_preserved(struct kho_radix_tree *tree, + unsigned long pfn, unsigned int order) +{ + unsigned long key =3D kho_radix_encode_key(PFN_PHYS(pfn), order); + struct kho_radix_node *node; + struct kho_radix_leaf *leaf; + unsigned int i, idx; + + if (!tree->root) + return false; + + guard(mutex)(&tree->lock); + + node =3D tree->root; + for (i =3D KHO_TREE_MAX_DEPTH - 1; i > 0; i--) { + idx =3D kho_radix_get_table_index(key, i); + + if (!node->table[idx]) + return false; + + node =3D phys_to_virt(node->table[idx]); + } + + idx =3D kho_radix_get_bitmap_index(key); + leaf =3D (struct kho_radix_leaf *)node; + + return test_bit(idx, leaf->bitmap); +} + +bool kho_test_pages_preserved(phys_addr_t phys, unsigned long nr_pages) +{ + struct kho_radix_tree *tree =3D &kho_out.radix_tree; + unsigned long pfn =3D PHYS_PFN(phys); + unsigned long end_pfn; + unsigned int order; + + end_pfn =3D pfn + nr_pages; + while (pfn < end_pfn) { + order =3D __kho_preserve_pages_order(pfn, end_pfn); + + if (!_kho_is_pfn_preserved(tree, pfn, order)) + return false; + + pfn +=3D 1 << order; + } + + return true; +} +EXPORT_SYMBOL_IF_KUNIT(kho_test_pages_preserved); +#endif --=20 2.54.0.746.g67dd491aae-goog From nobody Sun May 24 19:34:21 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71726401A3A for ; Thu, 21 May 2026 19:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779391927; cv=none; b=cvXDCBecDeIdWkvfK6h1xmb8pEmZkZnGFND12XEjThFvCWdD4rT3e+7HLNhG2j0yU+DRpdHrRyFGHmW+/XOD4+FKsyXoizUoSqK6Nhzgla50J30q/+f0FVxAJLlEgA6NDPgudi6+kjE+FPKFmJoytxCadW5nYRzQr9e+eQug6F4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779391927; c=relaxed/simple; bh=fzTmEXtobJ8gPQ1Uy+bZ7A/yz+rx1mjTIG84+U0AIjw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cuH5bsw4uLIjXPZEPXrzmqoU2PXpSS87IF85cq0iA6YFcIsN8pzBXONheRPRf2kbGL1FPpYQx1TnLz4TlINY7oZvtotMhWykZTnxkDnPt12bufFDJo46UM+n9vlt2OlGmXvoh+Qn6bSPFJmSrSac34Z2WlgyqMRKUesLuXeW034= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=tezuphww; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--skhawaja.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tezuphww" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-83565161a6eso3324999b3a.1 for ; Thu, 21 May 2026 12:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779391926; x=1779996726; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ncOCeCfKsOq2argSmTVmNq9obkxAz4X3VwJeLEeWDgg=; b=tezuphwwbmVs09w+TByMKYUpct82x8oCW+SRNfg8/He32yblOdBywdm4QcZ/MnWseP 0YSanMQ5vAofKdCEeL+XwzlyPhY8bYE98pDGFuArV/X4JETSHaBeQTjds9BEMw7eQyLs De+zKY29IFd6hiM2Db5n/8t2L2TF4JPPEn48Qy24K/omSPTqRI3N/OekNK7tFXd0N5zS XjSsad+qdeueZLS3/mfUCOWJAB1dLr8/pR1KHe+1pYL1onUafywvwDQY6urfHOL7zUtc qrfiCu57n/AtXKplAV8c6qxjDW+J9sxU+Hw+/tP8/IwHiKwKlVy38TAaE39avpGUTkkP cMLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779391926; x=1779996726; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ncOCeCfKsOq2argSmTVmNq9obkxAz4X3VwJeLEeWDgg=; b=DvKhMxQ4mKXwz9lTXdljewhTPo3io3D1z0HUen8T7A6our9//IILblTkBSpLfBlgwI t8KBsd1803xe/Du1gbRUOtL/XjEaYPm3xziJ52KbWRs3BbvLT2+cXPsgrYiLyuoxSvnZ GWnFaCukHSiECcesmlFDhsaHDf23IxWHLBn30igU+V8/WBzYRut/xw10h/rjS0Q+N+cK rLKtIJcKjp6pBcnMGD5EouLeMtBKB2zpogPfVuBRPZY58Gp9WoeULc/OQGK0M1KNMAmz cunQ+St0fMJ/70ftC5lA6wODwiikf+yi05o2Y920eLI4721L0nr+qmp4wb1XGXKwCCEB HxbA== X-Forwarded-Encrypted: i=1; AFNElJ+QHdzhEOaYnwOcLpsMXHrV1xnPgTlMujO7b1a0WEkTuHr2yHkTztXlx025mb8+CWn8zzh2Kiiipg+ZOBY=@vger.kernel.org X-Gm-Message-State: AOJu0YyYtq8r7/0Fg7Fzzobh/3MY9N0LaLa5RxtVsrnpQ5VgFxf8EiG8 M29eNc85Z2FF4a0zb8NG0E9mimaS53+/JLIAXAtO/TKbjMaGspsZM1KM7NXx4wy7DIBEw+ioJIo s+rSIe90QRETmHA== X-Received: from pfll21.prod.google.com ([2002:a05:6a00:1595:b0:82f:93e5:c64c]) (user=skhawaja job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:847:b0:82c:7420:82bf with SMTP id d2e1a72fcca58-84161176bddmr117690b3a.19.1779391925396; Thu, 21 May 2026 12:32:05 -0700 (PDT) Date: Thu, 21 May 2026 19:32:02 +0000 In-Reply-To: <20260521193202.746810-1-skhawaja@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260521193202.746810-1-skhawaja@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260521193202.746810-4-skhawaja@google.com> Subject: [PATCH v2 3/3] kho: Add kunit test to verify preserve/restore pages and folio From: Samiullah Khawaja To: Pasha Tatashin , Mike Rapoport , Pratyush Yadav , Alexander Graf Cc: Samiullah Khawaja , David Matlack , open list , "open list:KEXEC HANDOVER (KHO)" , "open list:KEXEC HANDOVER (KHO)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a kunit test to verify the preserve/unpreserve and restore of pages and folios by mocking the kho kunit restore stubs. Signed-off-by: Samiullah Khawaja --- kernel/liveupdate/Kconfig | 10 ++ kernel/liveupdate/Makefile | 1 + kernel/liveupdate/kexec_handover_test.c | 131 ++++++++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 kernel/liveupdate/kexec_handover_test.c diff --git a/kernel/liveupdate/Kconfig b/kernel/liveupdate/Kconfig index 1a8513f16ef7..d2623f60c0dd 100644 --- a/kernel/liveupdate/Kconfig +++ b/kernel/liveupdate/Kconfig @@ -51,6 +51,16 @@ config KEXEC_HANDOVER_ENABLE_DEFAULT The default behavior can still be overridden at boot time by passing 'kho=3Doff'. =20 +config KEXEC_HANDOVER_KUNIT_TEST + tristate "KUnit test for Kexec Handover (KHO)" + depends on KEXEC_HANDOVER && KUNIT + default KUNIT_ALL_TESTS + help + Enable Kunit tests for Kexec Handover to verify preservation and + unpreservation of memory using KHO API without triggering kexec. + + If unsure, say N. + config LIVEUPDATE bool "Live Update Orchestrator" depends on KEXEC_HANDOVER diff --git a/kernel/liveupdate/Makefile b/kernel/liveupdate/Makefile index d2f779cbe279..ed798b2401a8 100644 --- a/kernel/liveupdate/Makefile +++ b/kernel/liveupdate/Makefile @@ -9,5 +9,6 @@ luo-y :=3D \ obj-$(CONFIG_KEXEC_HANDOVER) +=3D kexec_handover.o obj-$(CONFIG_KEXEC_HANDOVER_DEBUG) +=3D kexec_handover_debug.o obj-$(CONFIG_KEXEC_HANDOVER_DEBUGFS) +=3D kexec_handover_debugfs.o +obj-$(CONFIG_KEXEC_HANDOVER_KUNIT_TEST) +=3D kexec_handover_test.o =20 obj-$(CONFIG_LIVEUPDATE) +=3D luo.o diff --git a/kernel/liveupdate/kexec_handover_test.c b/kernel/liveupdate/ke= xec_handover_test.c new file mode 100644 index 000000000000..9e6dca45c3f3 --- /dev/null +++ b/kernel/liveupdate/kexec_handover_test.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2026, Google LLC + * Author: Samiullah Khawaja + */ + +#include +#include + +#include +#include +#include + +static struct page *kho_test_restore_pages_mock(phys_addr_t phys, + unsigned long nr_pages) +{ + struct page *page =3D phys_to_page(phys); + + if (!kho_test_pages_preserved(phys, nr_pages)) + return NULL; + + kho_unpreserve_pages(page, nr_pages); + return page; +} + +static struct folio *kho_test_restore_folio_mock(phys_addr_t phys) +{ + struct folio *folio =3D page_folio(phys_to_page(phys)); + + if (!kho_test_pages_preserved(phys, (1 << folio_order(folio)))) + return NULL; + + kho_unpreserve_folio(folio); + return folio; +} + +static int kho_test_init(struct kunit *test) +{ + kunit_activate_static_stub(test, kho_restore_pages, + kho_test_restore_pages_mock); + kunit_activate_static_stub(test, kho_restore_folio, + kho_test_restore_folio_mock); + return 0; +} + +static void kho_test_alloc_preserve(struct kunit *test) +{ + void *mem; + + mem =3D kho_alloc_preserve(PAGE_SIZE); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mem); + + /* Verify if memory is preserved */ + KUNIT_EXPECT_TRUE(test, kho_test_pages_preserved(__pa(mem), 1)); + + kho_restore_free(mem); + + /* Memory should be unpreserved after restore_free */ + KUNIT_EXPECT_FALSE(test, kho_test_pages_preserved(__pa(mem), 1)); +} + +static void kho_test_preserve_pages(struct kunit *test) +{ + struct page *restored; + struct page *page; + int err; + + page =3D alloc_pages(GFP_KERNEL | __GFP_ZERO, 1); + KUNIT_ASSERT_NOT_NULL(test, page); + + /* Preserve and verify that pages are preserved */ + err =3D kho_preserve_pages(page, 2); + KUNIT_EXPECT_EQ(test, err, 0); + KUNIT_EXPECT_TRUE(test, + kho_test_pages_preserved(page_to_phys(page), 2)); + + restored =3D kho_restore_pages(page_to_phys(page), 2); + KUNIT_EXPECT_NOT_NULL(test, restored); + KUNIT_EXPECT_PTR_EQ(test, restored, page); + + /* Verify that the pages are not preserved */ + KUNIT_EXPECT_FALSE(test, kho_test_pages_preserved(page_to_phys(page), 2)); + + __free_pages(page, 1); +} + +static void kho_test_preserve_folio(struct kunit *test) +{ + struct folio *restored; + unsigned long nr_pages; + struct folio *folio; + int err; + + folio =3D folio_alloc(GFP_KERNEL | __GFP_ZERO, 1); + KUNIT_ASSERT_NOT_NULL(test, folio); + + nr_pages =3D 1 << folio_order(folio); + + /* Preserve and verify that folio is preserved */ + err =3D kho_preserve_folio(folio); + KUNIT_EXPECT_EQ(test, err, 0); + KUNIT_EXPECT_TRUE(test, kho_test_pages_preserved(PFN_PHYS(folio_pfn(folio= )), nr_pages)); + + restored =3D kho_restore_folio(PFN_PHYS(folio_pfn(folio))); + KUNIT_EXPECT_NOT_NULL(test, restored); + KUNIT_EXPECT_PTR_EQ(test, restored, folio); + + /* Verify that the folio is not preserved */ + KUNIT_EXPECT_FALSE(test, kho_test_pages_preserved(PFN_PHYS(folio_pfn(foli= o)), nr_pages)); + + folio_put(folio); +} + +static struct kunit_case kho_test_cases[] =3D { + KUNIT_CASE(kho_test_alloc_preserve), + KUNIT_CASE(kho_test_preserve_pages), + KUNIT_CASE(kho_test_preserve_folio), + {} +}; + +static struct kunit_suite kho_test_suite =3D { + .name =3D "kho_test", + .init =3D kho_test_init, + .test_cases =3D kho_test_cases, +}; + +kunit_test_suite(kho_test_suite); + +MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING"); +MODULE_DESCRIPTION("KUnit tests for Kexec Handover"); +MODULE_LICENSE("GPL"); --=20 2.54.0.746.g67dd491aae-goog