From patchwork Mon Jan 23 13:59:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9532571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4E0C76042D for ; Mon, 23 Jan 2017 14:02:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37D1828364 for ; Mon, 23 Jan 2017 14:02:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C47428365; Mon, 23 Jan 2017 14:02:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 026DD28365 for ; Mon, 23 Jan 2017 14:02:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cVfA7-0006yC-9H; Mon, 23 Jan 2017 13:59:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cVfA5-0006vJ-E0 for xen-devel@lists.xenproject.org; Mon, 23 Jan 2017 13:59:57 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 1E/1C-01684-C5C06885; Mon, 23 Jan 2017 13:59:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXjeapy3 CoGWTlcX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmrH7dit7wYPYigM/JzM3ME5y7WLk5JAQ8JfY 3biVEcRmE9CRmPr0EmsXIweHiICKxO29BiBhZoEQiYknJ7CC2MICNhITJ3WwgNgsAqoSM9qmM YHYvAJuEvfnPGCGGCkncf74TzCbU8BdonvxU7B6IaCajZcXQ9kqEuunzmKD6BWUODnzCQvELg mJgy9eME9g5J2FJDULSWoBI9MqRvXi1KKy1CJdI72kosz0jJLcxMwcXUMDY73c1OLixPTUnMS kYr3k/NxNjMDAqWdgYNzBeKrZ+RCjJAeTkijvjfiWCCG+pPyUyozE4oz4otKc1OJDjDIcHEoS vA+42iKEBItS01Mr0jJzgCEMk5bg4FES4VXjBkrzFhck5hZnpkOkTjHqcuzbfuYlkxBLXn5eq pQ47zyQGQIgRRmleXAjYPF0iVFWSpiXkYGBQYinILUoN7MEVf4VozgHo5Iw70+QKTyZeSVwm1 4BHcEEdISsRDPIESWJCCmpBkY33ZqKp8cCzrxnlDsV7tnCFNTQnno0vVqDY6+pZ6fT5pXbrmm c0Fqx/31WrlPEzWtdTdKfjJpKzt+PP7O+f+pM/oWs/zd2Zcf/D+KdG13B9Kzuy/PgJ60Zn+Zr lXZGz3mwUHgNj1Mx95zDf4957f30wihMxjDK1uFK93nvyfr7TYKbtzRXByuxFGckGmoxFxUnA gDjy0lGogIAAA== X-Env-Sender: prvs=189c79d20=Paul.Durrant@citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1485179994!77896465!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32430 invoked from network); 23 Jan 2017 13:59:55 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 23 Jan 2017 13:59:55 -0000 X-IronPort-AV: E=Sophos;i="5.33,274,1477958400"; d="scan'208";a="410209775" From: Paul Durrant To: Date: Mon, 23 Jan 2017 13:59:46 +0000 Message-ID: <1485179989-1763-6-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1485179989-1763-1-git-send-email-paul.durrant@citrix.com> References: <1485179989-1763-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Cc: Paul Durrant , Ian Jackson Subject: [Xen-devel] [PATCH v7 5/8] dm_op: convert HVMOP_modified_memory X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch introduces code to handle DMOP continuations. NOTE: This patch also modifies the type of the 'nr' argument of xc_hvm_modified_memory() from uint64_t to uint32_t. In practice the value passed was always truncated to 32 bits. Suggested-by: Jan Beulich Signed-off-by: Paul Durrant Acked-by: Wei Liu Acked-by: Daniel De Graaf Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- Cc: Ian Jackson v6: - Pass by pointer as requested by Andy. - Modify const_op appropriately. v4: - Continuation code in dm.c modified as knock-on from compat code. Not adding Jan's R-b since patch has fundamentally changed. v3: - Addressed more comments from Jan. v2: - Addressed several comments from Jan, including... - Added explanatory note on continuation handling --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_misc.c | 27 ++++------- xen/arch/x86/hvm/dm.c | 89 +++++++++++++++++++++++++++++++++++-- xen/arch/x86/hvm/hvm.c | 60 ------------------------- xen/include/public/hvm/dm_op.h | 19 ++++++++ xen/include/public/hvm/hvm_op.h | 13 ------ xen/xsm/flask/policy/access_vectors | 2 +- 7 files changed, 116 insertions(+), 96 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 6ab7e20..5ff53ed 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1627,7 +1627,7 @@ int xc_hvm_track_dirty_vram( * Notify that some pages got modified by the Device Model */ int xc_hvm_modified_memory( - xc_interface *xch, domid_t dom, uint64_t first_pfn, uint64_t nr); + xc_interface *xch, domid_t dom, uint64_t first_pfn, uint32_t nr); /* * Set a range of memory to a specific type. diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index ddea2bb..597df99 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -573,29 +573,20 @@ int xc_hvm_track_dirty_vram( } int xc_hvm_modified_memory( - xc_interface *xch, domid_t dom, uint64_t first_pfn, uint64_t nr) + xc_interface *xch, domid_t dom, uint64_t first_pfn, uint32_t nr) { - DECLARE_HYPERCALL_BUFFER(struct xen_hvm_modified_memory, arg); - int rc; - - arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg)); - if ( arg == NULL ) - { - PERROR("Could not allocate memory for xc_hvm_modified_memory hypercall"); - return -1; - } + struct xen_dm_op op; + struct xen_dm_op_modified_memory *data; - arg->domid = dom; - arg->first_pfn = first_pfn; - arg->nr = nr; + memset(&op, 0, sizeof(op)); - rc = xencall2(xch->xcall, __HYPERVISOR_hvm_op, - HVMOP_modified_memory, - HYPERCALL_BUFFER_AS_ARG(arg)); + op.op = XEN_DMOP_modified_memory; + data = &op.u.modified_memory; - xc_hypercall_buffer_free(xch, arg); + data->first_pfn = first_pfn; + data->nr = nr; - return rc; + return do_dm_op(xch, dom, 1, &op, sizeof(op)); } int xc_hvm_set_mem_type( diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index d847892..e28bda4 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -14,6 +14,7 @@ * this program; If not, see . */ +#include #include #include #include @@ -107,6 +108,59 @@ static int set_isa_irq_level(struct domain *d, uint8_t isa_irq, return 0; } +static int modified_memory(struct domain *d, + struct xen_dm_op_modified_memory *data) +{ + xen_pfn_t last_pfn = data->first_pfn + data->nr - 1; + unsigned int iter = 0; + int rc = 0; + + if ( (data->first_pfn > last_pfn) || + (last_pfn > domain_get_maximum_gpfn(d)) ) + return -EINVAL; + + if ( !paging_mode_log_dirty(d) ) + return 0; + + while ( iter < data->nr ) + { + unsigned long pfn = data->first_pfn + iter; + struct page_info *page; + + page = get_page_from_gfn(d, pfn, NULL, P2M_UNSHARE); + if ( page ) + { + mfn_t gmfn = _mfn(page_to_mfn(page)); + + paging_mark_dirty(d, gmfn); + /* + * These are most probably not page tables any more + * don't take a long time and don't die either. + */ + sh_remove_shadows(d, gmfn, 1, 0); + put_page(page); + } + + iter++; + + /* + * Check for continuation every 256th iteration and if the + * iteration is not the last. + */ + if ( (iter < data->nr) && ((iter & 0xff) == 0) && + hypercall_preempt_check() ) + { + data->first_pfn += iter; + data->nr -= iter; + + rc = -ERESTART; + break; + } + } + + return rc; +} + static int dm_op(domid_t domid, unsigned int nr_bufs, xen_dm_op_buf_t bufs[]) @@ -273,12 +327,27 @@ static int dm_op(domid_t domid, break; } + case XEN_DMOP_modified_memory: + { + struct xen_dm_op_modified_memory *data = + &op.u.modified_memory; + + const_op = false; + + rc = -EINVAL; + if ( data->pad ) + break; + + rc = modified_memory(d, data); + break; + } + default: rc = -EOPNOTSUPP; break; } - if ( !rc && + if ( (!rc || rc == -ERESTART) && !const_op && !copy_buf_to_guest(bufs, nr_bufs, 0, &op, sizeof(op)) ) rc = -EFAULT; @@ -297,6 +366,7 @@ int compat_dm_op(domid_t domid, { struct xen_dm_op_buf nat[MAX_NR_BUFS]; unsigned int i; + int rc; if ( nr_bufs > MAX_NR_BUFS ) return -EINVAL; @@ -316,7 +386,13 @@ int compat_dm_op(domid_t domid, #undef XLAT_dm_op_buf_HNDL_h } - return dm_op(domid, nr_bufs, nat); + rc = dm_op(domid, nr_bufs, nat); + + if ( rc == -ERESTART ) + rc = hypercall_create_continuation(__HYPERVISOR_dm_op, "iih", + domid, nr_bufs, bufs); + + return rc; } long do_dm_op(domid_t domid, @@ -324,6 +400,7 @@ long do_dm_op(domid_t domid, XEN_GUEST_HANDLE_PARAM(xen_dm_op_buf_t) bufs) { struct xen_dm_op_buf nat[MAX_NR_BUFS]; + int rc; if ( nr_bufs > MAX_NR_BUFS ) return -EINVAL; @@ -331,7 +408,13 @@ long do_dm_op(domid_t domid, if ( copy_from_guest_offset(nat, bufs, 0, nr_bufs) ) return -EFAULT; - return dm_op(domid, nr_bufs, nat); + rc = dm_op(domid, nr_bufs, nat); + + if ( rc == -ERESTART ) + rc = hypercall_create_continuation(__HYPERVISOR_dm_op, "iih", + domid, nr_bufs, bufs); + + return rc; } /* diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 38a2a46..b29c042 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4965,7 +4965,6 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) default: mask = ~0UL; break; - case HVMOP_modified_memory: case HVMOP_set_mem_type: mask = HVMOP_op_mask; break; @@ -4998,65 +4997,6 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) rc = guest_handle_is_null(arg) ? hvmop_flush_tlb_all() : -EINVAL; break; - case HVMOP_modified_memory: - { - struct xen_hvm_modified_memory a; - struct domain *d; - - if ( copy_from_guest(&a, arg, 1) ) - return -EFAULT; - - rc = rcu_lock_remote_domain_by_id(a.domid, &d); - if ( rc != 0 ) - return rc; - - rc = -EINVAL; - if ( !is_hvm_domain(d) ) - goto modmem_fail; - - rc = xsm_hvm_control(XSM_DM_PRIV, d, op); - if ( rc ) - goto modmem_fail; - - rc = -EINVAL; - if ( a.nr < start_iter || - ((a.first_pfn + a.nr - 1) < a.first_pfn) || - ((a.first_pfn + a.nr - 1) > domain_get_maximum_gpfn(d)) ) - goto modmem_fail; - - rc = 0; - if ( !paging_mode_log_dirty(d) ) - goto modmem_fail; - - while ( a.nr > start_iter ) - { - unsigned long pfn = a.first_pfn + start_iter; - struct page_info *page; - - page = get_page_from_gfn(d, pfn, NULL, P2M_UNSHARE); - if ( page ) - { - paging_mark_dirty(d, _mfn(page_to_mfn(page))); - /* These are most probably not page tables any more */ - /* don't take a long time and don't die either */ - sh_remove_shadows(d, _mfn(page_to_mfn(page)), 1, 0); - put_page(page); - } - - /* Check for continuation if it's not the last interation */ - if ( a.nr > ++start_iter && !(start_iter & HVMOP_op_mask) && - hypercall_preempt_check() ) - { - rc = -ERESTART; - break; - } - } - - modmem_fail: - rcu_unlock_domain(d); - break; - } - case HVMOP_get_mem_type: rc = hvmop_get_mem_type( guest_handle_cast(arg, xen_hvm_get_mem_type_t)); diff --git a/xen/include/public/hvm/dm_op.h b/xen/include/public/hvm/dm_op.h index 17cb830..fd095cc 100644 --- a/xen/include/public/hvm/dm_op.h +++ b/xen/include/public/hvm/dm_op.h @@ -233,6 +233,24 @@ struct xen_dm_op_set_pci_link_route { uint8_t isa_irq; }; +/* + * XEN_DMOP_modified_memory: Notify that a set of pages were modified by + * an emulator. + * + * NOTE: In the event of a continuation, the @first_pfn is set to the + * value of the pfn of the remaining set of pages and @nr reduced + * to the size of the remaining set. + */ +#define XEN_DMOP_modified_memory 11 + +struct xen_dm_op_modified_memory { + /* IN - number of contiguous pages modified */ + uint32_t nr; + uint32_t pad; + /* IN - first pfn modified */ + uint64_aligned_t first_pfn; +}; + struct xen_dm_op { uint32_t op; uint32_t pad; @@ -247,6 +265,7 @@ struct xen_dm_op { struct xen_dm_op_set_pci_intx_level set_pci_intx_level; struct xen_dm_op_set_isa_irq_level set_isa_irq_level; struct xen_dm_op_set_pci_link_route set_pci_link_route; + struct xen_dm_op_modified_memory modified_memory; } u; }; diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index 7cf8d4d..76e1b78 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -99,19 +99,6 @@ typedef enum { /* Following tools-only interfaces may change in future. */ #if defined(__XEN__) || defined(__XEN_TOOLS__) -/* Notify that some pages got modified by the Device Model. */ -#define HVMOP_modified_memory 7 -struct xen_hvm_modified_memory { - /* Domain to be updated. */ - domid_t domid; - /* Number of pages. */ - uint32_t nr; - /* First pfn. */ - uint64_aligned_t first_pfn; -}; -typedef struct xen_hvm_modified_memory xen_hvm_modified_memory_t; -DEFINE_XEN_GUEST_HANDLE(xen_hvm_modified_memory_t); - #define HVMOP_set_mem_type 8 /* Notify that a region of memory is to be treated in a specific way. */ struct xen_hvm_set_mem_type { diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 2f0ed2d..361e7aa 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -262,7 +262,7 @@ class hvm bind_irq # XEN_DOMCTL_pin_mem_cacheattr cacheattr -# HVMOP_modified_memory, HVMOP_get_mem_type, HVMOP_set_mem_type, +# HVMOP_get_mem_type, HVMOP_set_mem_type, # HVMOP_set_mem_access, HVMOP_get_mem_access, HVMOP_pagetable_dying, # HVMOP_inject_trap hvmctl