Received: by 10.213.65.68 with SMTP id h4csp109490imn; Tue, 27 Mar 2018 17:51:57 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/0DwwqBIIdLxO0KOuGCLXc6XBRzfJzeV6tNVr0JUO+8Vwmu5LfqO5T7O5e9tm+eugeEpis X-Received: by 10.98.89.23 with SMTP id n23mr1146139pfb.211.1522198317018; Tue, 27 Mar 2018 17:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522198316; cv=none; d=google.com; s=arc-20160816; b=lb2wmBn72bc8qWJrzX4TNKWK5iXXswAcC/GeC6fS2LrLvWh2+N/lrawIhEbg73cEix rqJLqJWxr3R/OK5dJfbpyp0szn/qVEQnZNvyDaNrmt3yFs5RN8lnZ9GJryn9VpkR9uGc msc/nZil9NZIwJw+sXOycXu0SxN9YxMi7sQ56dJQsJv0rPvb2OjoOHy7jyN3VH9CYTFV AaHq+ypf+K3OqS+4MXeYKetWLHYW095U+pSRcHAKdSItAbOiXS9KRb50cmaQeElqtU97 LXfTt7ZNo97JiXf3QzrXhjIuOg2Ie+2hCzl0RJXFd1ejFp+cFFZoOaZgZGTeLG8jD7Ty GkhA== 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=/rKQXNJ3M9GoXWm/M0Gpn5AANJ08hu8enIAYsrXPBx0=; b=wOMo1NPmzeXPytPOFzQ8ojfgCZUUiiPP4CwA8dIqUDEcScyj5DFGWTtJdauem04/h+ RiBstvPjY6Qz3FCin1/PqKHnB2hwHgfre1yVBs5k3PJh7ustruTC8LrrNQju2+u/Lex8 qXt0oBVHzyl0Sb1q+0olWj0EnJ/LCO6tG63UAn6DFxO7JiGRMr4Y3F4lIvbkws9MCKB5 2AVBc5m7pUmudb+obJV2ThOeKGjUJ+mAzNwOZpa8uQIK7+VXlcahGesAzZe13TQdkVYh NOVWOp0lIt35YufFDPLaYs0Y4WzYLuBFoLW8lioEvQMopgX9HwVOTATUpQKcmbJIHD4W BLww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=oYUuylnq; 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 l186si1617701pgd.174.2018.03.27.17.51.41; Tue, 27 Mar 2018 17:51:56 -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=oYUuylnq; 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 S1752805AbeC1AuZ (ORCPT + 99 others); Tue, 27 Mar 2018 20:50:25 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:39031 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbeC1Atv (ORCPT ); Tue, 27 Mar 2018 20:49:51 -0400 Received: by mail-pg0-f65.google.com with SMTP id b9so303329pgf.6; Tue, 27 Mar 2018 17:49:51 -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=/rKQXNJ3M9GoXWm/M0Gpn5AANJ08hu8enIAYsrXPBx0=; b=oYUuylnqlCJzob5O20PH6Q7D07pn+3yZw0qm24Hmf6QO5osBrkvX4G6+DoCYhVpTmM +cCzqbsFKfxfEUrYJnL33CAN/ziQHKLr4BQ+zU1U1pUO2iBWK1uugZ6JQ/63HHVO3Ok0 pTDM2NV8PzexVWbkxWs4SI4/sY2LS7g6m+W3Af7b9dX6OlEMdBVmLIDyvDDRAalhD0nb 2pqiGwimSVTrwEHWllz6eOF6FWl6a3VvvWCrcbz9TEPsA6aJz/54gNRQDafcAx0XFzVz vf1IoCwXxm3yGGC5X9OUChY210l/NsEhbfWQb9mlQXsALL41g1Loqb03NwGnRrgET4Dq NaQw== 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=/rKQXNJ3M9GoXWm/M0Gpn5AANJ08hu8enIAYsrXPBx0=; b=HO05pHYTVwOMLi0PLe3jsIz0LSi6nNuZhX+/XynNF1lvs4zmOp690oGpEk1/JRT6Xv 8Yft2PvW8FZhFiOiLbobc3NG85cnV/fAeMkXZUm5k8fPHL5gklwf+PzUXAsLWfktJYRv cLTP+0XK1/X51FG8Q+8JzZMNeRM9wjzmNvtwEapDFfMZMKiAFoPi9h1RSFmEkGW0m7YF Toex8j0DLABV+5gi9pa2z37LEMXiHa2g5F6x/WYkJ+2vf+ZxzCqwib4uxxfgJFCui20e io0OhB6Vm9H/emDbfhmS1EOMl5mk8OaIsHppqfP1SEpM2f3n0qLJwbFRI6mJtnkYdGG3 /Bdg== X-Gm-Message-State: AElRT7FYrmXdwJCnuRdGuTk9OLGSc7/LA8d0qP9jlr5XDMrH7Hmw/bYp HfIviRcNG6Ummn8nEcs6dpBUkw== X-Received: by 10.98.69.26 with SMTP id s26mr1169166pfa.29.1522198190840; Tue, 27 Mar 2018 17:49:50 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.123]) by smtp.googlemail.com with ESMTPSA id j65sm4367083pge.58.2018.03.27.17.49.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Mar 2018 17:49:50 -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 v3 2/2] KVM: X86: Add Force Emulation Prefix for "emulate the next instruction" Date: Tue, 27 Mar 2018 17:48:54 -0700 Message-Id: <1522198134-2709-3-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522198134-2709-1-git-send-email-wanpengli@tencent.com> References: <1522198134-2709-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); +static 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