File 5c8fb92d-x86-HVM-split-linear-reads-and-writes.patch of Package xen
# Commit 2d527ba310dc6695bba2df118ff9e053f7e40c82
# Date 2019-03-18 16:28:45 +0100
# Author Igor Druzhinin <igor.druzhinin@citrix.com>
# Committer Jan Beulich <jbeulich@suse.com>
x86/hvm: split all linear reads and writes at page boundary
Ruling out page straddling at linear level makes it easier to
distinguish chunks that require proper handling as MMIO access
and not complete them as page straddling memory transactions
prematurely. This doesn't change the general behavior.
Signed-off-by: Igor Druzhinin <igor.druzhinin@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c
@@ -903,12 +903,25 @@ static int linear_read(unsigned long add
uint32_t pfec, struct hvm_emulate_ctxt *hvmemul_ctxt)
{
pagefault_info_t pfinfo;
- int rc = hvm_copy_from_guest_linear(p_data, addr, bytes, pfec, &pfinfo);
+ unsigned int offset = addr & ~PAGE_MASK;
+ int rc;
- switch ( rc )
+ if ( offset + bytes > PAGE_SIZE )
{
- unsigned int offset, part1;
+ unsigned int part1 = PAGE_SIZE - offset;
+
+ /* Split the access at the page boundary. */
+ rc = linear_read(addr, part1, p_data, pfec, hvmemul_ctxt);
+ if ( rc == X86EMUL_OKAY )
+ rc = linear_read(addr + part1, bytes - part1, p_data + part1,
+ pfec, hvmemul_ctxt);
+ return rc;
+ }
+
+ rc = hvm_copy_from_guest_linear(p_data, addr, bytes, pfec, &pfinfo);
+ switch ( rc )
+ {
case HVMCOPY_okay:
return X86EMUL_OKAY;
@@ -920,19 +933,9 @@ static int linear_read(unsigned long add
if ( pfec & PFEC_insn_fetch )
return X86EMUL_UNHANDLEABLE;
- offset = addr & ~PAGE_MASK;
- if ( offset + bytes <= PAGE_SIZE )
- return hvmemul_linear_mmio_read(addr, bytes, p_data, pfec,
- hvmemul_ctxt,
- known_gla(addr, bytes, pfec));
-
- /* Split the access at the page boundary. */
- part1 = PAGE_SIZE - offset;
- rc = linear_read(addr, part1, p_data, pfec, hvmemul_ctxt);
- if ( rc == X86EMUL_OKAY )
- rc = linear_read(addr + part1, bytes - part1, p_data + part1,
- pfec, hvmemul_ctxt);
- return rc;
+ return hvmemul_linear_mmio_read(addr, bytes, p_data, pfec,
+ hvmemul_ctxt,
+ known_gla(addr, bytes, pfec));
case HVMCOPY_gfn_paged_out:
case HVMCOPY_gfn_shared:
@@ -946,12 +949,25 @@ static int linear_write(unsigned long ad
uint32_t pfec, struct hvm_emulate_ctxt *hvmemul_ctxt)
{
pagefault_info_t pfinfo;
- int rc = hvm_copy_to_guest_linear(addr, p_data, bytes, pfec, &pfinfo);
+ unsigned int offset = addr & ~PAGE_MASK;
+ int rc;
- switch ( rc )
+ if ( offset + bytes > PAGE_SIZE )
{
- unsigned int offset, part1;
+ unsigned int part1 = PAGE_SIZE - offset;
+
+ /* Split the access at the page boundary. */
+ rc = linear_write(addr, part1, p_data, pfec, hvmemul_ctxt);
+ if ( rc == X86EMUL_OKAY )
+ rc = linear_write(addr + part1, bytes - part1, p_data + part1,
+ pfec, hvmemul_ctxt);
+ return rc;
+ }
+
+ rc = hvm_copy_to_guest_linear(addr, p_data, bytes, pfec, &pfinfo);
+ switch ( rc )
+ {
case HVMCOPY_okay:
return X86EMUL_OKAY;
@@ -960,19 +976,9 @@ static int linear_write(unsigned long ad
return X86EMUL_EXCEPTION;
case HVMCOPY_bad_gfn_to_mfn:
- offset = addr & ~PAGE_MASK;
- if ( offset + bytes <= PAGE_SIZE )
- return hvmemul_linear_mmio_write(addr, bytes, p_data, pfec,
- hvmemul_ctxt,
- known_gla(addr, bytes, pfec));
-
- /* Split the access at the page boundary. */
- part1 = PAGE_SIZE - offset;
- rc = linear_write(addr, part1, p_data, pfec, hvmemul_ctxt);
- if ( rc == X86EMUL_OKAY )
- rc = linear_write(addr + part1, bytes - part1, p_data + part1,
- pfec, hvmemul_ctxt);
- return rc;
+ return hvmemul_linear_mmio_write(addr, bytes, p_data, pfec,
+ hvmemul_ctxt,
+ known_gla(addr, bytes, pfec));
case HVMCOPY_gfn_paged_out:
case HVMCOPY_gfn_shared:
