From patchwork Mon Mar 2 21:02:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Schopp X-Patchwork-Id: 5917181 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 52EE8BF440 for ; Mon, 2 Mar 2015 20:58:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 761E520225 for ; Mon, 2 Mar 2015 20:58:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E44020221 for ; Mon, 2 Mar 2015 20:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755201AbbCBU6P (ORCPT ); Mon, 2 Mar 2015 15:58:15 -0500 Received: from mail-bn1on0133.outbound.protection.outlook.com ([157.56.110.133]:26048 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753919AbbCBU6M (ORCPT ); Mon, 2 Mar 2015 15:58:12 -0500 Received: from BY2PR02CA0014.namprd02.prod.outlook.com (10.242.32.14) by BLUPR02MB470.namprd02.prod.outlook.com (10.141.82.20) with Microsoft SMTP Server (TLS) id 15.1.99.14; Mon, 2 Mar 2015 20:58:10 +0000 Received: from BN1BFFO11FD038.protection.gbl (2a01:111:f400:7c10::1:167) by BY2PR02CA0014.outlook.office365.com (2a01:111:e400:2c2a::14) with Microsoft SMTP Server (TLS) id 15.1.99.14 via Frontend Transport; Mon, 2 Mar 2015 20:58:09 +0000 Received: from atltwp02.amd.com (165.204.84.222) by BN1BFFO11FD038.mail.protection.outlook.com (10.58.144.101) with Microsoft SMTP Server id 15.1.99.6 via Frontend Transport; Mon, 2 Mar 2015 20:58:09 +0000 X-WSS-ID: 0NKLRKU-08-BYI-02 X-M-MSG: Received: from satlvexedge01.amd.com (satlvexedge01.amd.com [10.177.96.28]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 207DCD16081; Mon, 2 Mar 2015 14:58:06 -0600 (CST) Received: from SATLEXDAG06.amd.com (10.181.40.13) by satlvexedge01.amd.com (10.177.96.28) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 2 Mar 2015 14:58:21 -0600 Received: from joelvmguard2.amd.com (10.180.168.240) by satlexdag06.amd.com (10.181.40.13) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 2 Mar 2015 15:58:08 -0500 Subject: [PATCH v3] x86: svm: use kvm_fast_pio_in() From: Joel Schopp To: Gleb Natapov , Paolo Bonzini , CC: David Kaplan , David Kaplan , , Joerg Roedel , , Borislav Petkov Date: Mon, 2 Mar 2015 15:02:02 -0600 Message-ID: <20150302210202.2951.56810.stgit@joelvmguard2.amd.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-EOPAttributedMessage: 0 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=Joel.Schopp@amd.com; 8bytes.org; dkim=none (message not signed) header.d=none; X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(189002)(199003)(19580405001)(87936001)(92566002)(83506001)(77096005)(47776003)(19580395003)(23676002)(229853001)(50466002)(54356999)(86362001)(101416001)(575784001)(33646002)(50986999)(103116003)(106466001)(53416004)(62966003)(77156002)(46102003)(105586002)(71626003); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR02MB470; H:atltwp02.amd.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR02MB470; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006); SRVR:BLUPR02MB470; BCL:0; PCL:0; RULEID:; SRVR:BLUPR02MB470; X-Forefront-PRVS: 0503FF9A3E X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2015 20:58:09.2017 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96; Ip=[165.204.84.222] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB470 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Kaplan We can make the in instruction go faster the same way the out instruction is already. Changes from v2[Joel]: * changed rax from u32 to unsigned long * changed a couple return 0 to BUG_ON() * changed 8 to sizeof(new_rax) * added trace hook * removed redundant clearing of count Changes from v1[Joel] * Added kvm_fast_pio_in() implementation that was left out of v1 Signed-off-by: David Kaplan [extracted from larger unlrelated patch, forward ported, addressed reviews, tested] Signed-off-by: Joel Schopp --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm.c | 4 +++- arch/x86/kvm/x86.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index a236e39..b976824 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -931,6 +931,7 @@ int kvm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr); struct x86_emulate_ctxt; int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port); +int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size, unsigned short port); void kvm_emulate_cpuid(struct kvm_vcpu *vcpu); int kvm_emulate_halt(struct kvm_vcpu *vcpu); int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index d319e0c..f8c906b 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1899,7 +1899,7 @@ static int io_interception(struct vcpu_svm *svm) ++svm->vcpu.stat.io_exits; string = (io_info & SVM_IOIO_STR_MASK) != 0; in = (io_info & SVM_IOIO_TYPE_MASK) != 0; - if (string || in) + if (string) return emulate_instruction(vcpu, 0) == EMULATE_DONE; port = io_info >> 16; @@ -1907,6 +1907,8 @@ static int io_interception(struct vcpu_svm *svm) svm->next_rip = svm->vmcb->control.exit_info_2; skip_emulated_instruction(&svm->vcpu); + if (in) + return kvm_fast_pio_in(vcpu, size, port); return kvm_fast_pio_out(vcpu, size, port); } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bd7a70b..d05efaf 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5463,6 +5463,36 @@ int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port) } EXPORT_SYMBOL_GPL(kvm_fast_pio_out); +static int complete_fast_pio(struct kvm_vcpu *vcpu) +{ + unsigned long new_rax = kvm_register_read(vcpu, VCPU_REGS_RAX); + + BUG_ON(!vcpu->arch.pio.count); + BUG_ON(vcpu->arch.pio.count * vcpu->arch.pio.size > sizeof(new_rax)); + + memcpy(&new_rax, vcpu, sizeof(new_rax)); + trace_kvm_pio(KVM_PIO_IN, vcpu->arch.pio.port, vcpu->arch.pio.size, + vcpu->arch.pio.count, vcpu->arch.pio_data); + kvm_register_write(vcpu, VCPU_REGS_RAX, new_rax); + vcpu->arch.pio.count = 0; + return 1; +} + +int kvm_fast_pio_in(struct kvm_vcpu *vcpu, int size, unsigned short port) +{ + unsigned long val; + int ret = emulator_pio_in_emulated(&vcpu->arch.emulate_ctxt, size, + port, &val, 1); + + if (ret) + kvm_register_write(vcpu, VCPU_REGS_RAX, val); + else + vcpu->arch.complete_userspace_io = complete_fast_pio; + + return ret; +} +EXPORT_SYMBOL_GPL(kvm_fast_pio_in); + static void tsc_bad(void *info) { __this_cpu_write(cpu_tsc_khz, 0);