From patchwork Mon May 4 08:12:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 6323721 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7109F9F374 for ; Mon, 4 May 2015 08:12:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9B4B202A1 for ; Mon, 4 May 2015 08:12:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B6612026C for ; Mon, 4 May 2015 08:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbbEDIMN (ORCPT ); Mon, 4 May 2015 04:12:13 -0400 Received: from thoth.sbs.de ([192.35.17.2]:37105 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750798AbbEDIML (ORCPT ); Mon, 4 May 2015 04:12:11 -0400 Received: from mail2.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.14.3/8.14.3) with ESMTP id t448C4af007332; Mon, 4 May 2015 10:12:04 +0200 Received: from md1f2u6c.ww002.siemens.net ([139.22.117.127]) by mail2.siemens.de (8.14.3/8.14.3) with SMTP id t448C3ce012555; Mon, 4 May 2015 10:12:04 +0200 Message-ID: <554729D3.5060005@siemens.com> Date: Mon, 04 May 2015 10:12:03 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Paolo Bonzini , kvm Subject: [PATCH kvm-unit-tests] x86: vmx: Remove bogus GUEST_RIP update from interrupt test 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 When we get an EXTINT exit, the guest RIP already points to the instruction after the one that sent it into HLT state. Moving the RIP based on stale insn_len caused spurious L2 crashes. Signed-off-by: Jan Kiszka --- x86/vmx_tests.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index 4f8ace1..79552fd 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -1297,10 +1297,8 @@ static int interrupt_exit_handler(void) asm volatile ("nop"); irq_disable(); } - if (vmx_get_test_stage() >= 2) { + if (vmx_get_test_stage() >= 2) vmcs_write(GUEST_ACTV_STATE, ACTV_ACTIVE); - vmcs_write(GUEST_RIP, guest_rip + insn_len); - } return VMX_TEST_RESUME; default: printf("Unknown exit reason, %d\n", reason);