From patchwork Fri Sep 21 11:17:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 1491341 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E6B99DF28C for ; Fri, 21 Sep 2012 11:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757332Ab2IULSd (ORCPT ); Fri, 21 Sep 2012 07:18:33 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:59300 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932373Ab2IULR5 (ORCPT ); Fri, 21 Sep 2012 07:17:57 -0400 Received: by mail-bk0-f46.google.com with SMTP id w11so743848bku.19 for ; Fri, 21 Sep 2012 04:17:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=D6XLI0isIIOJ0Aryz8gq8dxntLzeGK9haPynCJgA2fo=; b=kjr2XBJt+ljw7xiusZBpQNbPOlVCQiPOn15Q1bjsYQT04BKst/rLaAYndGh05Pb1B+ zPIQKQJhYrFaQhZEXPnasbwdvTkM91YS7ngkto8dxXrz/oDRbmeGzuiC0rqwE13pLwA9 HxBY2WqSbfA+LjB9lpiUZg+qy/9kLYm1kNwS2u/cC2uJVP7rlVYacut+65aOf7nwr1T+ 6iDFVMYEDH0YXEw9fJNQ6shTvV3YTjzX70eU6gNbiWBZUbWaNezev9gbNi0QQJtHqMM0 q6gc2vIMhT6XNMwG6tMvbU0LI4FrnVffOt+2U4+NSW2pYVMUFKZVVtxB+mmSH2JYKYzX rmpw== Received: by 10.204.4.129 with SMTP id 1mr2044807bkr.58.1348226276664; Fri, 21 Sep 2012 04:17:56 -0700 (PDT) Received: from dhcp-192-168-178-175.ri.profitbricks.localdomain ([62.217.45.26]) by mx.google.com with ESMTPS id x13sm5271435bkv.16.2012.09.21.04.17.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 04:17:56 -0700 (PDT) From: Vasilis Liaskovitis To: qemu-devel@nongnu.org, kvm@vger.kernel.org, seabios@seabios.org Cc: avi@redhat.com, anthony@codemonkey.ws, kevin@koconnor.net, wency@cn.fujitsu.com, kraxel@redhat.com, eblake@redhat.com, blauwirbel@gmail.com, gleb@redhat.com, imammedo@redhat.com, Vasilis Liaskovitis Subject: [RFC PATCH v3 16/19] Update dimm state on reset Date: Fri, 21 Sep 2012 13:17:32 +0200 Message-Id: <1348226255-4226-17-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1348226255-4226-1-git-send-email-vasilis.liaskovitis@profitbricks.com> References: <1348226255-4226-1-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Gm-Message-State: ALoCoQmlbQU1Rn91M1Jjsui213pne67Te9AwHUzTPSNJP+tEHgvnKYRyehesUqSBMtMRFtD6w3qd Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org in case of hot-remove failure on a guest that does not implement _OST, the dimm bitmaps in qemu and Seabios show the dimm as unplugged, but the dimm is still present on the qdev/memory bus. To avoid this inconsistency, we set the dimm state to active/hot-plugged on a reset of the associated acpi_pm device. This way the dimm is still active after a VM reboot and dimm visibility has always the same behaviour, regardless of _OST support in the guest. Signed-off-by: Vasilis Liaskovitis --- hw/acpi_piix4.c | 1 + hw/dimm.c | 20 ++++++++++++++++++++ hw/dimm.h | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index f7220d4..8bf58a6 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -373,6 +373,7 @@ static void piix4_reset(void *opaque) pci_conf[0x5B] = 0x02; } piix4_update_hotplug(s); + dimm_state_sync(); } static void piix4_powerdown(void *opaque, int irq, int power_failing) diff --git a/hw/dimm.c b/hw/dimm.c index 1521462..b993668 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -182,6 +182,26 @@ static DimmDevice *dimm_find_from_idx(uint32_t idx) return NULL; } +void dimm_state_sync(void) +{ + DimmBus *bus = main_memory_bus; + DimmDevice *slot; + + /* if a hot-remove operation is pending on reset, it means the hot-remove + * operation has failed, but the guest hasn't notified us e.g. because the + * guest does not provide _OST notifications. The device is still present on + * the dimmbus, but the qemu and Seabios dimm bitmaps show this device as + * unplugged. To avoid this inconsistency, we set the dimm bits to active + * i.e. hot-plugged for each dimm present on the dimmbus. + */ + QTAILQ_FOREACH(slot, &bus->dimmlist, nextdimm) { + if (slot->pending == DIMM_REMOVE_PENDING) { + if (bus->dimm_revert) + bus->dimm_revert(bus->dimm_hotplug_qdev, slot, 0); + } + } +} + /* used to create a dimm device, only on incoming migration of a hotplugged * RAMBlock */ diff --git a/hw/dimm.h b/hw/dimm.h index a6c6e6f..ce091fe 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -95,5 +95,6 @@ void main_memory_bus_create(Object *parent); void dimm_config_create(char *id, uint64_t size, uint64_t node, uint32_t dimm_idx, uint32_t populated); uint64_t get_hp_memory_total(void); +void dimm_state_sync(void); #endif