From patchwork Thu Jan 30 07:14:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 315276 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 A86C02C0172 for ; Thu, 30 Jan 2014 18:18:47 +1100 (EST) Received: from localhost ([::1]:46773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8ltd-0007xG-6s for incoming@patchwork.ozlabs.org; Thu, 30 Jan 2014 02:18:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8lpD-0000IX-2n for qemu-devel@nongnu.org; Thu, 30 Jan 2014 02:14:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8lp6-0003gy-VC for qemu-devel@nongnu.org; Thu, 30 Jan 2014 02:14:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8lp6-0003gh-M9 for qemu-devel@nongnu.org; Thu, 30 Jan 2014 02:14:04 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0U7E1HY006022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 Jan 2014 02:14:01 -0500 Received: from dhcp-1-120.tlv.redhat.com (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s0U7DhZs011122; Thu, 30 Jan 2014 02:13:59 -0500 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 30 Jan 2014 09:14:15 +0200 Message-Id: <1391066055-17024-7-git-send-email-owasserm@redhat.com> In-Reply-To: <1391066055-17024-1-git-send-email-owasserm@redhat.com> References: <1391066055-17024-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, Orit Wasserman , anthony@codemonkey.ws, quintela@redhat.com Subject: [Qemu-devel] [PATCH 6/6] Don't abort on memory allocation error 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 It is better to fail migration in case of failure to allocate new cache item Signed-off-by: Orit Wasserman Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- arch_init.c | 4 +++- include/migration/page_cache.h | 4 +++- page_cache.c | 16 +++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/arch_init.c b/arch_init.c index 806d096..0bfbc5a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -284,7 +284,9 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, if (!cache_is_cached(XBZRLE.cache, current_addr)) { if (!last_stage) { - cache_insert(XBZRLE.cache, current_addr, current_data); + if (cache_insert(XBZRLE.cache, current_addr, current_data) == -1) { + return -1; + } } acct_info.xbzrle_cache_miss++; return -1; diff --git a/include/migration/page_cache.h b/include/migration/page_cache.h index 87894fe..d156f0d 100644 --- a/include/migration/page_cache.h +++ b/include/migration/page_cache.h @@ -60,11 +60,13 @@ uint8_t *get_cached_data(const PageCache *cache, uint64_t addr); * cache_insert: insert the page into the cache. the page cache * will dup the data on insert. the previous value will be overwritten * + * Returns -1 on error + * * @cache pointer to the PageCache struct * @addr: page address * @pdata: pointer to the page */ -void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata); +int cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata); /** * cache_resize: resize the page cache. In case of size reduction the extra diff --git a/page_cache.c b/page_cache.c index 62a53f8..69e8329 100644 --- a/page_cache.c +++ b/page_cache.c @@ -150,7 +150,7 @@ uint8_t *get_cached_data(const PageCache *cache, uint64_t addr) return cache_get_by_addr(cache, addr)->it_data; } -void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata) +int cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata) { CacheItem *it = NULL; @@ -161,16 +161,22 @@ void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata) /* actual update of entry */ it = cache_get_by_addr(cache, addr); - /* free old cached data if any */ - g_free(it->it_data); - + /* allocate page */ if (!it->it_data) { cache->num_items++; + it->it_data = g_try_malloc(cache->page_size); + if (!it->it_data) { + DPRINTF("Error allocating page\n"); + return -1; + } } - it->it_data = g_memdup(pdata, cache->page_size); + memcpy(it->it_data, pdata, cache->page_size); + it->it_age = ++cache->max_item_age; it->it_addr = addr; + + return 0; } int64_t cache_resize(PageCache *cache, int64_t new_num_pages)