From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755209AbbCBTkM (ORCPT ); Mon, 2 Mar 2015 14:40:12 -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 X-WSS-ID: 0NKLNY6-08-6UX-02 X-M-MSG: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.180.168.240] X-EOPAttributedMessage: 0 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/x86/kvm/svm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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,