From patchwork Mon Oct 9 10:56:14 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: 9992607 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 4AD2E60230 for ; Mon, 9 Oct 2017 10:59:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BB35283AF for ; Mon, 9 Oct 2017 10:59:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3080B2846D; Mon, 9 Oct 2017 10:59:28 +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 398C1283AF for ; Mon, 9 Oct 2017 10:59:26 +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 1e1Vjt-0000qa-DX; Mon, 09 Oct 2017 10:56:49 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1Vjr-0000qR-QA for xen-devel@lists.xen.org; Mon, 09 Oct 2017 10:56:47 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 3B/90-03046-FE55BD95; Mon, 09 Oct 2017 10:56:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeJIrShJLcpLzFFi42KJPp7Rqvsu9Ha kwY3TvBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aHK3MYCw67Vhw6fZe9gfG9SRcjJwezgLVE 779mxi5GLg4WgWYWic69PVDOT2aJORfXs3YxcnAICbhLrFzlDxIXEpjPKPH9SgsbSDdI/PuLL kaIxFJGiTV31oAl2AQMJF59/cYIYosISEtc+3yZEWJdhcT2SXtZQGxhAS+JeTvusYAsYBFQlV hwKhzE5BVwkzjzRRKkQkJATuLmuU7mCYx8CxgZVjFqFKcWlaUW6RqZ6SUVZaZnlOQmZuboGhq Y6eWmFhcnpqfmJCYV6yXn525iBIYJAxDsYDyzIPAQoyQHk5IorwAwfIT4kvJTKjMSizPii0pz UosPMcpwcChJ8MaC5ASLUtNTK9Iyc4ABC5OW4OBREuE9HgKU5i0uSMwtzkyHSJ1iNOY4tunyH yaOjpt3/zAJseTl56VKifP+BikVACnNKM2DGwSLpEuMslLCvIxApwnxFKQW5WaWoMq/YhTnYF QS5r0PMoUnM68Ebt8roFOYgE5hLL4BckpJIkJKqoFxacmPeY+2/UtlPCnDu3rKr7TYVAVpg/0 PUjdc7qlbfSTS9Xpj4JmA7MTmO1dOFv3q5HNcGmuQoeQaWynCWbvszt1rYp8V/rfsO5C0lbXy 2IWLUr9Omx3dqCCtyO58OuQv+7fZoo2ZfhcyJtT8zotQyDkmYp/a9K6h+ejsR8s0Eq+pqi7iC GhRYinOSDTUYi4qTgQA6I7dk58CAAA= X-Env-Sender: aisaila@bitdefender.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1507546605!87552364!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 35187 invoked from network); 9 Oct 2017 10:56:46 -0000 Received: from mx02.bbu.dsd.mx.bitdefender.com (HELO mx02.buh.bitdefender.com) (91.199.104.133) by server-10.tower-27.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 9 Oct 2017 10:56:46 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=vd7McMvk9GduNEruCNDJ/BYBB+w+tPCKSPD4JdJAj2e1AmxjzJtC/Wd+wrpcWgY4yyvUBlxU0pYT3ztx6gOthRKSbL+kickx0eS8GleyUDXr/BHkXkFP69AGL0vLoB/aaugB2ak7adUVyGZio6UdiwBvBzyHwkrRW6zejtJgLB32ngrYRKf6iSGz4L79FlS4hSebGHNcXFmTQWxb1fhcZj1yOgK7EU1NxcOKyRvMm/CKgCQWcps2ElHZnMnDL3LinxlXYYNGQop0AFhn5FvViHlbM1mcMrXN8nzgGBI4avr3/y5wo0vVQ/EdgbozNbJlpuLzd94Jv0AWQ/9nNTfHyw==; 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=NxFi2L25kBM7PRYZpIESn PFTIHY=; b=BqV8SuwDAVu8LXjDZU3jY3eTdZ6PpOiB6KEcnUbtLXFIWe6cqLdnb ulv0m7mLNv/TpaReEVWw8Rvhf92uyZyrU2xihAFNm8LFburH7rXk8ZkploZTwBay Txcgl4ALDaMQKOcjj0aFJ8HbGa/HEXxBP686m2OnBzSKd3jl5cfwUib53cI92aVc rGDxYQ0wja0K8/1oxmvzyMoDIalwAfITBnOW5PqJhqv4tV3FcR6Ts6mhN4nTcsmy rd00OftQh0SPIHCSE5TxOGW9ar2mqt54peZ43ne0E7TAnadGzkxBjGwKe6dq3X7R Fiw/pUbtM+78UhcLzt/nIl/9OfHVTCKhQ== Received: (qmail 26330 invoked from network); 9 Oct 2017 13:56:28 +0300 Received: from mx01robo.bbu.dsd.mx.bitdefender.com (10.17.80.60) by mx02.buh.bitdefender.com with AES128-GCM-SHA256 encrypted SMTP; 9 Oct 2017 13:56:28 +0300 Received: (qmail 29302 invoked from network); 9 Oct 2017 13:56:29 +0300 Received: from unknown (HELO aisaila-Latitude-E5570.dsd.bitdefender.biz) (10.10.195.54) by mx01robo.bbu.dsd.mx.bitdefender.com with SMTP; 9 Oct 2017 13:56:29 +0300 From: Alexandru Isaila To: xen-devel@lists.xen.org Date: Mon, 9 Oct 2017 13:56:14 +0300 Message-Id: <1507546574-8124-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 v9] 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 V8: - Removed comment - Changed the addr formula - Added blank space in the for statement. Note: Tested with win32/64 and ubuntu64 guests. --- xen/arch/x86/hvm/emulate.c | 179 ++++++++++++++++++++++++++++++++++---- xen/include/asm-x86/hvm/emulate.h | 7 ++ 2 files changed, 170 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index cc874ce..957fc46 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -498,6 +498,160 @@ 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; + unsigned int nr_frames = ((linear + bytes - !!bytes) >> PAGE_SHIFT) - + (linear >> PAGE_SHIFT) + 1; + unsigned int i; + + /* + * 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 || + nr_frames > ARRAY_SIZE(hvmemul_ctxt->mfn) ) + { + ASSERT_UNREACHABLE(); + printk("goto unhandle ERROR~!~~\n"); + goto unhandleable; + } + + for ( i = 0; i < nr_frames; i++ ) + { + enum hvm_translation_result res; + struct page_info *page; + pagefault_info_t pfinfo; + p2m_type_t p2mt; + unsigned long addr = i ? (linear + (i << PAGE_SHIFT)) & PAGE_MASK : linear; + + if ( hvmemul_ctxt->ctxt.addr_size < 64 ) + addr = (uint32_t)addr; + + /* Error checking. Confirm that the current slot is clean. */ + ASSERT(mfn_x(*mfn) == 0); + + res = hvm_translate_get_page(curr, addr, 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; + } + } + + /* Entire access within a single frame? */ + if ( nr_frames == 1 ) + mapping = map_domain_page(hvmemul_ctxt->mfn[0]); + /* Multiple frames? Need to vmap(). */ + else if ( (mapping = vmap(hvmemul_ctxt->mfn, + nr_frames)) == 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 int nr_frames = ((linear + bytes - !!bytes) >> PAGE_SHIFT) - + (linear >> PAGE_SHIFT) + 1; + unsigned int i; + mfn_t *mfn = &hvmemul_ctxt->mfn[0]; + + ASSERT(bytes > 0); + + if ( nr_frames == 1 ) + unmap_domain_page(mapping); + else + vunmap(mapping); + + for ( i = 0; i < nr_frames; i++ ) + { + 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. */ + } + + +#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 +1142,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 +1162,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;