From patchwork Fri Feb 5 08:19:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 8232641 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 13683BEEE5 for ; Fri, 5 Feb 2016 08:21:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70915202F8 for ; Fri, 5 Feb 2016 08:21:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3C072021A for ; Fri, 5 Feb 2016 08:21:46 +0000 (UTC) Received: from localhost ([::1]:46736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRbeE-0000M2-1w for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Feb 2016 03:21:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRbc4-00055r-9b for qemu-devel@nongnu.org; Fri, 05 Feb 2016 03:19:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRbc3-0002IM-At for qemu-devel@nongnu.org; Fri, 05 Feb 2016 03:19:32 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:23955 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRbc2-0002H4-V0 for qemu-devel@nongnu.org; Fri, 05 Feb 2016 03:19:31 -0500 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u14Nv9Y9021732; Fri, 5 Feb 2016 02:57:26 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Fri, 5 Feb 2016 11:19:01 +0300 Message-Id: <1454660341-45244-6-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1454660341-45244-1-git-send-email-vsementsov@virtuozzo.com> References: <1454660341-45244-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: vsementsov@virtuozzo.com, guangrong.xiao@linux.intel.com, mst@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, imammedo@redhat.com, cornelia.huck@de.ibm.com, den@openvz.org Subject: [Qemu-devel] [PATCH 5/5] balloon: Use only 'pc-dimm' type dimm for ballooning 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 For now there are only two dimm's: pc-dimm and nvdimm. This patch is actually needed to disable ballooning on nvdimm. But, to avoid future bugs, instead of disallowing nvdimm, we allow only pc-dimm. So, if someone adds new dimm which should be balloon-able, then this ability should be explicitly specified here. Why ballooning for nvdimm should be disabled for now: NVDIMM for now is planned to use as a backing store for DAX filesystem in the guest and thus this memory is excluded from guest memory management and LRUs. In this case libvirt running QEMU along with configured balloon almost immediately inflates balloon and effectively kill the guest as qemu counts nvdimm as part of the ram. Counting dimm devices as part of the ram for ballooning was started from commit 463756d03: virtio-balloon: Fix balloon not working correctly when hotplug memory Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev --- hw/virtio/virtio-balloon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index b9c1964..0415e07 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -18,6 +18,7 @@ #include "qemu-common.h" #include "hw/virtio/virtio.h" #include "hw/i386/pc.h" +#include "hw/mem/nvdimm.h" #include "cpu.h" #include "sysemu/balloon.h" #include "hw/virtio/virtio-balloon.h" @@ -302,7 +303,10 @@ static ram_addr_t get_current_ram_size(void) pc_dimm_build_list(qdev_get_machine(), &list); for (item = list; item; item = g_slist_next(item)) { PCDIMMDevice *dimm = item->data; - size += object_property_get_int(OBJECT(dimm), PC_DIMM_SIZE_PROP, NULL); + if (!strcmp(object_get_typename(OBJECT(dimm)), TYPE_PC_DIMM)) { + size += object_property_get_int(OBJECT(dimm), PC_DIMM_SIZE_PROP, + NULL); + } } g_slist_free(list);