From patchwork Wed Nov 24 18:18:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 353911 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAOILwH9018860 for ; Wed, 24 Nov 2010 18:21:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754165Ab0KXSSq (ORCPT ); Wed, 24 Nov 2010 13:18:46 -0500 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:13664 "EHLO TX2EHSOBE008.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753861Ab0KXSSo (ORCPT ); Wed, 24 Nov 2010 13:18:44 -0500 Received: from mail49-tx2-R.bigfish.com (10.9.14.242) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 14.1.225.8; Wed, 24 Nov 2010 18:18:43 +0000 Received: from mail49-tx2 (localhost.localdomain [127.0.0.1]) by mail49-tx2-R.bigfish.com (Postfix) with ESMTP id B43D11B084E0; Wed, 24 Nov 2010 18:18:43 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bhz32i691h668h67dh685h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp02.amd.com; RD:none; EFVD:NLI Received: from mail49-tx2 (localhost.localdomain [127.0.0.1]) by mail49-tx2 (MessageSwitch) id 1290622723280872_2710; Wed, 24 Nov 2010 18:18:43 +0000 (UTC) Received: from TX2EHSMHS007.bigfish.com (unknown [10.9.14.250]) by mail49-tx2.bigfish.com (Postfix) with ESMTP id 3713C16B004E; Wed, 24 Nov 2010 18:18:43 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by TX2EHSMHS007.bigfish.com (10.9.99.107) with Microsoft SMTP Server id 14.1.225.8; Wed, 24 Nov 2010 18:18:42 +0000 X-WSS-ID: 0LCEIUZ-02-3OF-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 287CAC884E; Wed, 24 Nov 2010 12:18:34 -0600 (CST) Received: from sausexhtp01.amd.com (163.181.3.165) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.106.1; Wed, 24 Nov 2010 12:19:48 -0600 Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 24 Nov 2010 12:18:39 -0600 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.3.83.0; Wed, 24 Nov 2010 13:18:39 -0500 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id D016649C2A7; Wed, 24 Nov 2010 18:18:37 +0000 (GMT) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id DB721FFF1E; Wed, 24 Nov 2010 19:18:39 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , , Joerg Roedel Subject: [PATCH 6/9] KVM: SVM: Add intercept checks for remaining twobyte instructions Date: Wed, 24 Nov 2010 19:18:32 +0100 Message-ID: <1290622715-8382-7-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1290622715-8382-1-git-send-email-joerg.roedel@amd.com> References: <1290622715-8382-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Nov 2010 18:21:59 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 7284193..77b344e 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3741,10 +3741,19 @@ static int svm_insn_intercepted(struct kvm_vcpu *vcpu, break; } + case 0x07: /* INVLPG */ + vmcb->control.exit_code = SVM_EXIT_INVLPG; + break; } case 0x06: /* CLTS */ vmcb->control.exit_code = SVM_EXIT_WRITE_CR0; break; + case 0x08: /* INVD */ + vmcb->control.exit_code = SVM_EXIT_INVD; + break; + case 0x09: /* WBINVD */ + vmcb->control.exit_code = SVM_EXIT_WBINVD; + break; case 0x20: /* CR read */ vmcb->control.exit_code = SVM_EXIT_READ_CR0 + c->modrm_reg; break; @@ -3768,6 +3777,26 @@ static int svm_insn_intercepted(struct kvm_vcpu *vcpu, case 0x23: vmcb->control.exit_code = SVM_EXIT_WRITE_DR0 + c->modrm_reg; break; + case 0x30: /* WRMSR */ + vmcb->control.exit_code = SVM_EXIT_MSR; + vmcb->control.exit_info_1 = 1; + break; + case 0x31: /* RDTSC */ + vmcb->control.exit_code = SVM_EXIT_RDTSC; + break; + case 0x32: /* RDMSR */ + vmcb->control.exit_code = SVM_EXIT_MSR; + vmcb->control.exit_info_1 = 0; + break; + case 0x33: /* RDPMC */ + vmcb->control.exit_code = SVM_EXIT_RDPMC; + break; + case 0xa2: /* CPUID */ + vmcb->control.exit_code = SVM_EXIT_CPUID; + break; + case 0xaa: /* RSM */ + vmcb->control.exit_code = SVM_EXIT_RSM; + break; } vmcb->control.next_rip = ctxt->eip;