cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
958e1b
From 1f333717698aecbd70732d4dac609db8eda895d5 Mon Sep 17 00:00:00 2001
958e1b
From: Laszlo Ersek <lersek@redhat.com>
958e1b
Date: Fri, 7 Nov 2014 17:17:57 +0100
958e1b
Subject: [PATCH 10/41] dump: add members to DumpState and init some of them
958e1b
958e1b
Message-id: <1415380693-16593-11-git-send-email-lersek@redhat.com>
958e1b
Patchwork-id: 62196
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 10/26] dump: add members to DumpState and init some of them
958e1b
Bugzilla: 1157798
958e1b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
958e1b
RH-Acked-by: dgibson <dgibson@redhat.com>
958e1b
958e1b
From: qiaonuohan <qiaonuohan@cn.fujitsu.com>
958e1b
958e1b
add some members to DumpState that will be used in writing vmcore in
958e1b
kdump-compressed format. some of them, like page_size, will be initialized
958e1b
in the patch.
958e1b
958e1b
Signed-off-by: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
958e1b
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
958e1b
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
958e1b
(cherry picked from commit 7aad248d3596a1fb94778f2cd215f86a802b3abb)
958e1b
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 dump.c                | 28 ++++++++++++++++++++++++++++
958e1b
 include/sysemu/dump.h |  7 +++++++
958e1b
 2 files changed, 35 insertions(+)
958e1b
958e1b
diff --git a/dump.c b/dump.c
958e1b
index 3c6d526..88e8cc0 100644
958e1b
--- a/dump.c
958e1b
+++ b/dump.c
958e1b
@@ -79,6 +79,16 @@ typedef struct DumpState {
958e1b
 
958e1b
     uint8_t *note_buf;          /* buffer for notes */
958e1b
     size_t note_buf_offset;     /* the writing place in note_buf */
958e1b
+    uint32_t nr_cpus;           /* number of guest's cpu */
958e1b
+    size_t page_size;           /* guest's page size */
958e1b
+    uint32_t page_shift;        /* guest's page shift */
958e1b
+    uint64_t max_mapnr;         /* the biggest guest's phys-mem's number */
958e1b
+    size_t len_dump_bitmap;     /* the size of the place used to store
958e1b
+                                   dump_bitmap in vmcore */
958e1b
+    off_t offset_dump_bitmap;   /* offset of dump_bitmap part in vmcore */
958e1b
+    off_t offset_page;          /* offset of page part in vmcore */
958e1b
+    size_t num_dumpable;        /* number of page that can be dumped */
958e1b
+    uint32_t flag_compress;     /* indicate the compression format */
958e1b
 } DumpState;
958e1b
 
958e1b
 static int dump_cleanup(DumpState *s)
958e1b
@@ -802,6 +812,14 @@ static ram_addr_t get_start_block(DumpState *s)
958e1b
     return -1;
958e1b
 }
958e1b
 
958e1b
+static void get_max_mapnr(DumpState *s)
958e1b
+{
958e1b
+    GuestPhysBlock *last_block;
958e1b
+
958e1b
+    last_block = QTAILQ_LAST(&s->guest_phys_blocks.head, GuestPhysBlockHead);
958e1b
+    s->max_mapnr = paddr_to_pfn(last_block->target_end, s->page_shift);
958e1b
+}
958e1b
+
958e1b
 static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,
958e1b
                      int64_t begin, int64_t length, Error **errp)
958e1b
 {
958e1b
@@ -870,6 +888,16 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,
958e1b
         qemu_get_guest_simple_memory_mapping(&s->list, &s->guest_phys_blocks);
958e1b
     }
958e1b
 
958e1b
+    s->nr_cpus = nr_cpus;
958e1b
+    s->page_size = TARGET_PAGE_SIZE;
958e1b
+    s->page_shift = ffs(s->page_size) - 1;
958e1b
+
958e1b
+    get_max_mapnr(s);
958e1b
+
958e1b
+    uint64_t tmp;
958e1b
+    tmp = DIV_ROUND_UP(DIV_ROUND_UP(s->max_mapnr, CHAR_BIT), s->page_size);
958e1b
+    s->len_dump_bitmap = tmp * s->page_size;
958e1b
+
958e1b
     if (s->has_filter) {
958e1b
         memory_mapping_filter(&s->list, s->begin, s->length);
958e1b
     }
958e1b
diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
958e1b
index b32b390..995bf47 100644
958e1b
--- a/include/sysemu/dump.h
958e1b
+++ b/include/sysemu/dump.h
958e1b
@@ -20,6 +20,13 @@
958e1b
 #define VERSION_FLAT_HEADER         (1)    /* version of flattened format */
958e1b
 #define END_FLAG_FLAT_HEADER        (-1)
958e1b
 
958e1b
+#define ARCH_PFN_OFFSET             (0)
958e1b
+
958e1b
+#define paddr_to_pfn(X, page_shift) \
958e1b
+    (((unsigned long long)(X) >> (page_shift)) - ARCH_PFN_OFFSET)
958e1b
+#define pfn_to_paddr(X, page_shift) \
958e1b
+    (((unsigned long long)(X) + ARCH_PFN_OFFSET) << (page_shift))
958e1b
+
958e1b
 typedef struct ArchDumpInfo {
958e1b
     int d_machine;  /* Architecture */
958e1b
     int d_endian;   /* ELFDATA2LSB or ELFDATA2MSB */
958e1b
-- 
958e1b
1.8.3.1
958e1b