From patchwork Mon Aug 5 12:43:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Chunqi Li X-Patchwork-Id: 2838673 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 6E68C9F479 for ; Mon, 5 Aug 2013 12:43:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B32C2016A for ; Mon, 5 Aug 2013 12:43:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A546E20166 for ; Mon, 5 Aug 2013 12:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751566Ab3HEMni (ORCPT ); Mon, 5 Aug 2013 08:43:38 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:61167 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751975Ab3HEMnh (ORCPT ); Mon, 5 Aug 2013 08:43:37 -0400 Received: by mail-pd0-f175.google.com with SMTP id 5so3195865pdd.34 for ; Mon, 05 Aug 2013 05:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=4pxeO1AuHklBy/bZoQyJg00lFDaddwpdX8R7S52tsws=; b=UX9y9B+yAu7Q/zyNFkO6UeiWC6MCC4zJQ2rIP3NCCEPgFnfZWdTeOqrdiO84kdaA9+ IK2+zoueZqhYN2egVnTIKi6GGzs9YtIqLJwKgW8RBAvCVl/mHIutbj78ICzhF1cDONUa bf2Wu2zX8Oqgan9pFzMQN1XnMltdCHlscMDMlTWiKzoeLtnmD8xzA7S+bKyQR+yvL2yp qqp2rg3Co7uqBWFMo0B3ZBI0KQkTYCem92yWnJGDApf+uJMQTCx5W3aRI4ymelPgaEwB s9dx5GrxTYo1feAUj9suRFnBjFWM/w/yqseyGt4gpFNreW0BtqCGDZDEoh1oLaAdGCrV cKOw== X-Received: by 10.68.104.101 with SMTP id gd5mr22187589pbb.132.1375706617115; Mon, 05 Aug 2013 05:43:37 -0700 (PDT) Received: from Blade1-02.Blade1-02 ([162.105.146.101]) by mx.google.com with ESMTPSA id py4sm25371220pbc.14.2013.08.05.05.43.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Aug 2013 05:43:35 -0700 (PDT) From: Arthur Chunqi Li To: kvm@vger.kernel.org Cc: jan.kiszka@web.de, gleb@redhat.com, pbonzini@redhat.com, Arthur Chunqi Li Subject: [PATCH] kvm-unit-tests: VMX: Separate host and guest rflags Date: Mon, 5 Aug 2013 20:43:25 +0800 Message-Id: <1375706605-14980-1-git-send-email-yzt356@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Separate host_rflags and guest_rflags (regs.rflags used for guest). Fix bug of set/get guest rflags when vmenter/vmexit. Signed-off-by: Arthur Chunqi Li --- x86/vmx.c | 11 +++++++---- x86/vmx.h | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/x86/vmx.c b/x86/vmx.c index 7467927..7b28aca 100644 --- a/x86/vmx.c +++ b/x86/vmx.c @@ -19,6 +19,7 @@ struct regs regs; struct vmx_test *current; u64 hypercall_field = 0; bool launched; +u64 host_rflags; extern u64 gdt64_desc[]; extern u64 idt_descr[]; @@ -440,12 +441,14 @@ static int exit_handler() int ret; current->exits++; + regs.rflags = vmcs_read(GUEST_RFLAGS); current->guest_regs = regs; if (is_hypercall()) ret = handle_hypercall(); else ret = current->exit_handler(); regs = current->guest_regs; + vmcs_write(GUEST_RFLAGS, regs.rflags); switch (ret) { case VMX_TEST_VMEXIT: case VMX_TEST_RESUME: @@ -505,15 +508,15 @@ static int vmx_run() return 0; case VMX_TEST_LAUNCH_ERR: printf("%s : vmlaunch failed.\n", __func__); - if ((!(regs.rflags & X86_EFLAGS_CF) && !(regs.rflags & X86_EFLAGS_ZF)) - || ((regs.rflags & X86_EFLAGS_CF) && (regs.rflags & X86_EFLAGS_ZF))) + if ((!(host_rflags & X86_EFLAGS_CF) && !(host_rflags & X86_EFLAGS_ZF)) + || ((host_rflags & X86_EFLAGS_CF) && (host_rflags & X86_EFLAGS_ZF))) printf("\tvmlaunch set wrong flags\n"); report("test vmlaunch", 0); break; case VMX_TEST_RESUME_ERR: printf("%s : vmresume failed.\n", __func__); - if ((!(regs.rflags & X86_EFLAGS_CF) && !(regs.rflags & X86_EFLAGS_ZF)) - || ((regs.rflags & X86_EFLAGS_CF) && (regs.rflags & X86_EFLAGS_ZF))) + if ((!(host_rflags & X86_EFLAGS_CF) && !(host_rflags & X86_EFLAGS_ZF)) + || ((host_rflags & X86_EFLAGS_CF) && (host_rflags & X86_EFLAGS_ZF))) printf("\tvmresume set wrong flags\n"); report("test vmresume", 0); break; diff --git a/x86/vmx.h b/x86/vmx.h index 1fb9738..d4f979c 100644 --- a/x86/vmx.h +++ b/x86/vmx.h @@ -403,10 +403,10 @@ enum Ctrl1 { #define SAVE_RFLAGS \ "pushf\n\t" \ - "pop regs+0x80\n\t" + "pop host_rflags\n\t" #define LOAD_RFLAGS \ - "push regs+0x80\n\t" \ + "push host_rflags\n\t" \ "popf\n\t" #define VMX_IO_SIZE_MASK 0x7