Received: by 10.213.65.68 with SMTP id h4csp440199imn; Tue, 27 Mar 2018 02:09:50 -0700 (PDT) X-Google-Smtp-Source: AG47ELtI0t49hrQryWqGBo8NSKEvWoYviIuxWykEgoFX5Y2XsjeDZUesQ4DdEhEdsknsGx5N7lyk X-Received: by 10.99.116.22 with SMTP id p22mr16401594pgc.265.1522141790468; Tue, 27 Mar 2018 02:09:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522141790; cv=none; d=google.com; s=arc-20160816; b=nzyzTpYMm9wipk2BVgPXaWSoEDqznUZf6fvFtOmfxfvm8Dh2TbYYe4OZ4MPYyFMw/6 kISrOLi7qR4IzfKBcBinUVNfgRkCrtziUVBQC7etoguTx2/IypajNIrkklIfb06TwiF1 +53eSE5gQEftq5/LMmTVNzKhTJ0C0vP5n8ZeZPHEjF9h2t9mPQkpViBQ2zGN4LY9svRQ AN0OwrYmEyUytn6wpuYjdOa97sZTNA+DU3O43JsrfL4wUt6fMTD94F0NNZyXR6cBaySM ni/KSCDbNyKPMEbk+JgD8PiEla2EzEBY+FnKi3qRjxZfm2Jykf+kEMicIIt1PyCQZhNf zghQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=2myjNSi5xgHJQY5PeyDSwWsUZ8Lz5SfneHWpwbLM2qA=; b=jkNZDKOsoX9cPc0sNCC9HlHrMTyIpH5DwB/fv3wHAAmiAi5IkS6RzovZCRy4tgqFQl qTfX7WCF+Yy7EdOA2VODyVjdKijReA/A/7Azb8pI6x41fyKIZjg6RrAX0bEP2sSzhYYE TJ3ksNes4GjAkP/+Lun++IaWXI3IAZBGJ8Mrk16JMUDaO3bwfHKxifkpORhJ50T/Hxdv wK2jtPWbMN3olHZRltAikdQkkY2deYf0mF/5yT8R/VYod7n6KPZbnZwHwDw6M8MGZUmT c75EEZBIdBHYccMAblTmWw1p3DVa4F2KFVY3QjGqxFUOY79GrnQcmhHb+PZlhRVfSta8 8Ofg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kbUvnzgq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f33-v6si878717plb.585.2018.03.27.02.09.35; Tue, 27 Mar 2018 02:09:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kbUvnzgq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752161AbeC0JIQ (ORCPT + 99 others); Tue, 27 Mar 2018 05:08:16 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:36646 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbeC0JH5 (ORCPT ); Tue, 27 Mar 2018 05:07:57 -0400 Received: by mail-io0-f195.google.com with SMTP id o4so26676857iod.3; Tue, 27 Mar 2018 02:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2myjNSi5xgHJQY5PeyDSwWsUZ8Lz5SfneHWpwbLM2qA=; b=kbUvnzgqawmOY6ISli/xCF+/9rxPtquFByjcKFEmVUsGNMPJx4LIvtT7cvECbvCUJS p++Dk2xGRe8D5PQ/cjxcXpnG+lG6eos8EmDXOqK5I1enWSoyC0VU+do4m7ElysLUa/sX 1JJ4w4bhNMlT16WHUQ4mYOaDCeb3l1MxCxKna/CvMyUdqTW3HsQ7mW8DDEaWN/3Jyt0m ZIYMtdJoekiN8R37xhrVsOqe4XQmEUx/SH3fVMM7al8cstPfIMYqtjlILirHYYc/mNTI xYCBD1OoRNUOJZw81Qs45RKtprxpS0wGLw2E+J/8GZd5Q9ZoRLGIZov9JrATpND/yeup lhCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2myjNSi5xgHJQY5PeyDSwWsUZ8Lz5SfneHWpwbLM2qA=; b=FjT6ml10VAey8OmtOSFAFdYWHqbOLU/QneVLA0kBMwywTPAsyPxTDciarnhHue2gwO 0fbqGQ28PWQ58TmTXTxKy4Q1R2wT2llxHwXGfXFLTPB/aoocD2mq0610SElvXQ23Hr9F LfA9brRqy6MdogeQl1378DuN8YTwzN6FQZI8PAwsL7aVGqx0bvZcWCGETgn6WbkCmxV4 pcBe34b+5WY4fJ1Yzl87xkWMMC2EzX7WsDGzsY80vHzpBx3V2oOY4NlpiWXmTgtXMSG2 fm0BB5lsDgKpfoMXCZ1nEXzl80Jzj+BvTfFaPFqGdFNuW5NWRH/rAqa5g5jyvJY0JeE9 TlIw== X-Gm-Message-State: AElRT7Fbbopd+AclsJ+FeXYCos9HR+N2VS62ApJCI/Ailmw/yR6ezU1u hv/bKRj/yCsx1/dBx4Ss+COPPA== X-Received: by 10.107.70.16 with SMTP id t16mr43767511ioa.166.1522141675894; Tue, 27 Mar 2018 02:07:55 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.123]) by smtp.googlemail.com with ESMTPSA id s128-v6sm834650itb.39.2018.03.27.02.07.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Mar 2018 02:07:55 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Andrew Cooper , Konrad Rzeszutek Wilk , Liran Alon Subject: [PATCH v2 2/2] KVM: X86: Add Force Emulation Prefix for "emulate the next instruction" Date: Tue, 27 Mar 2018 02:06:56 -0700 Message-Id: <1522141616-9825-3-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522141616-9825-1-git-send-email-wanpengli@tencent.com> References: <1522141616-9825-1-git-send-email-wanpengli@tencent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wanpeng Li There is no easy way to force KVM to run an instruction through the emulator (by design as that will expose the x86 emulator as a significant attack-surface). However, we do wish to expose the x86 emulator in case we are testing it (e.g. via kvm-unit-tests). Therefore, this patch adds a "force emulation prefix" that is designed to raise #UD which KVM will trap and it's #UD exit-handler will match "force emulation prefix" to run instruction after prefix by the x86 emulator. To not expose the x86 emulator by default, we add a module parameter that should be off by default. A simple testcase here: #include #include #define HYPERVISOR_INFO 0x40000000 #define CPUID(idx, eax, ebx, ecx, edx) \ asm volatile (\ "ud2a; .ascii \"kvm\"; cpuid" \ :"=b" (*ebx), "=a" (*eax), "=c" (*ecx), "=d" (*edx) \ :"0"(idx) ); void main() { unsigned int eax, ebx, ecx, edx; char string[13]; CPUID(HYPERVISOR_INFO, &eax, &ebx, &ecx, &edx); *(unsigned int *)(string + 0) = ebx; *(unsigned int *)(string + 4) = ecx; *(unsigned int *)(string + 8) = edx; string[12] = 0; if (strncmp(string, "KVMKVMKVM\0\0\0", 12) == 0) printf("kvm guest\n"); else printf("bare hardware\n"); } Suggested-by: Andrew Cooper Cc: Paolo Bonzini Cc: Radim Krčmář Cc: Andrew Cooper Cc: Konrad Rzeszutek Wilk Cc: Liran Alon Signed-off-by: Wanpeng Li --- arch/x86/kvm/x86.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e3a60ab..40e2f78 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -146,6 +146,9 @@ bool __read_mostly enable_vmware_backdoor = false; module_param(enable_vmware_backdoor, bool, S_IRUGO); EXPORT_SYMBOL_GPL(enable_vmware_backdoor); +bool __read_mostly force_emulation_prefix = false; +module_param(force_emulation_prefix, bool, S_IRUGO); + #define KVM_NR_SHARED_MSRS 16 struct kvm_shared_msrs_global { @@ -4843,8 +4846,21 @@ EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system); int handle_ud(struct kvm_vcpu *vcpu) { enum emulation_result er; + int emulation_type = EMULTYPE_TRAP_UD; + + if (force_emulation_prefix) { + char sig[5]; /* ud2; .ascii "kvm" */ + struct x86_exception e; + + kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, + kvm_get_linear_rip(vcpu), sig, sizeof(sig), &e); + if (memcmp(sig, "\xf\xbkvm", sizeof(sig)) == 0) { + emulation_type = 0; + kvm_rip_write(vcpu, kvm_rip_read(vcpu) + sizeof(sig)); + } + } - er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD); + er = emulate_instruction(vcpu, emulation_type); if (er == EMULATE_USER_EXIT) return 0; if (er != EMULATE_DONE) -- 2.7.4