From patchwork Mon Nov 10 10:05:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 5265151 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7799D9F3ED for ; Mon, 10 Nov 2014 10:05:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7117F2016C for ; Mon, 10 Nov 2014 10:05:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C04520127 for ; Mon, 10 Nov 2014 10:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbaKJKFt (ORCPT ); Mon, 10 Nov 2014 05:05:49 -0500 Received: from mail-wi0-f182.google.com ([209.85.212.182]:32774 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbaKJKFs (ORCPT ); Mon, 10 Nov 2014 05:05:48 -0500 Received: by mail-wi0-f182.google.com with SMTP id d1so9808364wiv.15 for ; Mon, 10 Nov 2014 02:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=Qnz3T9NFYtSUOj7al/54xpnbloOyIhbdrEe9OJR/lDs=; b=mpFPI5WvPHj/lNkQ7dYQchUeFwwuHUmqJk0W7RjKBCcZigy8EYxnJUC887KpMD1X10 oOUkZlSQ3Gz/w579Cks1IQZMtAMsmjmwwiPic9qO+JgZjkCxs3YCzqUTeY7ckpwx6Tc/ 04M4jGYavWQZmXRCUkUJj8q+6jev06vbwKvuXTkWWrD/5W09v9TAgemynDLqTh1LPzF5 aA7t4KNJmRMwztsN6wKtGuN8DSI+qFPNVqZHPu+srY/AGJmSj0Dg2A0KWLNByEHOWHuk u59PW9h3McNfxPsq1LT8At1M2JzfOH9fvBC/CkgButpee9GvrzYCI/Q+3VzVUQsx7vTF x9dQ== X-Received: by 10.180.91.104 with SMTP id cd8mr28482129wib.46.1415613946433; Mon, 10 Nov 2014 02:05:46 -0800 (PST) Received: from playground.station (net-37-117-142-149.cust.vodafonedsl.it. [37.117.142.149]) by mx.google.com with ESMTPSA id p7sm4882225wjo.38.2014.11.10.02.05.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Nov 2014 02:05:45 -0800 (PST) From: Paolo Bonzini To: kvm@vger.kernel.org Cc: gleb@kernel.org, luto@amacapital.net Subject: [PATCH kvm-unit-tests] vmexit: add tests with EFER.SCE=1 Date: Mon, 10 Nov 2014 11:05:34 +0100 Message-Id: <1415613934-2230-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 These activate a faster path that does not set EFER in the user return notifier. Time the difference between the two. Signed-off-by: Paolo Bonzini --- x86/vmexit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/x86/vmexit.c b/x86/vmexit.c index 3bd0c81..a0380ab 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -3,6 +3,7 @@ #include "processor.h" #include "atomic.h" #include "x86/vm.h" +#include "x86/msr.h" #include "x86/desc.h" #include "x86/pci.h" @@ -10,6 +11,7 @@ struct test { void (*func)(void); const char *name; int (*valid)(void); + void (*after)(void); int parallel; bool (*next)(struct test *); }; @@ -119,6 +121,17 @@ static void inl_nop_kernel(void) inb(0x4d0); } +static int set_sce(void) +{ + wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_SCE); + return true; +} + +static void clear_sce(void) +{ + wrmsr(MSR_EFER, rdmsr(MSR_EFER) & ~EFER_SCE); +} + static void outl_elcr_kernel(void) { outb(0x4d0, 0); @@ -315,7 +328,11 @@ static struct test tests[] = { #endif { inl_pmtimer, "inl_from_pmtimer", .parallel = 1, }, { inl_nop_qemu, "inl_from_qemu", .parallel = 1 }, + { inl_nop_qemu, "inl_from_qemu (EFER guest = EFER host)", .parallel = 1, + .valid = set_sce, .after = clear_sce }, { inl_nop_kernel, "inl_from_kernel", .parallel = 1 }, + { inl_nop_kernel, "inl_from_kernel (EFER guest = EFER host)", .parallel = 1, + .valid = set_sce, .after = clear_sce }, { outl_elcr_kernel, "outl_to_kernel", .parallel = 1 }, { mov_dr, "mov_dr", .parallel = 1 }, { ipi, "ipi", is_smp, .parallel = 0, }, @@ -381,6 +398,9 @@ static bool do_test(struct test *test) t2 = rdtsc(); } while ((t2 - t1) < GOAL); printf("%s %d\n", test->name, (int)((t2 - t1) / iterations)); + if (test->after) { + test->after(); + } return test->next; }