188 lines
6.9 KiB
Diff
188 lines
6.9 KiB
Diff
From 411f5354b809f6b783946e58d7655135814fb809 Mon Sep 17 00:00:00 2001
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Thu, 11 Aug 2022 12:10:58 +0000
|
|
Subject: [PATCH 26/42] dump: Rework filter area variables
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
|
RH-MergeRequest: 226: s390: Enhanced Interpretation for PCI Functions and Secure Execution guest dump
|
|
RH-Bugzilla: 1664378 2043909
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
|
RH-Commit: [26/41] f10a5523dfd2724f7a8637fca3ed68ba6df659a5
|
|
|
|
While the DumpState begin and length variables directly mirror the API
|
|
variable names they are not very descriptive. So let's add a
|
|
"filter_area_" prefix and make has_filter a function checking length > 0.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-Id: <20220811121111.9878-6-frankja@linux.ibm.com>
|
|
(cherry picked from commit dddf725f70bfe7f5adb41fa31dbd06e767271bda)
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
---
|
|
dump/dump.c | 53 +++++++++++++++++++++++++------------------
|
|
include/sysemu/dump.h | 13 ++++++++---
|
|
2 files changed, 41 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/dump/dump.c b/dump/dump.c
|
|
index e6aa037f59..f6fe13e258 100644
|
|
--- a/dump/dump.c
|
|
+++ b/dump/dump.c
|
|
@@ -60,6 +60,11 @@ static inline bool dump_is_64bit(DumpState *s)
|
|
return s->dump_info.d_class == ELFCLASS64;
|
|
}
|
|
|
|
+static inline bool dump_has_filter(DumpState *s)
|
|
+{
|
|
+ return s->filter_area_length > 0;
|
|
+}
|
|
+
|
|
uint16_t cpu_to_dump16(DumpState *s, uint16_t val)
|
|
{
|
|
if (s->dump_info.d_endian == ELFDATA2LSB) {
|
|
@@ -444,29 +449,30 @@ static void get_offset_range(hwaddr phys_addr,
|
|
*p_offset = -1;
|
|
*p_filesz = 0;
|
|
|
|
- if (s->has_filter) {
|
|
- if (phys_addr < s->begin || phys_addr >= s->begin + s->length) {
|
|
+ if (dump_has_filter(s)) {
|
|
+ if (phys_addr < s->filter_area_begin ||
|
|
+ phys_addr >= s->filter_area_begin + s->filter_area_length) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
|
|
- if (s->has_filter) {
|
|
- if (block->target_start >= s->begin + s->length ||
|
|
- block->target_end <= s->begin) {
|
|
+ if (dump_has_filter(s)) {
|
|
+ if (block->target_start >= s->filter_area_begin + s->filter_area_length ||
|
|
+ block->target_end <= s->filter_area_begin) {
|
|
/* This block is out of the range */
|
|
continue;
|
|
}
|
|
|
|
- if (s->begin <= block->target_start) {
|
|
+ if (s->filter_area_begin <= block->target_start) {
|
|
start = block->target_start;
|
|
} else {
|
|
- start = s->begin;
|
|
+ start = s->filter_area_begin;
|
|
}
|
|
|
|
size_in_block = block->target_end - start;
|
|
- if (s->begin + s->length < block->target_end) {
|
|
- size_in_block -= block->target_end - (s->begin + s->length);
|
|
+ if (s->filter_area_begin + s->filter_area_length < block->target_end) {
|
|
+ size_in_block -= block->target_end - (s->filter_area_begin + s->filter_area_length);
|
|
}
|
|
} else {
|
|
start = block->target_start;
|
|
@@ -639,12 +645,12 @@ static void dump_iterate(DumpState *s, Error **errp)
|
|
int64_t memblock_size, memblock_start;
|
|
|
|
QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
|
|
- memblock_start = dump_filtered_memblock_start(block, s->begin, s->length);
|
|
+ memblock_start = dump_filtered_memblock_start(block, s->filter_area_begin, s->filter_area_length);
|
|
if (memblock_start == -1) {
|
|
continue;
|
|
}
|
|
|
|
- memblock_size = dump_filtered_memblock_size(block, s->begin, s->length);
|
|
+ memblock_size = dump_filtered_memblock_size(block, s->filter_area_begin, s->filter_area_length);
|
|
|
|
/* Write the memory to file */
|
|
write_memory(s, block, memblock_start, memblock_size, errp);
|
|
@@ -1513,14 +1519,14 @@ static int validate_start_block(DumpState *s)
|
|
{
|
|
GuestPhysBlock *block;
|
|
|
|
- if (!s->has_filter) {
|
|
+ if (!dump_has_filter(s)) {
|
|
return 0;
|
|
}
|
|
|
|
QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
|
|
/* This block is out of the range */
|
|
- if (block->target_start >= s->begin + s->length ||
|
|
- block->target_end <= s->begin) {
|
|
+ if (block->target_start >= s->filter_area_begin + s->filter_area_length ||
|
|
+ block->target_end <= s->filter_area_begin) {
|
|
continue;
|
|
}
|
|
return 0;
|
|
@@ -1559,10 +1565,10 @@ static int64_t dump_calculate_size(DumpState *s)
|
|
int64_t size = 0, total = 0, left = 0, right = 0;
|
|
|
|
QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
|
|
- if (s->has_filter) {
|
|
+ if (dump_has_filter(s)) {
|
|
/* calculate the overlapped region. */
|
|
- left = MAX(s->begin, block->target_start);
|
|
- right = MIN(s->begin + s->length, block->target_end);
|
|
+ left = MAX(s->filter_area_begin, block->target_start);
|
|
+ right = MIN(s->filter_area_begin + s->filter_area_length, block->target_end);
|
|
size = right - left;
|
|
size = size > 0 ? size : 0;
|
|
} else {
|
|
@@ -1652,9 +1658,12 @@ static void dump_init(DumpState *s, int fd, bool has_format,
|
|
}
|
|
|
|
s->fd = fd;
|
|
- s->has_filter = has_filter;
|
|
- s->begin = begin;
|
|
- s->length = length;
|
|
+ if (has_filter && !length) {
|
|
+ error_setg(errp, QERR_INVALID_PARAMETER, "length");
|
|
+ goto cleanup;
|
|
+ }
|
|
+ s->filter_area_begin = begin;
|
|
+ s->filter_area_length = length;
|
|
|
|
memory_mapping_list_init(&s->list);
|
|
|
|
@@ -1787,8 +1796,8 @@ static void dump_init(DumpState *s, int fd, bool has_format,
|
|
return;
|
|
}
|
|
|
|
- if (s->has_filter) {
|
|
- memory_mapping_filter(&s->list, s->begin, s->length);
|
|
+ if (dump_has_filter(s)) {
|
|
+ memory_mapping_filter(&s->list, s->filter_area_begin, s->filter_area_length);
|
|
}
|
|
|
|
/*
|
|
diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
|
|
index 7fce1d4af6..b62513d87d 100644
|
|
--- a/include/sysemu/dump.h
|
|
+++ b/include/sysemu/dump.h
|
|
@@ -166,9 +166,16 @@ typedef struct DumpState {
|
|
hwaddr memory_offset;
|
|
int fd;
|
|
|
|
- bool has_filter;
|
|
- int64_t begin;
|
|
- int64_t length;
|
|
+ /*
|
|
+ * Dump filter area variables
|
|
+ *
|
|
+ * A filtered dump only contains the guest memory designated by
|
|
+ * the start address and length variables defined below.
|
|
+ *
|
|
+ * If length is 0, no filtering is applied.
|
|
+ */
|
|
+ int64_t filter_area_begin; /* Start address of partial guest memory area */
|
|
+ int64_t filter_area_length; /* Length of partial guest memory area */
|
|
|
|
uint8_t *note_buf; /* buffer for notes */
|
|
size_t note_buf_offset; /* the writing place in note_buf */
|
|
--
|
|
2.37.3
|
|
|