From patchwork Thu Mar 16 14:44:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jennifer Herbert X-Patchwork-Id: 9628467 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 DE23860244 for ; Thu, 16 Mar 2017 14:47:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D17CA28528 for ; Thu, 16 Mar 2017 14:47:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C60C72853C; Thu, 16 Mar 2017 14:47:17 +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 0EAB928528 for ; Thu, 16 Mar 2017 14:47:16 +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 1coWe4-0003ht-Ft; Thu, 16 Mar 2017 14:44:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coWe3-0003hk-2V for xen-devel@lists.xen.org; Thu, 16 Mar 2017 14:44:51 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id DF/68-02186-2E4AAC85; Thu, 16 Mar 2017 14:44:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRWlGSWpSXmKPExsXitHRDpO7DJac iDN7OVLdY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDO+9bsVNPpU7OqczNbAOMW8i5GTQ0LAX6Lh 3T2WLkYODjYBE4mvq0pAwiIC6hKnOy6ydjFycTALfGSUuLtpJTNIQljAQeLg/1/sIDaLgKpEW 0M3O0gvr4C3xLwz9RAjFSW6n01gA7GFBDQk+g/eZwWxeQUEJU7OfMICYjMLSEgcfPGCeQIj9y wkqVlIUgsYmVYxahSnFpWlFukamuglFWWmZ5TkJmbm6BoamOrlphYXJ6an5iQmFesl5+duYgQ GAgMQ7GA8e9rzEKMkB5OSKK+W+akIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8bxcD5QSLUtNT K9Iyc4AhCZOW4OBREuEVBYalEG9xQWJucWY6ROoUo6KUOO9ykD4BkERGaR5cGywOLjHKSgnzM gIdIsRTkFqUm1mCKv+KUZyDUUmY9zbIFJ7MvBK46a+AFjMBLX774QTI4pJEhJRUA6NFyDsenb T+mRNNrdl6V31+9YF7etPmGfmn1PzW/U3cJBG5UTHmycRzIdu7hR6dfqefN/vyoYiG1r3mgl+ +T61qnPHeeuUyllnGAT/8A/7edrg/bd43/d5uGx7G3Fs7Cjd9P3qT6Yb3qQ0eBjGXTqj2JjbW 3tn9+bSS4vOjSa4ckya5bdJ3npCvxFKckWioxVxUnAgAUYKjJH4CAAA= X-Env-Sender: prvs=241f9f34a=jennifer.herbert@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1489675487!86223202!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21098 invoked from network); 16 Mar 2017 14:44:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 16 Mar 2017 14:44:49 -0000 X-IronPort-AV: E=Sophos;i="5.36,172,1486425600"; d="scan'208";a="414155135" From: Jennifer Herbert To: Xen-devel Date: Thu, 16 Mar 2017 14:44:04 +0000 Message-ID: <1489675444-34062-1-git-send-email-jennifer.herbert@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Cc: Wei Liu , Jennifer Herbert , Ian Jackson , Paul Durrant , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH] dm_op: Add xendevicemodel_modified_memory_bulk. 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 From: Jennifer Herbert This new lib devicemodel call allows multiple extents of pages to be marked as modified in a single call. This is something needed for a usecase I'm working on. The xen side of the modified_memory call has been modified to accept an array of extents. The devicemodle library either provides an array of length 1, to support the original library function, or a second function allows an array to be provided. Signed-off-by: Jennifer Herbert --- Cc: Jan Beulich Cc: Ian Jackson Cc: Wei Liu Cc: Andrew Cooper Cc: Paul Durrant --- tools/libs/devicemodel/core.c | 30 ++++-- tools/libs/devicemodel/include/xendevicemodel.h | 20 +++- xen/arch/x86/hvm/dm.c | 117 +++++++++++++++-------- xen/include/public/hvm/dm_op.h | 12 ++- 4 files changed, 125 insertions(+), 54 deletions(-) diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c index a85cb49..1f7a9dc 100644 --- a/tools/libs/devicemodel/core.c +++ b/tools/libs/devicemodel/core.c @@ -434,22 +434,36 @@ int xendevicemodel_track_dirty_vram( dirty_bitmap, (size_t)(nr + 7) / 8); } -int xendevicemodel_modified_memory( - xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, - uint32_t nr) +int xendevicemodel_modified_memory_bulk( + xendevicemodel_handle *dmod, domid_t domid, + struct xen_dm_op_modified_memory_extent *extents, uint32_t nr) { struct xen_dm_op op; - struct xen_dm_op_modified_memory *data; + struct xen_dm_op_modified_memory *header; + size_t extents_size = nr * sizeof(struct xen_dm_op_modified_memory_extent); memset(&op, 0, sizeof(op)); op.op = XEN_DMOP_modified_memory; - data = &op.u.modified_memory; + header = &op.u.modified_memory; - data->first_pfn = first_pfn; - data->nr = nr; + header->nr_extents = nr; + header->offset = 0; - return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); + return xendevicemodel_op(dmod, domid, 2, &op, sizeof(op), + extents, extents_size); +} + +int xendevicemodel_modified_memory( + xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, + uint32_t nr) +{ + struct xen_dm_op_modified_memory_extent extent; + + extent.first_pfn = first_pfn; + extent.nr = nr; + + return xendevicemodel_modified_memory_bulk(dmod, domid, &extent, 1); } int xendevicemodel_set_mem_type( diff --git a/tools/libs/devicemodel/include/xendevicemodel.h b/tools/libs/devicemodel/include/xendevicemodel.h index b3f600e..b88d73c 100644 --- a/tools/libs/devicemodel/include/xendevicemodel.h +++ b/tools/libs/devicemodel/include/xendevicemodel.h @@ -236,8 +236,8 @@ int xendevicemodel_track_dirty_vram( uint32_t nr, unsigned long *dirty_bitmap); /** - * This function notifies the hypervisor that a set of domain pages - * have been modified. + * This function notifies the hypervisor that a set of contiguous + * domain pages have been modified. * * @parm dmod a handle to an open devicemodel interface. * @parm domid the domain id to be serviced @@ -249,6 +249,22 @@ int xendevicemodel_modified_memory( xendevicemodel_handle *dmod, domid_t domid, uint64_t first_pfn, uint32_t nr); + +/** + * This function notifies the hypervisor that a set of discontiguous + * domain pages have been modified. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm extents an array of extent structs, which each hold + a start_pfn and nr (number of pfns). + * @parm nr the number of extents in the array + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_modified_memory_bulk( + xendevicemodel_handle *dmod, domid_t domid, + struct xen_dm_op_modified_memory_extent extents[], uint32_t nr); + /** * This function notifies the hypervisor that a set of domain pages * are to be treated in a specific way. (See the definition of diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index 2122c45..0c4a820 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -119,56 +119,96 @@ static int set_isa_irq_level(struct domain *d, uint8_t isa_irq, } static int modified_memory(struct domain *d, - struct xen_dm_op_modified_memory *data) + struct xen_dm_op_modified_memory *header, + xen_dm_op_buf_t* buf) { - xen_pfn_t last_pfn = data->first_pfn + data->nr - 1; - unsigned int iter = 0; - int rc = 0; + /* Process maximum of 255 pfns before checking for continuation */ + const uint32_t max_pfns = 0xff; - if ( (data->first_pfn > last_pfn) || - (last_pfn > domain_get_maximum_gpfn(d)) ) - return -EINVAL; + xen_pfn_t last_pfn; + int rc = 0; + uint32_t offset = header->offset; + unsigned long pfn; + unsigned long max_pfn; + unsigned max_nr; + uint32_t rem_pfns = max_pfns; if ( !paging_mode_log_dirty(d) ) return 0; - while ( iter < data->nr ) + if ( (buf->size / sizeof(struct xen_dm_op_modified_memory_extent)) < + header->nr_extents ) + return -EINVAL; + + while ( offset < header->nr_extents ) { - unsigned long pfn = data->first_pfn + iter; - struct page_info *page; + struct xen_dm_op_modified_memory_extent extent; - page = get_page_from_gfn(d, pfn, NULL, P2M_UNSHARE); - if ( page ) + if ( copy_from_guest_offset(&extent, buf->h, offset, 1) ) + return -EFAULT; + + last_pfn = extent.first_pfn + extent.nr - 1; + + if ( last_pfn > domain_get_maximum_gpfn(d) ) + return -EINVAL; + + if ( extent.nr > rem_pfns ) + max_nr = rem_pfns; + else { - 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); + max_nr = extent.nr; + offset++; } - iter++; + rem_pfns -= max_nr; + max_pfn = extent.first_pfn + max_nr; - /* - * Check for continuation every 256th iteration and if the - * iteration is not the last. - */ - if ( (iter < data->nr) && ((iter & 0xff) == 0) && - hypercall_preempt_check() ) + pfn = extent.first_pfn; + while ( pfn < max_pfn ) { - data->first_pfn += iter; - data->nr -= 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); + } + pfn++; + } - rc = -ERESTART; - break; + if ( max_nr < extent.nr ) + { + extent.first_pfn += max_nr; + extent.nr-= max_nr; + if ( copy_to_guest_offset(buf->h, offset, &extent, 1) ) + return -EFAULT; } - } - return rc; + /* + * Check for continuation every 256th pfn and if the + * pfn is not the last. + */ + + if ( (rem_pfns == 0) && (offset <= header->nr_extents) ) + { + if ( hypercall_preempt_check() ) + { + header->offset = offset; + rc = -ERESTART; + break; + } + rem_pfns += max_pfns; + } + } + return rc; } static bool allow_p2m_type_change(p2m_type_t old, p2m_type_t new) @@ -441,13 +481,8 @@ static int dm_op(domid_t domid, 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); + rc = modified_memory(d, data, &bufs[1]); + const_op = (rc != -ERESTART); break; } diff --git a/xen/include/public/hvm/dm_op.h b/xen/include/public/hvm/dm_op.h index f54cece..1c602b1 100644 --- a/xen/include/public/hvm/dm_op.h +++ b/xen/include/public/hvm/dm_op.h @@ -237,13 +237,19 @@ struct xen_dm_op_set_pci_link_route { * 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. + * DMOP buf 1 contains an array of xen_dm_op_modified_memory_extent with + * nr_extent entries. + * + * On continuation, @offset is set to the next extent to be processed. */ #define XEN_DMOP_modified_memory 11 struct xen_dm_op_modified_memory { + uint32_t nr_extents; /* IN - number of extents. */ + uint32_t offset; /* Caller must set to 0. */ +}; + +struct xen_dm_op_modified_memory_extent { /* IN - number of contiguous pages modified */ uint32_t nr; uint32_t pad;