From b75b57e4a5b75f03c5d302ced1287f47de6c9ccc Mon Sep 17 00:00:00 2001

From: Orit Wasserman <owasserm@redhat.com>

Date: Tue, 11 Feb 2014 15:32:37 +0100

Subject: [PATCH 16/28] Don't abort on memory allocation error

RH-Author: Orit Wasserman <owasserm@redhat.com>

Message-id: <1392132757-18587-4-git-send-email-owasserm@redhat.com>

Patchwork-id: 57211

O-Subject: [RHEL7 qemu-kvm PATCH 3/3] Don't abort on memory allocation error

Bugzilla: 1047448

RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>

RH-Acked-by: Juan Quintela <quintela@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

It is better to fail migration in case of failure to

allocate new cache item

Signed-off-by: Orit Wasserman <owasserm@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>

(cherry picked from commit 89db9987c07977bdb78d5d4b41d65e7acb9a5a2c)

---

 arch_init.c                    |  4 +++-

 include/migration/page_cache.h |  4 +++-

 page_cache.c                   | 16 +++++++++++-----

 3 files changed, 17 insertions(+), 7 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 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 fc0f569..0aacdac 100644

--- a/arch_init.c

+++ b/arch_init.c

@@ -286,7 +286,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 2920123..250772d 100644

--- a/page_cache.c

+++ b/page_cache.c

@@ -151,7 +151,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;

@@ -162,16 +162,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.7.1