From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8w2T-0007h4-6c for qemu-devel@nongnu.org; Thu, 30 Jan 2014 13:08:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8w2M-0007eo-Ng for qemu-devel@nongnu.org; Thu, 30 Jan 2014 13:08:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8w2M-0007eT-F0 for qemu-devel@nongnu.org; Thu, 30 Jan 2014 13:08:26 -0500 From: Orit Wasserman Date: Thu, 30 Jan 2014 20:08:38 +0200 Message-Id: <1391105318-23247-7-git-send-email-owasserm@redhat.com> In-Reply-To: <1391105318-23247-1-git-send-email-owasserm@redhat.com> References: <1391105318-23247-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/6] Don't abort on memory allocation error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Orit Wasserman , dgilbert@redhat.com, anthony@codemonkey.ws, quintela@redhat.com It is better to fail migration in case of failure to allocate new cache item Signed-off-by: Orit Wasserman --- 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 1fa5f1f..80574a0 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..3ef6ee7 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) { + it->it_data = g_try_malloc(cache->page_size); + if (!it->it_data) { + DPRINTF("Error allocating page\n"); + return -1; + } cache->num_items++; } - 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) -- 1.8.3.1