From patchwork Mon Oct 2 12:23:11 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: 9980767 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 4BBB760365 for ; Mon, 2 Oct 2017 12:26:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AA1228892 for ; Mon, 2 Oct 2017 12:26:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F8A228965; Mon, 2 Oct 2017 12:26:22 +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 6551328892 for ; Mon, 2 Oct 2017 12:26:21 +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 1dyzlJ-0000sn-Gt; Mon, 02 Oct 2017 12:23:53 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dyzlI-0000sg-Nq for xen-devel@lists.xen.org; Mon, 02 Oct 2017 12:23:52 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id ED/04-03414-8DF22D95; Mon, 02 Oct 2017 12:23:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42KJPp7RqntO/1K kwak2YYslHxezODB6HN39mymAMYo1My8pvyKBNWP77P2MBe/cKi7+eMLWwPjBtIuRk4NZwFqi 918zYxcjFweLQDOLROuld0wQzk9miX3bPjKCVAkJuEvsb3jIBmHPZ5T4slUIJv739Ap2kAYhg aWMEp8O/2UBSbAJGEi8+voNrFlEQFri2ufLjBDrKiS2T9oLViMs4CWx+mALO4jNIqAq8WX5G2 YQm1fATeLVY4i4hICcxM1zncwTGPkWMDKsYtQoTi0qSy3SNTLWSyrKTM8oyU3MzNE1NDDTy00 tLk5MT81JTCrWS87P3cQIDBUGINjB+Gd+4CFGSQ4mJVFedt1LkUJ8SfkplRmJxRnxRaU5qcWH GGU4OJQkeF/rAeUEi1LTUyvSMnOAQQuTluDgURLhPQCS5i0uSMwtzkyHSJ1iNOY4tunyHyaOj pt3/zAJseTl56VKifN2gJQKgJRmlObBDYJF0yVGWSlhXkag04R4ClKLcjNLUOVfMYpzMCoJ8z IDY1OIJzOvBG7fK6BTmIBOmdN1AeSUkkSElFQDY3CtsN7KDw9trW+vt19gbd42sye0seZ3m+q DWZ8uFvprVi+ZfmOvlLzd3QivKblKy0L7FhkYJz9uWWk133qJzpTnUreuPLixe1/KD84I5Ytf dvRE53aWPbYPyfx78olw0zKDbeLfzvZ+EH++fk6/q5VFH4Pv3MS+ayuX7425n36ENa7w4e5P7 EosxRmJhlrMRcWJAIyIkoqhAgAA X-Env-Sender: aisaila@bitdefender.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1506947020!70989028!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 48814 invoked from network); 2 Oct 2017 12:23:42 -0000 Received: from mx02.bbu.dsd.mx.bitdefender.com (HELO mx02.buh.bitdefender.com) (91.199.104.133) by server-10.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 2 Oct 2017 12:23:42 -0000 Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=DxSGZpHHGKPOaXkxwmiMBGr0BRl7L4ar6sD+PHez1kkSljmzRyB9cHXbYTTA729yU8IWoG4IZ8Bn6T1XmyQEUQeF/Daj/zeJDNLEksQ6fMyNOoROVKFRjCOk7ABXRp6vwA7oa6F2cqcs9+zzmB4r6DqMudSoRIk5OAYwNi5ssr70WqggLggjD0Ao9YqrbjJ/jp6QCQD7Zg7vNPwuGgbZyL2xTIw/lqxyDIeAK2Tzs7Hb7rPj9xNJlOW9W+vQzzgU9IZGEa2sZtRgN9Rq+ICP2gOUxobPQ9XAItCe63zTNKvcvZvzzjJz2Vcv4qvDGYS/EeDSp1i6z0sCQ7fA9pBswQ==; 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=4Vlitj/3bWhAQ6Vsam9tL 1l3FKg=; b=TWjxb648lJ6oN+maar7nOv7H3IkH2SPm7/gGC1rvf7V3bd1BTYotS cS6qmVlRavZr2M6iZsESVLx+nNfM3j4zL0GT32aQLzs737HaoDaVf+ho9VdptHoI pQYazoRmN8tIhLvr1unXA0qAlO/3SLV/fgZrWqDdbMJ++nsB6ptEikYqyAzuh/s2 21DyN9nKeuujk/ym5tT+oRV9X30zBKhqN1sEg4uT9UUILmAj7FAutrBacwJwpkqH OqEZJZ9AkBILAAeIsKNT/B96KtQwTI88o6te47W2TS0CCtx6AX+bnls8ubTm9i6q jTPtUKq1TMG7sOYYl1oBXh/eojxLhbZYA== Received: (qmail 12967 invoked from network); 2 Oct 2017 15:23:24 +0300 Received: from mx01robo.bbu.dsd.mx.bitdefender.com (10.17.80.60) by mx02.buh.bitdefender.com with AES128-GCM-SHA256 encrypted SMTP; 2 Oct 2017 15:23:24 +0300 Received: (qmail 16681 invoked from network); 2 Oct 2017 15:23:14 +0300 Received: from unknown (HELO aisaila-Latitude-E5570.dsd.bitdefender.biz) (10.10.195.54) by mx01robo.bbu.dsd.mx.bitdefender.com with SMTP; 2 Oct 2017 15:23:14 +0300 From: Alexandru Isaila To: xen-devel@lists.xen.org Date: Mon, 2 Oct 2017 15:23:11 +0300 Message-Id: <1506946991-6864-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 v8] 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 --- Changes since V7: - Removed blank lines - Moved the caluculation onf frame and addr in the for loop - Changed the if condition to nr_frames == 1 - Converted the while loop to for in the unmap func. Note: Tested with win32/64 and ubuntu64 guests. --- xen/arch/x86/hvm/emulate.c | 182 ++++++++++++++++++++++++++++++++++---- xen/include/asm-x86/hvm/emulate.h | 7 ++ 2 files changed, 173 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index cc874ce..1ba9a1b 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -498,6 +498,163 @@ 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 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 frame = (linear >> PAGE_SHIFT) + i; + unsigned long addr = frame << PAGE_SHIFT; + + 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 +1145,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 +1165,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;