x86/HVM: update repeat count upon nested lin->phys failure
PATCH 1/1 x86/HVM: update repeat count upon nested lin->phys failure
For the X86EMUL_EXCEPTION case the repeat count must be correctly propagated back. Since for the recursive invocation we use a local helper variable, its value needs copying to the caller's one.
While there also correct the off-by-1 range in the comment ahead of the function (strictly speaking for the "DF set" case we'd need to put another, different range there as well).
xen/arch/x86/hvm/emulate.c +4 -1
@@ -825,7 +825,7 @@ static void hvmemul_unmap_linear_addr(/* * Convert addr from linear to physical form, valid over the range -* [addr, addr + *reps * bytes_per_rep]. *reps is adjusted according to +* [addr, addr + *reps * bytes_per_rep). *reps is adjusted according to * the valid computed range. It is always >0 when X86EMUL_OKAY is returned. * @pfec indicates the access checks to be performed during page-table walks. */
@@ -865,7 +865,10 @@ static int hvmemul_linear_to_phys(int rc =hvmemul_linear_to_phys ( addr, &_paddr, bytes_per_rep, &one_rep, pfec, hvmemul_ctxt);if ( rc !=X86EMUL_OKAY ) + { + *reps = one_rep;return rc; + } pfn = _paddr >>PAGE_SHIFT ; }else if ( (pfn =paging_gva_to_gfn (curr, addr, &pfec)) ==gfn_x (INVALID_GFN ) )
Quoted 11 lines · Jan Beulich
For the
X86EMUL_EXCEPTIONcase the repeat count must be correctly propagated back. Since for the recursive invocation we use a local helper variable, its value needs copying to the caller's one.While there also correct the off-by-1 range in the comment ahead of the function (strictly speaking for the "DF set" case we'd need to put another, different range there as well).
Fixes 53f87c03b4ea ("x86emul: generalize exception handling for rep_* hooks")Reported-by Manuel Andreas <[email protected]>Signed-off-by Jan Beulich <[email protected]>
I really do hate everything about how *reps is handled in the emulator, but this will have to do in the short term.