From patchwork Thu Jul 31 12:54:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 375262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 28594140108 for ; Thu, 31 Jul 2014 23:02:29 +1000 (EST) Received: from localhost ([::1]:56383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCq02-0001XH-Ue for incoming@patchwork.ozlabs.org; Thu, 31 Jul 2014 09:02:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCps3-0004Vj-98 for qemu-devel@nongnu.org; Thu, 31 Jul 2014 08:54:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCprx-0005Db-6T for qemu-devel@nongnu.org; Thu, 31 Jul 2014 08:54:11 -0400 Received: from mail.ispras.ru ([83.149.199.45]:54572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCprw-0005DS-PJ for qemu-devel@nongnu.org; Thu, 31 Jul 2014 08:54:05 -0400 Received: from PASHA-ISP.novsu.ac.ru (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id DEC2E540159; Thu, 31 Jul 2014 16:54:03 +0400 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Thu, 31 Jul 2014 16:54:07 +0400 Message-ID: <20140731125407.1600.30462.stgit@PASHA-ISP.novsu.ac.ru> In-Reply-To: <20140731125321.1600.46604.stgit@PASHA-ISP.novsu.ac.ru> References: <20140731125321.1600.46604.stgit@PASHA-ISP.novsu.ac.ru> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v3 07/49] kvmapic: fixing loading vmstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org vapic state should not be synchronized with APIC while loading, because APIC state could be not loaded yet at that moment. We just save vapic_paddr in APIC VMState instead of synchronization. Signed-off-by: Pavel Dovgalyuk --- hw/i386/kvmvapic.c | 22 +++++++++++++++ hw/intc/apic_common.c | 56 ++++++++++++++++++++++++++++++++++++++- include/hw/i386/apic_internal.h | 2 + 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index cb855c7..417ab6a 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -351,6 +351,24 @@ static int get_kpcr_number(X86CPU *cpu) return kpcr.number; } +static int vapic_enable_post_load(VAPICROMState *s, X86CPU *cpu) +{ + int cpu_number = get_kpcr_number(cpu); + hwaddr vapic_paddr; + static const uint8_t enabled = 1; + + if (cpu_number < 0) { + return -1; + } + vapic_paddr = s->vapic_paddr + + (((hwaddr)cpu_number) << VAPIC_CPU_SHIFT); + cpu_physical_memory_rw(vapic_paddr + offsetof(VAPICState, enabled), + (void *)&enabled, sizeof(enabled), 1); + s->state = VAPIC_ACTIVE; + + return 0; +} + static int vapic_enable(VAPICROMState *s, X86CPU *cpu) { int cpu_number = get_kpcr_number(cpu); @@ -731,7 +749,9 @@ static void do_vapic_enable(void *data) VAPICROMState *s = data; X86CPU *cpu = X86_CPU(first_cpu); - vapic_enable(s, cpu); + /* Do not synchronize with APIC, because it was not loaded yet. + Just call the enable function which does not have synchronization. */ + vapic_enable_post_load(s, cpu); } static int vapic_post_load(void *opaque, int version_id) diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index ce3d903..5afd5b2 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -324,6 +324,15 @@ static void apic_common_realize(DeviceState *dev, Error **errp) } +static int apic_pre_load(void *opaque) +{ + APICCommonState *s = APIC_COMMON(opaque); + s->sipi_vector = 0; + s->wait_for_sipi = 0; + s->vapic_paddr = 0; + return 0; +} + static void apic_dispatch_pre_save(void *opaque) { APICCommonState *s = APIC_COMMON(opaque); @@ -345,12 +354,46 @@ static int apic_dispatch_post_load(void *opaque, int version_id) return 0; } +static bool apic_common_sipi_needed(void *opaque) +{ + APICCommonState *s = APIC_COMMON(opaque); + return s->wait_for_sipi != 0; +} + +static const VMStateDescription vmstate_apic_common_sipi = { + .name = "apic_sipi", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_INT32(sipi_vector, APICCommonState), + VMSTATE_INT32(wait_for_sipi, APICCommonState), + VMSTATE_END_OF_LIST() + } +}; + +static bool apic_common_vapic_paddr_needed(void *opaque) +{ + APICCommonState *s = APIC_COMMON(opaque); + return s->vapic_paddr != 0; +} + +static const VMStateDescription vmstate_apic_common_vapic_paddr = { + .name = "apic_vapic_paddr", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT64(vapic_paddr, APICCommonState), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_apic_common = { .name = "apic", - .version_id = 3, + .version_id = 4, .minimum_version_id = 3, .minimum_version_id_old = 1, .load_state_old = apic_load_old, + .pre_load = apic_pre_load, .pre_save = apic_dispatch_pre_save, .post_load = apic_dispatch_post_load, .fields = (VMStateField[]) { @@ -375,6 +418,17 @@ static const VMStateDescription vmstate_apic_common = { VMSTATE_INT64(timer_expiry, APICCommonState), /* open-coded timer state */ VMSTATE_END_OF_LIST() + }, + .subsections = (VMStateSubsection[]) { + { + .vmsd = &vmstate_apic_common_sipi, + .needed = apic_common_sipi_needed, + }, + { + .vmsd = &vmstate_apic_common_vapic_paddr, + .needed = apic_common_vapic_paddr_needed, + }, + VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 83e2a42..df4381c 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -124,7 +124,7 @@ struct APICCommonState { uint32_t vapic_control; DeviceState *vapic; - hwaddr vapic_paddr; /* note: persistence via kvmvapic */ + hwaddr vapic_paddr; }; typedef struct VAPICState {