qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws
Subject: [Qemu-devel] [PULL 14/22] dump: add APIs to operate DataCache
Date: Thu, 13 Feb 2014 10:30:32 -0500	[thread overview]
Message-ID: <1392305440-30465-15-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1392305440-30465-1-git-send-email-lcapitulino@redhat.com>

From: qiaonuohan <qiaonuohan@cn.fujitsu.com>

DataCache is used to store data temporarily, then the data will be written to
vmcore. These functions will be called later when writing data of page to
vmcore.

Signed-off-by: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 dump.c                | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 include/sysemu/dump.h |  9 +++++++++
 2 files changed, 56 insertions(+)

diff --git a/dump.c b/dump.c
index 5755534..a7a85d3 100644
--- a/dump.c
+++ b/dump.c
@@ -1165,6 +1165,53 @@ out:
     return ret;
 }
 
+static void prepare_data_cache(DataCache *data_cache, DumpState *s,
+                               off_t offset)
+{
+    data_cache->fd = s->fd;
+    data_cache->data_size = 0;
+    data_cache->buf_size = BUFSIZE_DATA_CACHE;
+    data_cache->buf = g_malloc0(BUFSIZE_DATA_CACHE);
+    data_cache->offset = offset;
+}
+
+static int write_cache(DataCache *dc, const void *buf, size_t size,
+                       bool flag_sync)
+{
+    /*
+     * dc->buf_size should not be less than size, otherwise dc will never be
+     * enough
+     */
+    assert(size <= dc->buf_size);
+
+    /*
+     * if flag_sync is set, synchronize data in dc->buf into vmcore.
+     * otherwise check if the space is enough for caching data in buf, if not,
+     * write the data in dc->buf to dc->fd and reset dc->buf
+     */
+    if ((!flag_sync && dc->data_size + size > dc->buf_size) ||
+        (flag_sync && dc->data_size > 0)) {
+        if (write_buffer(dc->fd, dc->offset, dc->buf, dc->data_size) < 0) {
+            return -1;
+        }
+
+        dc->offset += dc->data_size;
+        dc->data_size = 0;
+    }
+
+    if (!flag_sync) {
+        memcpy(dc->buf + dc->data_size, buf, size);
+        dc->data_size += size;
+    }
+
+    return 0;
+}
+
+static void free_data_cache(DataCache *data_cache)
+{
+    g_free(data_cache->buf);
+}
+
 static ram_addr_t get_start_block(DumpState *s)
 {
     GuestPhysBlock *block;
diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
index 6d4d0bc..92a95e4 100644
--- a/include/sysemu/dump.h
+++ b/include/sysemu/dump.h
@@ -41,6 +41,7 @@
 #define DISKDUMP_HEADER_BLOCKS      (1)
 #define BUFSIZE_BITMAP              (TARGET_PAGE_SIZE)
 #define PFN_BUFBITMAP               (CHAR_BIT * BUFSIZE_BITMAP)
+#define BUFSIZE_DATA_CACHE          (TARGET_PAGE_SIZE * 4)
 
 typedef struct ArchDumpInfo {
     int d_machine;  /* Architecture */
@@ -142,6 +143,14 @@ typedef struct QEMU_PACKED KdumpSubHeader64 {
     uint64_t max_mapnr_64;          /* header_version 6 and later */
 } KdumpSubHeader64;
 
+typedef struct DataCache {
+    int fd;             /* fd of the file where to write the cached data */
+    uint8_t *buf;       /* buffer for cached data */
+    size_t buf_size;    /* size of the buf */
+    size_t data_size;   /* size of cached data in buf */
+    off_t offset;       /* offset of the file */
+} DataCache;
+
 struct GuestPhysBlockList; /* memory_mapping.h */
 int cpu_get_dump_info(ArchDumpInfo *info,
                       const struct GuestPhysBlockList *guest_phys_blocks);
-- 
1.8.1.4

  parent reply	other threads:[~2014-02-13 15:31 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-13 15:30 [Qemu-devel] [PULL 00/22] QMP queue Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 01/22] hmp: migrate command (without -d) now blocks correctly Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 02/22] QMP: allow JSON dict arguments in qmp-shell Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 03/22] Use error_is_set() only when necessary Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 04/22] qmp: expose list of supported character device backends Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 05/22] dump: const-qualify the buf of WriteCoreDumpFunction Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 06/22] dump: add argument to write_elfxx_notes Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 07/22] dump: add API to write header of flatten format Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 08/22] dump: add API to write vmcore Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 09/22] dump: add API to write elf notes to buffer Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 10/22] dump: add support for lzo/snappy Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 11/22] dump: add members to DumpState and init some of them Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 12/22] dump: add API to write dump header Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 13/22] dump: add API to write dump_bitmap Luiz Capitulino
2014-02-13 15:30 ` Luiz Capitulino [this message]
2014-02-13 15:30 ` [Qemu-devel] [PULL 15/22] dump: add API to write dump pages Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 16/22] dump: make kdump-compressed format available for 'dump-guest-memory' Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 17/22] dump: Define the architecture for compressed dump format Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 18/22] dump: add 'query-dump-guest-memory-capability' command Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 19/22] monitor: Add device_del id argument completion Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 20/22] monitor: Add device_add device " Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 21/22] monitor: Add object_del id " Luiz Capitulino
2014-02-13 15:30 ` [Qemu-devel] [PULL 22/22] monitor: Add object_add class " Luiz Capitulino
2014-02-15 15:36 ` [Qemu-devel] [PULL 00/22] QMP queue Peter Maydell
2014-02-17 17:46   ` Luiz Capitulino
2014-02-20 13:07     ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392305440-30465-15-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).