From patchwork Mon Mar 2 19:43:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Schopp X-Patchwork-Id: 5916901 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 95049BF440 for ; Mon, 2 Mar 2015 19:40:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E854201D3 for ; Mon, 2 Mar 2015 19:40:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3B6820211 for ; Mon, 2 Mar 2015 19:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755181AbbCBTkL (ORCPT ); Mon, 2 Mar 2015 14:40:11 -0500 Received: from mail-bn1on0131.outbound.protection.outlook.com ([157.56.110.131]:42640 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753997AbbCBTkG (ORCPT ); Mon, 2 Mar 2015 14:40:06 -0500 Received: from BY2PR02MB474.namprd02.prod.outlook.com (10.141.145.16) by BY2PR02MB217.namprd02.prod.outlook.com (10.242.232.14) with Microsoft SMTP Server (TLS) id 15.1.99.14; Mon, 2 Mar 2015 19:40:03 +0000 Received: from BY1PR0201CA0004.namprd02.prod.outlook.com (25.160.191.142) by BY2PR02MB474.namprd02.prod.outlook.com (10.141.145.16) with Microsoft SMTP Server (TLS) id 15.1.99.14; Mon, 2 Mar 2015 19:39:46 +0000 Received: from BY2FFO11FD024.protection.gbl (2a01:111:f400:7c0c::138) by BY1PR0201CA0004.outlook.office365.com (2a01:111:e400:4814::14) with Microsoft SMTP Server (TLS) id 15.1.99.14 via Frontend Transport; Mon, 2 Mar 2015 19:39:47 +0000 Received: from atltwp02.amd.com (165.204.84.222) by BY2FFO11FD024.mail.protection.outlook.com (10.1.15.213) with Microsoft SMTP Server id 15.1.99.6 via Frontend Transport; Mon, 2 Mar 2015 19:39:45 +0000 X-WSS-ID: 0NKLNY6-08-6UX-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 26A54D16075; Mon, 2 Mar 2015 13:39:41 -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 13:39:57 -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 14:39:44 -0500 Subject: [PATCH v3 2/2] x86: svm: make wbinvd faster From: Joel Schopp To: Gleb Natapov , Paolo Bonzini , CC: David Kaplan , David Kaplan , , Joerg Roedel , , Borislav Petkov Date: Mon, 2 Mar 2015 13:43:37 -0600 Message-ID: <20150302194337.2121.39107.stgit@joelvmguard2.amd.com> In-Reply-To: <20150302193943.2121.60575.stgit@joelvmguard2.amd.com> References: <20150302193943.2121.60575.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)(199003)(189002)(2950100001)(19580395003)(33646002)(23676002)(86362001)(83506001)(19580405001)(87936001)(92566002)(77096005)(47776003)(101416001)(62966003)(77156002)(76176999)(46102003)(229853001)(50986999)(105586002)(50466002)(103116003)(106466001)(53416004)(54356999)(71626003); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR02MB474; H:atltwp02.amd.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:; X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR02MB474; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR02MB217; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006); SRVR:BY2PR02MB474; BCL:0; PCL:0; RULEID:; SRVR:BY2PR02MB474; X-Forefront-PRVS: 0503FF9A3E X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2015 19:39:45.6520 (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: BY2PR02MB474 X-OriginatorOrg: amd4.onmicrosoft.com 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=ham 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 No need to re-decode WBINVD since we know what it is from the intercept. Signed-off-by: David Kaplan [extracted from larger unlrelated patch, forward ported, tested,style cleanup] Signed-off-by: Joel Schopp Reviewed-by: Radim Kr?má? --- arch/x86/kvm/svm.c | 8 +++++++- 1 file changed, 7 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/kvm/svm.c b/arch/x86/kvm/svm.c index 0c9e377..6fa4222 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2774,6 +2774,12 @@ static int skinit_interception(struct vcpu_svm *svm) return 1; } +static int wbinvd_interception(struct vcpu_svm *svm) +{ + kvm_emulate_wbinvd(&svm->vcpu); + return 1; +} + static int xsetbv_interception(struct vcpu_svm *svm) { u64 new_bv = kvm_read_edx_eax(&svm->vcpu); @@ -3374,7 +3380,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = { [SVM_EXIT_STGI] = stgi_interception, [SVM_EXIT_CLGI] = clgi_interception, [SVM_EXIT_SKINIT] = skinit_interception, - [SVM_EXIT_WBINVD] = emulate_on_interception, + [SVM_EXIT_WBINVD] = wbinvd_interception, [SVM_EXIT_MONITOR] = monitor_interception, [SVM_EXIT_MWAIT] = mwait_interception, [SVM_EXIT_XSETBV] = xsetbv_interception,