From patchwork Wed Sep 27 12:39:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Stefan ISAILA X-Patchwork-Id: 9973959 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 7BABF602D6 for ; Wed, 27 Sep 2017 12:42:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FF18223A0 for ; Wed, 27 Sep 2017 12:42:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63E7C27F7F; Wed, 27 Sep 2017 12:42:12 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 8C3DD223A0 for ; Wed, 27 Sep 2017 12:42:11 +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 1dxBcu-0000HB-6f; Wed, 27 Sep 2017 12:39:44 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dxBct-0000Gt-5i for xen-devel@lists.xen.org; Wed, 27 Sep 2017 12:39:43 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 12/00-03283-E0C9BC95; Wed, 27 Sep 2017 12:39:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42KJPp7Rqssz53S kQe8TA4slHxezODB6HN39mymAMYo1My8pvyKBNePq46vsBU3uFY/v5TYwtpt1MXJyMAtYS/T+ a2bsYuTiYBFoZpF42vGdHcL5ySzx7l8rE0iVkICHxNwpC1hAEkICCxglvt1azgiTaPp7mhEis YxR4sSRhSwgCTYBA4lXX7+BFYkISEtc+3yZEWJfhcT2SXvBaoQFvCQeTJ0GZrMIqEp0TFvDDm LzCrhL9J/cA2ZLCMhJ3DzXyTyBkW8BI8MqRo3i1KKy1CJdQ2O9pKLM9IyS3MTMHF1DAzO93NT i4sT01JzEpGK95PzcTYzAUGEAgh2MX5YFHGKU5GBSEuWd03o6UogvKT+lMiOxOCO+qDQntfgQ owwHh5IE7/zZQDnBotT01Iq0zBxg0MKkJTh4lER4OUHSvMUFibnFmekQqVOMxhzHNl3+w8TRc fPuHyYhlrz8vFQpcd4UkFIBkNKM0jy4QbBousQoKyXMywh0mhBPQWpRbmYJqvwrRnEORiVh3p kgU3gy80rg9r0COoUJ6JTeqSdATilJREhJNTBu7Fd7Iil+xPWjn8zLac+WyioVnLpuMyd7R/a GfxtCEt8rth2M93K7KHT6TPz7Qz0X/CdJ812VkGXV9fB5JNBQnnF5S2pQZuuO5ayCAbpyBxbX PAt+lm2bdOtlJLsSu7+i467VySk9TxLenVG4tt7+n4Z3RLGf+sTynozPN+dvON7POkWB2ViJp Tgj0VCLuag4EQBS3k2ioQIAAA== X-Env-Sender: aisaila@bitdefender.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1506515980!59234314!1 X-Originating-IP: [91.199.104.133] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3607 invoked from network); 27 Sep 2017 12:39:40 -0000 Received: from mx02.bbu.dsd.mx.bitdefender.com (HELO mx02.buh.bitdefender.com) (91.199.104.133) by server-2.tower-27.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 27 Sep 2017 12:39:40 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=GZV0/DoekR555PfuEHM4qa6VVAiWC/eZFA3b+WIdHsot5pPwsSeDtaAonDjrCm/mN2dVuxoVmhLQCS30DeK6YLjiPg6/jeiNC63kPoFi/0t24gHtm2BObMgBYeNiOn0ps4MITUoAipRA+yeUq2+7HGHLOYBt1O7sxrml/d2NRZcoB97Tsv+EFnRmZlNweKY0eMU/r2vxkYQimSSAfx1c5Etk1HO7wOFdO3p0xY+m6V45q09fYj7oG8mtCK/xdHf9pyt3vXhdPW0EI3IDKzXFZGpxP1K1rRUw0WHmc4vCOSycm2TLY+3MHfvse/HbDjI+eNq71g3RGShWIQZ4yGdFUA==; h=Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bitdefender.com; h=from:to :cc:subject:date:message-id; s=default; bh=J4VCRcHJpd4ro21bsVa0q 8/ca+k=; b=svPaOBSCtOaX8/YlRNfJChNeow3Dq72sUFKUYTKan05bddu/pci9J Mw9VvJHeP0UipGja98LXPrrbB3EEyNzpGx/7JuGQNyhb6ptlHV/gefgfJhhGxtw4 aI3HxU9cO15NjRaq2PI/sULRXk2XPPy6zaNwrQZFmzamT6zLvcVZBYLpO6IVpLY0 SKhPWUWnO3fwxAQBJyCHXSngKXFLJK86VdU66UL5kGnUYjec5q/0UYxqkLvcRLjx a/F7aXKZNCJpTKOu7sNIn4HL+LKij59s1/xqfPkB5ryTO/MzYZMdx7nA2CM6cPq2 /Z6HzPOQj+iM+e8BQip5y1gAFVtMf6tJw== Received: (qmail 16134 invoked from network); 27 Sep 2017 15:39:38 +0300 Received: from mx01robo.bbu.dsd.mx.bitdefender.com (10.17.80.60) by mx02.buh.bitdefender.com with AES128-GCM-SHA256 encrypted SMTP; 27 Sep 2017 15:39:38 +0300 Received: (qmail 28288 invoked from network); 27 Sep 2017 15:39:37 +0300 Received: from unknown (HELO aisaila-Latitude-E5570.dsd.bitdefender.biz) (10.10.195.54) by mx01robo.bbu.dsd.mx.bitdefender.com with SMTP; 27 Sep 2017 15:39:37 +0300 From: Alexandru Isaila To: xen-devel@lists.xen.org Date: Wed, 27 Sep 2017 15:39:33 +0300 Message-Id: <1506515973-12081-1-git-send-email-aisaila@bitdefender.com> X-Mailer: git-send-email 2.7.4 Cc: Alexandru Isaila , andrew.cooper3@citrix.com, paul.durrant@citrix.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH v6] x86/hvm: Implement hvmemul_write() using real mappings 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Cooper An access which crosses a page boundary is performed atomically by x86 hardware, albeit with a severe performance penalty. An important corner case is when a straddled access hits two pages which differ in whether a translation exists, or in net access rights. The use of hvm_copy*() in hvmemul_write() is problematic, because it performs a translation then completes the partial write, before moving onto the next translation. If an individual emulated write straddles two pages, the first of which is writable, and the second of which is not, the first half of the write will complete before #PF is raised from the second half. This results in guest state corruption as a side effect of emulation, which has been observed to cause windows to crash while under introspection. Introduce the hvmemul_{,un}map_linear_addr() helpers, which translate an entire contents of a linear access, and vmap() the underlying frames to provide a contiguous virtual mapping for the emulator to use. This is the same mechanism as used by the shadow emulation code. This will catch any translation issues and abort the emulation before any modifications occur. Signed-off-by: Andrew Cooper Signed-off-by: Alexandru Isaila Reviewed-by: Paul Durrant --- Changes since V5: - Added address size check - Added a pages local variable that holds the number of pages - Addded the !mapping check --- xen/arch/x86/hvm/emulate.c | 189 ++++++++++++++++++++++++++++++++++---- xen/include/asm-x86/hvm/emulate.h | 7 ++ 2 files changed, 180 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index cc874ce..c563052 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -498,6 +498,170 @@ static int hvmemul_do_mmio_addr(paddr_t mmio_gpa, } /* + * Map the frame(s) covering an individual linear access, for writeable + * access. May return NULL for MMIO, or ERR_PTR(~X86EMUL_*) for other errors + * including ERR_PTR(~X86EMUL_OKAY) for write-discard mappings. + * + * In debug builds, map() checks that each slot in hvmemul_ctxt->mfn[] is + * clean before use, and poisions unused slots with INVALID_MFN. + */ +static void *hvmemul_map_linear_addr( + unsigned long linear, unsigned int bytes, uint32_t pfec, + struct hvm_emulate_ctxt *hvmemul_ctxt) +{ + struct vcpu *curr = current; + void *err, *mapping; + + /* First and final gfns which need mapping. */ + unsigned long frame = linear >> PAGE_SHIFT, first = frame; + unsigned long final = (linear + bytes - !!bytes) >> PAGE_SHIFT; + unsigned long pages = final - first + 1; + + if ( hvmemul_ctxt->ctxt.addr_size < 64 ) + { + frame = (uint32_t)frame; + final = (uint32_t)final; + pages = (uint32_t)pages; + } + + /* + * mfn points to the next free slot. All used slots have a page reference + * held on them. + */ + mfn_t *mfn = &hvmemul_ctxt->mfn[0]; + + /* + * The caller has no legitimate reason for trying a zero-byte write, but + * final is calculate to fail safe in release builds. + * + * The maximum write size depends on the number of adjacent mfns[] which + * can be vmap()'d, accouting for possible misalignment within the region. + * The higher level emulation callers are responsible for ensuring that + * mfns[] is large enough for the requested write size. + */ + if ( bytes == 0 || + pages > ARRAY_SIZE(hvmemul_ctxt->mfn) ) + { + ASSERT_UNREACHABLE(); + goto unhandleable; + } + + do { + enum hvm_translation_result res; + struct page_info *page; + pagefault_info_t pfinfo; + p2m_type_t p2mt; + + /* Error checking. Confirm that the current slot is clean. */ + ASSERT(mfn_x(*mfn) == 0); + + res = hvm_translate_get_page(curr, frame << PAGE_SHIFT, true, pfec, + &pfinfo, &page, NULL, &p2mt); + + switch ( res ) + { + case HVMTRANS_okay: + break; + + case HVMTRANS_bad_linear_to_gfn: + x86_emul_pagefault(pfinfo.ec, pfinfo.linear, &hvmemul_ctxt->ctxt); + err = ERR_PTR(~X86EMUL_EXCEPTION); + goto out; + + case HVMTRANS_bad_gfn_to_mfn: + err = NULL; + goto out; + + case HVMTRANS_gfn_paged_out: + case HVMTRANS_gfn_shared: + err = ERR_PTR(~X86EMUL_RETRY); + goto out; + + default: + goto unhandleable; + } + + *mfn++ = _mfn(page_to_mfn(page)); + + if ( p2m_is_discard_write(p2mt) ) + { + err = ERR_PTR(~X86EMUL_OKAY); + goto out; + } + + } while ( ++frame < final ); + + /* Entire access within a single frame? */ + if ( first == final ) + mapping = map_domain_page(hvmemul_ctxt->mfn[0]); + /* Multiple frames? Need to vmap(). */ + else if ( (mapping = vmap(hvmemul_ctxt->mfn, + pages)) == NULL ) + goto unhandleable; + +#ifndef NDEBUG /* Poision unused mfn[]s with INVALID_MFN. */ + while ( mfn < hvmemul_ctxt->mfn + ARRAY_SIZE(hvmemul_ctxt->mfn) ) + { + ASSERT(mfn_x(*mfn) == 0); + *mfn++ = INVALID_MFN; + } +#endif + + return mapping + (linear & ~PAGE_MASK); + + unhandleable: + err = ERR_PTR(~X86EMUL_UNHANDLEABLE); + + out: + /* Drop all held references. */ + while ( mfn-- > hvmemul_ctxt->mfn ) + put_page(mfn_to_page(mfn_x(*mfn))); + + return err; +} + +static void hvmemul_unmap_linear_addr( + void *mapping, unsigned long linear, unsigned int bytes, + struct hvm_emulate_ctxt *hvmemul_ctxt) +{ + struct domain *currd = current->domain; + unsigned long frame = linear >> PAGE_SHIFT; + unsigned long final = (linear + bytes - !!bytes) >> PAGE_SHIFT; + mfn_t *mfn = &hvmemul_ctxt->mfn[0]; + + if ( hvmemul_ctxt->ctxt.addr_size < 64 ) + { + frame = (uint32_t)frame; + final = (uint32_t)final; + } + + ASSERT(bytes > 0); + + if ( frame == final ) + unmap_domain_page(mapping); + else + vunmap(mapping); + + do + { + ASSERT(mfn_valid(*mfn)); + paging_mark_dirty(currd, *mfn); + put_page(mfn_to_page(mfn_x(*mfn))); + + *mfn++ = _mfn(0); /* Clean slot for map()'s error checking. */ + } while ( ++frame < final ); + + +#ifndef NDEBUG /* Check (and clean) all unused mfns. */ + while ( mfn < hvmemul_ctxt->mfn + ARRAY_SIZE(hvmemul_ctxt->mfn) ) + { + ASSERT(mfn_eq(*mfn, INVALID_MFN)); + *mfn++ = _mfn(0); + } +#endif +} + +/* * Convert addr from linear to physical form, valid over the range * [addr, addr + *reps * bytes_per_rep]. *reps is adjusted according to * the valid computed range. It is always >0 when X86EMUL_OKAY is returned. @@ -988,11 +1152,11 @@ static int hvmemul_write( struct hvm_emulate_ctxt *hvmemul_ctxt = container_of(ctxt, struct hvm_emulate_ctxt, ctxt); struct vcpu *curr = current; - pagefault_info_t pfinfo; unsigned long addr, reps = 1; uint32_t pfec = PFEC_page_present | PFEC_write_access; struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io; int rc; + void *mapping; if ( is_x86_system_segment(seg) ) pfec |= PFEC_implicit; @@ -1008,23 +1172,16 @@ static int hvmemul_write( (vio->mmio_gla == (addr & PAGE_MASK)) ) return hvmemul_linear_mmio_write(addr, bytes, p_data, pfec, hvmemul_ctxt, 1); - rc = hvm_copy_to_guest_linear(addr, p_data, bytes, pfec, &pfinfo); + mapping = hvmemul_map_linear_addr(addr, bytes, pfec, hvmemul_ctxt); + if ( IS_ERR(mapping) ) + return ~PTR_ERR(mapping); - switch ( rc ) - { - case HVMTRANS_okay: - break; - case HVMTRANS_bad_linear_to_gfn: - x86_emul_pagefault(pfinfo.ec, pfinfo.linear, &hvmemul_ctxt->ctxt); - return X86EMUL_EXCEPTION; - case HVMTRANS_bad_gfn_to_mfn: + if ( !mapping ) return hvmemul_linear_mmio_write(addr, bytes, p_data, pfec, hvmemul_ctxt, 0); - case HVMTRANS_gfn_paged_out: - case HVMTRANS_gfn_shared: - return X86EMUL_RETRY; - default: - return X86EMUL_UNHANDLEABLE; - } + + memcpy(mapping, p_data, bytes); + + hvmemul_unmap_linear_addr(mapping, addr, bytes, hvmemul_ctxt); return X86EMUL_OKAY; } diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 8864775..d379a4a 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -37,6 +37,13 @@ struct hvm_emulate_ctxt { unsigned long seg_reg_accessed; unsigned long seg_reg_dirty; + /* + * MFNs behind temporary mappings in the write callback. The length is + * arbitrary, and can be increased if writes longer than PAGE_SIZE+1 are + * needed. + */ + mfn_t mfn[2]; + uint32_t intr_shadow; bool_t set_context;