From patchwork Wed Feb 3 08:53:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 44361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 07AADB7D52 for ; Wed, 3 Feb 2010 20:23:32 +1100 (EST) Received: from localhost ([127.0.0.1]:44052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcbSK-0002gm-WA for incoming@patchwork.ozlabs.org; Wed, 03 Feb 2010 04:23:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ncb02-00023b-2Y for qemu-devel@nongnu.org; Wed, 03 Feb 2010 03:54:14 -0500 Received: from [199.232.76.173] (port=56388 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ncazz-00021q-4J for qemu-devel@nongnu.org; Wed, 03 Feb 2010 03:54:12 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Ncazl-00078s-D5 for qemu-devel@nongnu.org; Wed, 03 Feb 2010 03:54:10 -0500 Received: from mx20.gnu.org ([199.232.41.8]:46400) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ncazk-00078D-ND for qemu-devel@nongnu.org; Wed, 03 Feb 2010 03:53:56 -0500 Received: from thoth.sbs.de ([192.35.17.2]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ncazi-0001Mm-Oi for qemu-devel@nongnu.org; Wed, 03 Feb 2010 03:53:55 -0500 Received: from mail3.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id o138rrIn025945; Wed, 3 Feb 2010 09:53:53 +0100 Received: from localhost.localdomain ([139.25.173.28]) by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o138rkCC012112; Wed, 3 Feb 2010 09:53:53 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Wed, 3 Feb 2010 09:53:36 +0100 Message-Id: X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.4-2.6 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Glauber Costa , Alexander Graf , kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v2 11/21] KVM: Rework of guest debug state writing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org So far we synchronized any dirty VCPU state back into the kernel before updating the guest debug state. This was a tribute to a deficite in x86 kernels before 2.6.33. But as this is an arch-dependent issue, it is better handle in the x86 part of KVM and remove the writeback point for generic code. Signed-off-by: Jan Kiszka --- kvm-all.c | 12 ++++-------- target-i386/cpu.h | 9 ++++++++- target-i386/kvm.c | 11 +++++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 3516f01..9c921cc 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -951,10 +951,6 @@ static void kvm_invoke_set_guest_debug(void *data) struct kvm_set_guest_debug_data *dbg_data = data; CPUState *env = dbg_data->env; - if (env->kvm_vcpu_dirty) { - kvm_arch_put_registers(env); - env->kvm_vcpu_dirty = 0; - } dbg_data->err = kvm_vcpu_ioctl(env, KVM_SET_GUEST_DEBUG, &dbg_data->dbg); } @@ -962,12 +958,12 @@ int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap) { struct kvm_set_guest_debug_data data; - data.dbg.control = 0; - if (env->singlestep_enabled) - data.dbg.control = KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP; + data.dbg.control = reinject_trap; + if (env->singlestep_enabled) { + data.dbg.control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP; + } kvm_arch_update_guest_debug(env, &data.dbg); - data.dbg.control |= reinject_trap; data.env = env; on_vcpu(env, kvm_invoke_set_guest_debug, &data); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 7d0bbd0..7787fb1 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -21,6 +21,10 @@ #include "config.h" +#ifdef CONFIG_KVM +#include /* for kvm_guest_debug */ +#endif + #ifdef TARGET_X86_64 #define TARGET_LONG_BITS 64 #else @@ -718,7 +722,10 @@ typedef struct CPUX86State { uint8_t has_error_code; uint32_t sipi_vector; uint32_t cpuid_kvm_features; - +#if defined(CONFIG_KVM) && defined(KVM_CAP_SET_GUEST_DEBUG) + struct kvm_guest_debug kvm_guest_debug; +#endif + /* in order to simplify APIC support, we leave this pointer to the user */ struct APICState *apic_state; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8743f32..5ac12a8 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -865,6 +865,15 @@ int kvm_arch_put_registers(CPUState *env) if (ret < 0) return ret; + /* + * Kernels before 2.6.33 overwrote flags.TF injected via SET_GUEST_DEBUG + * while updating GP regs. Work around this by updating the debug state + * once again. + */ + ret = kvm_vcpu_ioctl(env, KVM_SET_GUEST_DEBUG, &env->kvm_guest_debug); + if (ret < 0) + return ret; + ret = kvm_put_fpu(env); if (ret < 0) return ret; @@ -1163,6 +1172,8 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) (len_code[hw_breakpoint[n].len] << (18 + n*4)); } } + /* Keep a copy for the writeback workaround in kvm_arch_put_registers */ + memcpy(&env->kvm_guest_debug, dbg, sizeof(env->kvm_guest_debug)); } #endif /* KVM_CAP_SET_GUEST_DEBUG */ #endif