Received: by 10.213.65.68 with SMTP id h4csp105482imn; Tue, 3 Apr 2018 16:31:56 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+yossqT9cwZYg8duptsamofUztEQ5JkpjZgYXnK0FwU/mz3OCpfXDULlFBIXaYved0oUKI X-Received: by 2002:a17:902:6bca:: with SMTP id m10-v6mr16251198plt.387.1522798316525; Tue, 03 Apr 2018 16:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522798316; cv=none; d=google.com; s=arc-20160816; b=aUOhAvEf4xPl5C89QkwZ7uJSjDQGfHJ1bdVU5TMn4W2OqYqgUgsW/fOO3fNBLl3zwn 1cMZHbGyG7BylxnJyXijrnDOqdIEZLhRQYyUF0wEkIZ4Mqck+pzJfZb0Xewg5lzLu2fj 8jQyqA2hVVTc2sS2pn7gP17SZqevCn0N8aPX4LWVHnJL6bh7DI+78mPpX6riT4nKNtmg CaHxewxm7P1HacBWuEWkK0TZzduJck0Krep+leXXp8T98o51Tm8kTVXaG+mfdSPLMJr+ 7lERsqMr+Lh0OIxwRhrCG1oZGj0pAstwfqHUocCdLb7A3DDvuPH9X2JJ93NCqFE2xZaz FgmA== 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=vYQgXax+hMnaJNMCm4E9FZcupY+JWW4d2Ywlpe8EM1I=; b=Ea/YfWqcgdn225sl9myFlVpv8YFkOdFuydR0P1KFzRDjHpxwf1Yhpeoh0l5lSVOgEm iLXR20VieedDdkyAkJTeQO0VDVY/4uh8dxjuOrBK1w5lIhJ1soSYmmDUkUrwgO1AYxFn cr/fJVrXCqGsyiH20JP+hDAgIkzEDI+ona7S2szrEkIRA5WLl5ZNC5luEhe/Nh2JWGPm ZCtlijylPRLEEt1d1ClhnQGgjH0zqwuhV/xNPN9JnpOXHJr2Fh/zQ63UBOw1cO84NuZ0 B0VjbNvKdNa+ltiBqO5OMZ4tFdfSYxEymdCccgWL9Vrqr68SxBXjGCp5bbyLykN1QV8b YgKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MwncLrcF; 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 j197si2694506pgc.809.2018.04.03.16.31.42; Tue, 03 Apr 2018 16:31: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=MwncLrcF; 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 S1755371AbeDCXaI (ORCPT + 99 others); Tue, 3 Apr 2018 19:30:08 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:46645 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753868AbeDCXaE (ORCPT ); Tue, 3 Apr 2018 19:30:04 -0400 Received: by mail-pl0-f68.google.com with SMTP id 59-v6so8598336plc.13; Tue, 03 Apr 2018 16:30:04 -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=vYQgXax+hMnaJNMCm4E9FZcupY+JWW4d2Ywlpe8EM1I=; b=MwncLrcF3r8KtexKfSzOofzjsW80JR8bZrMdyqbNpvXh4ZS7jzWvLB3LIJJCu424TF 9je6++T6vH0hQAPQbpuRL/Jg/kkCfgDQBo1Xim0brumcGsR7qL3E79KQY7510AxVMfN2 PCDdCvpW+HfbhblvF+10kybNgsPmg3KBiUL1nn1Lz0ssWGRuwz8ojRVlDoasr9StGuFC OFEhTam09vLs2dQT+gAk5FVTIyuhLSRTkmGov7qohyDNTdoGWnwIjC6NUnuLBNNA0g8R qXiXDaTzRMCiq6Npt3IxSsORDtXeLwvYt5bj/91nfX+NBidKULrNXFV3D53MWeusOHC3 lpbQ== 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=vYQgXax+hMnaJNMCm4E9FZcupY+JWW4d2Ywlpe8EM1I=; b=anVR6ktSgCPma+88r9cKmcZ/av5IvTywYOS0xpl5cF/VL0QYoChe7nNOOseG4mrSVf gHT+pG1Ejrp37MzhHlYsk/zpjT2tScfiXen/utFqedjZjyy/t0YaWusXnMJrixoL0BR/ n9Rx3zgH2TroEjPzmG8fb/OeXSdWI7UkldgmeqZhKY5DnPxZE0C5ODk2VZmMrrncg4Rw G/oRJHgd7HaywbcqVc88W2EuwKcqXrmzxZiRBmEK5dDY3TC2oOq3qkbuz9oPHmAKILOO 2NjywDfkoNL6RNlDm1HCd/WBbzyAGKUsv2/pESRcOmNEREh+VrjIrOdHklPZoM10oQru wBsA== X-Gm-Message-State: AElRT7FMBoU6BcVxiyB0hlB8IGhhL4gR8hgS1PXbjXSYWZb4Q3KDXtDw NM2HZ5d7m0D1X/afwIH1Xo2YoA== X-Received: by 2002:a17:902:5501:: with SMTP id f1-v6mr15922971pli.50.1522798204103; Tue, 03 Apr 2018 16:30:04 -0700 (PDT) Received: from localhost.localdomain ([45.248.77.205]) by smtp.googlemail.com with ESMTPSA id y2sm373949pgv.38.2018.04.03.16.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Apr 2018 16:30:03 -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 v5 2/2] KVM: X86: Add Force Emulation Prefix for "emulate the next instruction" Date: Tue, 3 Apr 2018 16:28:49 -0700 Message-Id: <1522798129-14588-3-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522798129-14588-1-git-send-email-wanpengli@tencent.com> References: <1522798129-14588-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 Reviewed-by: Radim Krčmář Reviewed-by: Liran Alon 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, 18 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1eb495e..a55ecef 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 { @@ -4844,6 +4847,21 @@ int handle_ud(struct kvm_vcpu *vcpu) { enum emulation_result er; + if (force_emulation_prefix) { + char sig[5]; /* ud2; .ascii "kvm" */ + struct x86_exception e; + + if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, + kvm_get_linear_rip(vcpu), sig, sizeof(sig), &e)) + goto emulate_ud; + + if (memcmp(sig, "\xf\xbkvm", sizeof(sig)) == 0) { + kvm_rip_write(vcpu, kvm_rip_read(vcpu) + sizeof(sig)); + return emulate_instruction(vcpu, 0) == EMULATE_DONE; + } + } + +emulate_ud: er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD); if (er == EMULATE_USER_EXIT) return 0; -- 2.7.4