From: Paul Durrant <Paul.Durrant@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>
Subject: Re: [PATCH v2 15/19] x86/hvm: Reimplement hvm_copy_*_nofault() in terms of no pagefault_info
Date: Mon, 28 Nov 2016 12:56:58 +0000 [thread overview]
Message-ID: <fd10f30eaf5443d1a2e8c0447b3e6dec@AMSPEX02CL03.citrite.net> (raw)
In-Reply-To: <1480331616-6165-16-git-send-email-andrew.cooper3@citrix.com>
> -----Original Message-----
> From: Andrew Cooper [mailto:andrew.cooper3@citrix.com]
> Sent: 28 November 2016 11:14
> To: Xen-devel <xen-devel@lists.xen.org>
> Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>; Paul Durrant
> <Paul.Durrant@citrix.com>
> Subject: [PATCH v2 15/19] x86/hvm: Reimplement hvm_copy_*_nofault() in
> terms of no pagefault_info
>
> No functional change.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
> Acked-by: Tim Deegan <tim@xen.org>
> ---
> CC: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
> ---
> xen/arch/x86/hvm/emulate.c | 6 ++---
> xen/arch/x86/hvm/hvm.c | 56 +++++++++------------------------------
> xen/arch/x86/mm/shadow/common.c | 8 +++---
> xen/include/asm-x86/hvm/support.h | 11 --------
> 4 files changed, 19 insertions(+), 62 deletions(-)
>
> diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c
> index 6de94d4..5165bb2 100644
> --- a/xen/arch/x86/hvm/emulate.c
> +++ b/xen/arch/x86/hvm/emulate.c
> @@ -1947,9 +1947,9 @@ void hvm_emulate_init_per_insn(
> hvm_access_insn_fetch,
> hvmemul_ctxt->ctxt.addr_size,
> &addr) &&
> - hvm_fetch_from_guest_virt_nofault(hvmemul_ctxt->insn_buf,
> addr,
> - sizeof(hvmemul_ctxt->insn_buf),
> - pfec) == HVMCOPY_okay) ?
> + hvm_fetch_from_guest_virt(hvmemul_ctxt->insn_buf, addr,
> + sizeof(hvmemul_ctxt->insn_buf),
> + pfec, NULL) == HVMCOPY_okay) ?
> sizeof(hvmemul_ctxt->insn_buf) : 0;
> }
> else
> diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> index 390f76d..5eae06a 100644
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -3066,8 +3066,6 @@ void hvm_task_switch(
>
> #define HVMCOPY_from_guest (0u<<0)
> #define HVMCOPY_to_guest (1u<<0)
> -#define HVMCOPY_no_fault (0u<<1)
> -#define HVMCOPY_fault (1u<<1)
> #define HVMCOPY_phys (0u<<2)
> #define HVMCOPY_virt (1u<<2)
> static enum hvm_copy_result __hvm_copy(
> @@ -3112,13 +3110,10 @@ static enum hvm_copy_result __hvm_copy(
> return HVMCOPY_gfn_paged_out;
> if ( pfec & PFEC_page_shared )
> return HVMCOPY_gfn_shared;
> - if ( flags & HVMCOPY_fault )
> + if ( pfinfo )
> {
> - if ( pfinfo )
> - {
> - pfinfo->linear = addr;
> - pfinfo->ec = pfec;
> - }
> + pfinfo->linear = addr;
> + pfinfo->ec = pfec;
>
> hvm_inject_page_fault(pfec, addr);
> }
> @@ -3290,16 +3285,14 @@ enum hvm_copy_result
> hvm_copy_to_guest_phys(
> paddr_t paddr, void *buf, int size)
> {
> return __hvm_copy(buf, paddr, size,
> - HVMCOPY_to_guest | HVMCOPY_fault | HVMCOPY_phys,
> - 0, NULL);
> + HVMCOPY_to_guest | HVMCOPY_phys, 0, NULL);
> }
>
> enum hvm_copy_result hvm_copy_from_guest_phys(
> void *buf, paddr_t paddr, int size)
> {
> return __hvm_copy(buf, paddr, size,
> - HVMCOPY_from_guest | HVMCOPY_fault | HVMCOPY_phys,
> - 0, NULL);
> + HVMCOPY_from_guest | HVMCOPY_phys, 0, NULL);
> }
>
> enum hvm_copy_result hvm_copy_to_guest_virt(
> @@ -3307,7 +3300,7 @@ enum hvm_copy_result hvm_copy_to_guest_virt(
> pagefault_info_t *pfinfo)
> {
> return __hvm_copy(buf, vaddr, size,
> - HVMCOPY_to_guest | HVMCOPY_fault | HVMCOPY_virt,
> + HVMCOPY_to_guest | HVMCOPY_virt,
> PFEC_page_present | PFEC_write_access | pfec, pfinfo);
> }
>
> @@ -3316,7 +3309,7 @@ enum hvm_copy_result
> hvm_copy_from_guest_virt(
> pagefault_info_t *pfinfo)
> {
> return __hvm_copy(buf, vaddr, size,
> - HVMCOPY_from_guest | HVMCOPY_fault | HVMCOPY_virt,
> + HVMCOPY_from_guest | HVMCOPY_virt,
> PFEC_page_present | pfec, pfinfo);
> }
>
> @@ -3325,34 +3318,10 @@ enum hvm_copy_result
> hvm_fetch_from_guest_virt(
> pagefault_info_t *pfinfo)
> {
> return __hvm_copy(buf, vaddr, size,
> - HVMCOPY_from_guest | HVMCOPY_fault | HVMCOPY_virt,
> + HVMCOPY_from_guest | HVMCOPY_virt,
> PFEC_page_present | PFEC_insn_fetch | pfec, pfinfo);
> }
>
> -enum hvm_copy_result hvm_copy_to_guest_virt_nofault(
> - unsigned long vaddr, void *buf, int size, uint32_t pfec)
> -{
> - return __hvm_copy(buf, vaddr, size,
> - HVMCOPY_to_guest | HVMCOPY_no_fault | HVMCOPY_virt,
> - PFEC_page_present | PFEC_write_access | pfec, NULL);
> -}
> -
> -enum hvm_copy_result hvm_copy_from_guest_virt_nofault(
> - void *buf, unsigned long vaddr, int size, uint32_t pfec)
> -{
> - return __hvm_copy(buf, vaddr, size,
> - HVMCOPY_from_guest | HVMCOPY_no_fault | HVMCOPY_virt,
> - PFEC_page_present | pfec, NULL);
> -}
> -
> -enum hvm_copy_result hvm_fetch_from_guest_virt_nofault(
> - void *buf, unsigned long vaddr, int size, uint32_t pfec)
> -{
> - return __hvm_copy(buf, vaddr, size,
> - HVMCOPY_from_guest | HVMCOPY_no_fault | HVMCOPY_virt,
> - PFEC_page_present | PFEC_insn_fetch | pfec, NULL);
> -}
> -
> unsigned long copy_to_user_hvm(void *to, const void *from, unsigned int
> len)
> {
> int rc;
> @@ -3364,8 +3333,7 @@ unsigned long copy_to_user_hvm(void *to, const
> void *from, unsigned int len)
> return 0;
> }
>
> - rc = hvm_copy_to_guest_virt_nofault((unsigned long)to, (void *)from,
> - len, 0);
> + rc = hvm_copy_to_guest_virt((unsigned long)to, (void *)from, len, 0,
> NULL);
> return rc ? len : 0; /* fake a copy_to_user() return code */
> }
>
> @@ -3395,7 +3363,7 @@ unsigned long copy_from_user_hvm(void *to,
> const void *from, unsigned len)
> return 0;
> }
>
> - rc = hvm_copy_from_guest_virt_nofault(to, (unsigned long)from, len, 0);
> + rc = hvm_copy_from_guest_virt(to, (unsigned long)from, len, 0, NULL);
> return rc ? len : 0; /* fake a copy_from_user() return code */
> }
>
> @@ -4070,8 +4038,8 @@ void hvm_ud_intercept(struct cpu_user_regs
> *regs)
> (hvm_long_mode_enabled(cur) &&
> cs->attr.fields.l) ? 64 :
> cs->attr.fields.db ? 32 : 16, &addr) &&
> - (hvm_fetch_from_guest_virt_nofault(sig, addr, sizeof(sig),
> - walk) == HVMCOPY_okay) &&
> + (hvm_fetch_from_guest_virt(sig, addr, sizeof(sig),
> + walk, NULL) == HVMCOPY_okay) &&
> (memcmp(sig, "\xf\xbxen", sizeof(sig)) == 0) )
> {
> regs->eip += sizeof(sig);
> diff --git a/xen/arch/x86/mm/shadow/common.c
> b/xen/arch/x86/mm/shadow/common.c
> index e8501ce..b659324 100644
> --- a/xen/arch/x86/mm/shadow/common.c
> +++ b/xen/arch/x86/mm/shadow/common.c
> @@ -419,8 +419,8 @@ const struct x86_emulate_ops
> *shadow_init_emulation(
> (!hvm_translate_linear_addr(
> x86_seg_cs, regs->eip, sizeof(sh_ctxt->insn_buf),
> hvm_access_insn_fetch, sh_ctxt, &addr) &&
> - !hvm_fetch_from_guest_virt_nofault(
> - sh_ctxt->insn_buf, addr, sizeof(sh_ctxt->insn_buf), 0))
> + !hvm_fetch_from_guest_virt(
> + sh_ctxt->insn_buf, addr, sizeof(sh_ctxt->insn_buf), 0, NULL))
> ? sizeof(sh_ctxt->insn_buf) : 0;
>
> return &hvm_shadow_emulator_ops;
> @@ -447,8 +447,8 @@ void shadow_continue_emulation(struct
> sh_emulate_ctxt *sh_ctxt,
> (!hvm_translate_linear_addr(
> x86_seg_cs, regs->eip, sizeof(sh_ctxt->insn_buf),
> hvm_access_insn_fetch, sh_ctxt, &addr) &&
> - !hvm_fetch_from_guest_virt_nofault(
> - sh_ctxt->insn_buf, addr, sizeof(sh_ctxt->insn_buf), 0))
> + !hvm_fetch_from_guest_virt(
> + sh_ctxt->insn_buf, addr, sizeof(sh_ctxt->insn_buf), 0, NULL))
> ? sizeof(sh_ctxt->insn_buf) : 0;
> sh_ctxt->insn_buf_eip = regs->eip;
> }
> diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-
> x86/hvm/support.h
> index 4aa5a36..114aa04 100644
> --- a/xen/include/asm-x86/hvm/support.h
> +++ b/xen/include/asm-x86/hvm/support.h
> @@ -105,17 +105,6 @@ enum hvm_copy_result
> hvm_fetch_from_guest_virt(
> void *buf, unsigned long vaddr, int size, uint32_t pfec,
> pagefault_info_t *pfinfo);
>
> -/*
> - * As above (copy to/from a guest virtual address), but no fault is generated
> - * when HVMCOPY_bad_gva_to_gfn is returned.
> - */
> -enum hvm_copy_result hvm_copy_to_guest_virt_nofault(
> - unsigned long vaddr, void *buf, int size, uint32_t pfec);
> -enum hvm_copy_result hvm_copy_from_guest_virt_nofault(
> - void *buf, unsigned long vaddr, int size, uint32_t pfec);
> -enum hvm_copy_result hvm_fetch_from_guest_virt_nofault(
> - void *buf, unsigned long vaddr, int size, uint32_t pfec);
> -
> #define HVM_HCALL_completed 0 /* hypercall completed - no further
> action */
> #define HVM_HCALL_preempted 1 /* hypercall preempted - re-execute
> VMCALL */
> #define HVM_HCALL_invalidate 2 /* invalidate ioemu-dm memory cache
> */
> --
> 2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-11-28 12:56 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 11:13 [PATCH for-4.9 v2 00/19] XSA-191 followup Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 01/19] x86/shadow: Fix #PFs from emulated writes crossing a page boundary Andrew Cooper
2016-11-28 11:55 ` Tim Deegan
2016-11-29 15:24 ` Jan Beulich
2016-11-28 11:13 ` [PATCH v2 02/19] x86/emul: Drop X86EMUL_CMPXCHG_FAILED Andrew Cooper
2016-11-28 11:55 ` Tim Deegan
2016-11-29 15:29 ` Jan Beulich
2016-11-28 11:13 ` [PATCH v2 03/19] x86/emul: Simplfy emulation state setup Andrew Cooper
2016-11-28 11:58 ` Paul Durrant
2016-11-28 12:54 ` Paul Durrant
2016-11-28 11:13 ` [PATCH v2 04/19] x86/emul: Rename hvm_trap to x86_event and move it into the emulation infrastructure Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 05/19] x86/emul: Rename HVM_DELIVER_NO_ERROR_CODE to X86_EVENT_NO_EC Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 06/19] x86/pv: Implement pv_inject_{event, page_fault, hw_exception}() Andrew Cooper
2016-11-28 11:58 ` Tim Deegan
2016-11-28 11:59 ` Andrew Cooper
2016-11-29 16:00 ` Jan Beulich
2016-11-29 16:50 ` Andrew Cooper
2016-11-30 8:41 ` Jan Beulich
2016-11-30 13:17 ` Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 07/19] x86/emul: Remove opencoded exception generation Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 08/19] x86/emul: Rework emulator event injection Andrew Cooper
2016-11-28 12:04 ` Tim Deegan
2016-11-28 12:48 ` Andrew Cooper
2016-11-28 14:24 ` Tim Deegan
2016-11-28 14:34 ` Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 09/19] x86/vmx: Use hvm_{get, set}_segment_register() rather than vmx_{get, set}_segment_register() Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 10/19] x86/hvm: Reposition the modification of raw segment data from the VMCB/VMCS Andrew Cooper
2016-11-28 14:18 ` Boris Ostrovsky
2016-11-28 11:13 ` [PATCH v2 11/19] x86/emul: Avoid raising faults behind the emulators back Andrew Cooper
2016-11-28 12:47 ` Paul Durrant
2016-11-29 16:02 ` Jan Beulich
2016-11-28 11:13 ` [PATCH v2 12/19] x86/pv: " Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 13/19] x86/shadow: " Andrew Cooper
2016-11-28 14:49 ` Tim Deegan
2016-11-28 16:04 ` Andrew Cooper
2016-11-28 17:21 ` Tim Deegan
2016-11-28 17:36 ` Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 14/19] x86/hvm: Extend the hvm_copy_*() API with a pagefault_info pointer Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 15/19] x86/hvm: Reimplement hvm_copy_*_nofault() in terms of no pagefault_info Andrew Cooper
2016-11-28 12:56 ` Paul Durrant [this message]
2016-11-28 11:13 ` [PATCH v2 16/19] x86/hvm: Rename hvm_copy_*_guest_virt() to hvm_copy_*_guest_linear() Andrew Cooper
2016-11-28 11:59 ` Paul Durrant
2016-11-28 11:13 ` [PATCH v2 17/19] x86/hvm: Avoid __hvm_copy() raising #PF behind the emulators back Andrew Cooper
2016-11-28 11:56 ` Paul Durrant
2016-11-28 12:58 ` Andrew Cooper
2016-11-28 13:01 ` Paul Durrant
2016-11-28 13:03 ` Andrew Cooper
2016-11-28 14:56 ` Tim Deegan
2016-11-28 16:32 ` Andrew Cooper
2016-11-28 16:42 ` Tim Deegan
2016-11-29 1:22 ` Tian, Kevin
2016-11-29 16:24 ` Jan Beulich
2016-11-29 16:30 ` Andrew Cooper
2016-11-29 16:36 ` Jan Beulich
2016-11-29 16:38 ` Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 18/19] x86/hvm: Prepare to allow use of system segments for memory references Andrew Cooper
2016-11-28 11:13 ` [PATCH v2 19/19] x86/hvm: Use system-segment relative memory accesses Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fd10f30eaf5443d1a2e8c0447b3e6dec@AMSPEX02CL03.citrite.net \
--to=paul.durrant@citrix.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).