Skip to content

Commit b05addf

Browse files
Pratyush Yadavakpm00
authored andcommitted
kho: warn and exit when unpreserved page wasn't preserved
Calling __kho_unpreserve() on a pair of (pfn, end_pfn) that wasn't preserved is a bug. Currently, if that is done, the physxa or bits can be NULL. This results in a soft lockup since a NULL physxa or bits results in redoing the loop without ever making any progress. Return when physxa or bits are not found, but WARN first to loudly indicate invalid behaviour. Link: https://lkml.kernel.org/r/20251103180235.71409-3-pratyush@kernel.org Fixes: fc33e4b ("kexec: enable KHO support for memory preservation") Signed-off-by: Pratyush Yadav <pratyush@kernel.org> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Cc: Alexander Graf <graf@amazon.com> Cc: Baoquan He <bhe@redhat.com> Cc: Pasha Tatashin <pasha.tatashin@soleen.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 7ecd2e4 commit b05addf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

kernel/kexec_handover.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ static void __kho_unpreserve(struct kho_mem_track *track, unsigned long pfn,
171171
const unsigned long pfn_high = pfn >> order;
172172

173173
physxa = xa_load(&track->orders, order);
174-
if (!physxa)
175-
continue;
174+
if (WARN_ON_ONCE(!physxa))
175+
return;
176176

177177
bits = xa_load(&physxa->phys_bits, pfn_high / PRESERVE_BITS);
178-
if (!bits)
179-
continue;
178+
if (WARN_ON_ONCE(!bits))
179+
return;
180180

181181
clear_bit(pfn_high % PRESERVE_BITS, bits->preserve);
182182

0 commit comments

Comments
 (0)