* [PATCH v3 00/10] ARM virt: Add NVDIMM support
@ 2020-03-11 17:20 Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 01/10] acpi: Use macro for table-loader file name Shameer Kolothum
` (12 more replies)
0 siblings, 13 replies; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
This series adds NVDIMM support to arm/virt platform.
The series reuses some of the patches posted by Eric
in his earlier attempt here[1].
This also include few fixes to qemu in general which were
discovered while adding nvdimm support to arm/virt.
Patch #2 addresses the issue[2] that, during migration, the
source and destination might end up with an inconsistency
in acpi table memory region sizes.
Patch #3 is to fix the qemu_ram_resize() callback issue[2].
Patch #4 is another fix to the nvdimm aml issue discussed
here[3].
I have done a basic sanity testing of NVDIMM devices
with Guest booting with ACPI. Further testing is always
welcome.
Please let me know your feedback.
Thanks,
Shameer
[1] https://patchwork.kernel.org/cover/10830777/
[2] https://patchwork.kernel.org/patch/11339591/
[3] https://patchwork.kernel.org/cover/11174959/
v2 --> v3
- Added patch #1 and # 2 to fix the inconsistency in acpi
table memory region sizes during migration. Thanks to
David H.
- The fix for qemu_ram_resize() callback was modified to
the one in patch #3. Again thanks to David H.
- Addressed comments from MST and Eric on tests added.
- Addressed comments from Igor/MST on Integer size in patch #4
- Added Eric's R-by to patch #7.
v1 --> v2
-Reworked patch #1 and now fix is inside qemu_ram_resize().
-Added patch #2 to fix the nvdim aml issue.
-Dropped support to DT cold plug.
-Updated test_acpi_virt_tcg_memhp() with pc-dimm and nvdimms(patch #7)
David Hildenbrand (1):
exec: Fix for qemu_ram_resize() callback
Kwangwoo Lee (2):
nvdimm: Use configurable ACPI IO base and size
hw/arm/virt: Add nvdimm hot-plug infrastructure
Shameer Kolothum (7):
acpi: Use macro for table-loader file name
fw_cfg: Migrate ACPI table mr sizes separately
hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length
hw/arm/virt: Add nvdimm hotplug support
tests: Update ACPI tables list for upcoming arm/virt test changes
tests/bios-tables-test: Update arm/virt memhp test
tests/acpi: add expected tables for bios-tables-test
docs/specs/acpi_hw_reduced_hotplug.rst | 1 +
exec.c | 14 +++-
hw/acpi/generic_event_device.c | 15 ++++-
hw/acpi/nvdimm.c | 72 +++++++++++++++++----
hw/arm/Kconfig | 1 +
hw/arm/virt-acpi-build.c | 8 ++-
hw/arm/virt.c | 35 ++++++++--
hw/core/machine.c | 1 +
hw/i386/acpi-build.c | 8 ++-
hw/i386/acpi-build.h | 3 +
hw/i386/pc_piix.c | 2 +
hw/i386/pc_q35.c | 2 +
hw/mem/Kconfig | 2 +-
hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++-
include/hw/acpi/aml-build.h | 1 +
include/hw/acpi/generic_event_device.h | 1 +
include/hw/arm/virt.h | 1 +
include/hw/mem/nvdimm.h | 3 +
include/hw/nvram/fw_cfg.h | 6 ++
tests/data/acpi/pc/SSDT.dimmpxm | Bin 685 -> 734 bytes
tests/data/acpi/q35/SSDT.dimmpxm | Bin 685 -> 734 bytes
tests/data/acpi/virt/DSDT.memhp | Bin 6644 -> 6668 bytes
tests/data/acpi/virt/NFIT.memhp | Bin 0 -> 224 bytes
tests/data/acpi/virt/SSDT.memhp | Bin 0 -> 736 bytes
tests/qtest/bios-tables-test.c | 9 ++-
25 files changed, 244 insertions(+), 27 deletions(-)
create mode 100644 tests/data/acpi/virt/NFIT.memhp
create mode 100644 tests/data/acpi/virt/SSDT.memhp
--
2.17.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v3 01/10] acpi: Use macro for table-loader file name
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-23 12:23 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
` (11 subsequent siblings)
12 siblings, 1 reply; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
Use macro for "etc/table-loader" and move it to the header
file similar to ACPI_BUILD_TABLE_FILE/ACPI_BUILD_RSDP_FILE etc.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
hw/arm/virt-acpi-build.c | 2 +-
hw/i386/acpi-build.c | 2 +-
include/hw/acpi/aml-build.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index fb4b166f82..c13710b727 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -929,7 +929,7 @@ void virt_acpi_setup(VirtMachineState *vms)
build_state->linker_mr =
acpi_add_rom_blob(virt_acpi_build_update, build_state,
- tables.linker->cmd_blob, "etc/table-loader", 0);
+ tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0);
fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
acpi_data_len(tables.tcpalog));
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 9a19c14e66..80f05d728d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -3043,7 +3043,7 @@ void acpi_setup(void)
build_state->linker_mr =
acpi_add_rom_blob(acpi_build_update, build_state,
- tables.linker->cmd_blob, "etc/table-loader", 0);
+ tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0);
fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
tables.tcpalog->data, acpi_data_len(tables.tcpalog));
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index de4a406568..0f4ed53d7f 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -13,6 +13,7 @@
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
#define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
+#define ACPI_BUILD_LOADER_FILE "etc/table-loader"
#define AML_NOTIFY_METHOD "NTFY"
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 01/10] acpi: Use macro for table-loader file name Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-11 17:48 ` David Hildenbrand
` (3 more replies)
2020-03-11 17:20 ` [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback Shameer Kolothum
` (10 subsequent siblings)
12 siblings, 4 replies; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
Any sub-page size update to ACPI table MRs will be lost during
migration, as we use aligned size in ram_load_precopy() ->
qemu_ram_resize() path. This will result in inconsistency in sizes
between source and destination. In order to avoid this, save and
restore them separately during migration.
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
Please find the discussion here,
https://patchwork.kernel.org/patch/11339591/
---
hw/core/machine.c | 1 +
hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++++++++++++++++-
include/hw/nvram/fw_cfg.h | 6 +++
3 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 9e8c06036f..6d960bd47f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
{ "usb-redir", "suppress-remote-wake", "off" },
{ "qxl", "revision", "4" },
{ "qxl-vga", "revision", "4" },
+ { "fw_cfg", "acpi-mr-restore", "false" },
};
const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 179b302f01..36d1e32f83 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -39,6 +39,7 @@
#include "qemu/config-file.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
+#include "hw/acpi/aml-build.h"
#define FW_CFG_FILE_SLOTS_DFLT 0x20
@@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
return s->dma_enabled;
}
+static bool fw_cfg_acpi_mr_restore(void *opaque)
+{
+ FWCfgState *s = opaque;
+ return s->acpi_mr_restore;
+}
+
+static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
+{
+ MemoryRegion *mr;
+ ram_addr_t offset;
+ int arch = !!(key & FW_CFG_ARCH_LOCAL);
+ void *ptr;
+
+ key &= FW_CFG_ENTRY_MASK;
+ assert(key < fw_cfg_max_entry(s));
+
+ ptr = s->entries[arch][key].data;
+ mr = memory_region_from_host(ptr, &offset);
+
+ memory_region_ram_resize(mr, size, &error_abort);
+}
+
+static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
+{
+ FWCfgState *s = opaque;
+ int i, index;
+
+ assert(s->files);
+
+ index = be32_to_cpu(s->files->count);
+
+ for (i = 0; i < index; i++) {
+ if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
+ fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->table_mr_size);
+ } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
+ fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->linker_mr_size);
+ } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
+ fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->rsdp_mr_size);
+ }
+ }
+
+ return 0;
+}
+
static const VMStateDescription vmstate_fw_cfg_dma = {
.name = "fw_cfg/dma",
.needed = fw_cfg_dma_enabled,
@@ -619,6 +664,20 @@ static const VMStateDescription vmstate_fw_cfg_dma = {
},
};
+static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
+ .name = "fw_cfg/acpi_mr",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = fw_cfg_acpi_mr_restore,
+ .post_load = fw_cfg_acpi_mr_restore_post_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT64(table_mr_size, FWCfgState),
+ VMSTATE_UINT64(linker_mr_size, FWCfgState),
+ VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
+ VMSTATE_END_OF_LIST()
+ },
+};
+
static const VMStateDescription vmstate_fw_cfg = {
.name = "fw_cfg",
.version_id = 2,
@@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
},
.subsections = (const VMStateDescription*[]) {
&vmstate_fw_cfg_dma,
+ &vmstate_fw_cfg_acpi_mr,
NULL,
}
};
@@ -815,6 +875,23 @@ static struct {
#define FW_CFG_ORDER_OVERRIDE_LAST 200
};
+/*
+ * Any sub-page size update to these table MRs will be lost during migration,
+ * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
+ * In order to avoid the inconsistency in sizes save them seperately and
+ * migrate over in vmstate post_load().
+ */
+static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, size_t len)
+{
+ if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
+ s->table_mr_size = len;
+ } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
+ s->linker_mr_size = len;
+ } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
+ s->rsdp_mr_size = len;
+ }
+}
+
static int get_fw_cfg_order(FWCfgState *s, const char *name)
{
int i;
@@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
s->files->count = cpu_to_be32(count+1);
+ fw_cfg_acpi_mr_save(s, filename, len);
}
void fw_cfg_add_file(FWCfgState *s, const char *filename,
@@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
data, len);
s->files->f[i].size = cpu_to_be32(len);
+ fw_cfg_acpi_mr_save(s, filename, len);
return ptr;
}
}
@@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data)
qemu_register_reset(fw_cfg_machine_reset, s);
}
-
+static Property fw_cfg_properties[] = {
+ DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, true),
+ DEFINE_PROP_END_OF_LIST(),
+};
static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
{
@@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
dc->reset = fw_cfg_reset;
dc->vmsd = &vmstate_fw_cfg;
+
+ device_class_set_props(dc, fw_cfg_properties);
}
static const TypeInfo fw_cfg_info = {
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index b5291eefad..457fee7425 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -53,6 +53,12 @@ struct FWCfgState {
dma_addr_t dma_addr;
AddressSpace *dma_as;
MemoryRegion dma_iomem;
+
+ /* restore during migration */
+ bool acpi_mr_restore;
+ size_t table_mr_size;
+ size_t linker_mr_size;
+ size_t rsdp_mr_size;
};
struct FWCfgIoState {
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 01/10] acpi: Use macro for table-loader file name Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-11 17:44 ` David Hildenbrand
2020-03-23 13:03 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length Shameer Kolothum
` (9 subsequent siblings)
12 siblings, 2 replies; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
From: David Hildenbrand <david@redhat.com>
Summarizing the issue:
1. Memory regions contain ram blocks with a different size, if the
size is not properly aligned. While memory regions can have an
unaligned size, ram blocks can't. This is true when creating
resizable memory region with an unaligned size.
2. When resizing a ram block/memory region, the size of the memory
region is set to the aligned size. The callback is called with
the aligned size. The unaligned piece is lost.
Because of the above, if ACPI blob length modifications happens
after the initial virt_acpi_build() call, and the changed blob
length is within the PAGE size boundary, then the revised size
is not seen by the firmware on Guest reboot.
Hence make sure callback is called if memory region size is changed,
irrespective of aligned or not.
Signed-off-by: David Hildenbrand <david@redhat.com>
[Shameer: added commit log]
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
Please find the discussion here,
https://patchwork.kernel.org/patch/11339591/
---
exec.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index 0cc500d53a..f8974cd303 100644
--- a/exec.c
+++ b/exec.c
@@ -2073,11 +2073,21 @@ static int memory_try_enable_merging(void *addr, size_t len)
*/
int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
{
+ const ram_addr_t unaligned_size = newsize;
+
assert(block);
newsize = HOST_PAGE_ALIGN(newsize);
if (block->used_length == newsize) {
+ /*
+ * We don't have to resize the ram block (which only knows aligned
+ * sizes), however, we have to notify if the unaligned size changed.
+ */
+ if (block->resized && unaligned_size != memory_region_size(block->mr)) {
+ block->resized(block->idstr, unaligned_size, block->host);
+ memory_region_set_size(block->mr, unaligned_size);
+ }
return 0;
}
@@ -2101,9 +2111,9 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
block->used_length = newsize;
cpu_physical_memory_set_dirty_range(block->offset, block->used_length,
DIRTY_CLIENTS_ALL);
- memory_region_set_size(block->mr, newsize);
+ memory_region_set_size(block->mr, unaligned_size);
if (block->resized) {
- block->resized(block->idstr, newsize, block->host);
+ block->resized(block->idstr, unaligned_size, block->host);
}
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (2 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-23 14:59 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size Shameer Kolothum
` (8 subsequent siblings)
12 siblings, 1 reply; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
As per ACPI spec 6.3, Table 19-419 Object Conversion Rules, if
the Buffer Field <= to the size of an Integer (in bits), it will
be treated as an integer. Moreover, the integer size depends on
DSDT tables revision number. If revision number is < 2, integer
size is 32 bits, otherwise it is 64 bits. Current NVDIMM common
DSM aml code (NCAL) uses CreateField() for creating DSM output
buffer. This creates an issue in arm/virt platform where DSDT
revision number is 2 and results in DSM buffer with a wrong
size(8 bytes) gets returned when actual length is < 8 bytes.
This causes guest kernel to report,
"nfit ACPI0012:00: found a zero length table '0' parsing nfit"
In order to fix this, aml code is now modified such that it builds
the DSM output buffer in a byte by byte fashion when length is
smaller than Integer size.
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
v2 -> v3
- Using Integer size as 8 bytes instead of SizeOf(Integer)
---
hw/acpi/nvdimm.c | 40 +++++++++++++++++++--
tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 5219dd0e2e..213556f35d 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -938,6 +938,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *elsectx2;
Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid;
Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf, *dsm_out_buf_size;
+ Aml *whilectx, *offset;
uint8_t byte_list[1];
method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);
@@ -1091,13 +1092,46 @@ static void nvdimm_build_common_dsm(Aml *dev)
/* RLEN is not included in the payload returned to guest. */
aml_append(method, aml_subtract(aml_name(NVDIMM_DSM_OUT_BUF_SIZE),
aml_int(4), dsm_out_buf_size));
+
+ /*
+ * As per ACPI spec 6.3, Table 19-419 Object Conversion Rules, if
+ * the Buffer Field <= to the size of an Integer (in bits), it will
+ * be treated as an integer. Moreover, the integer size depends on
+ * DSDT tables revision number. If revision number is < 2, integer
+ * size is 32 bits, otherwise it is 64 bits.
+ * Because of this CreateField() canot be used if RLEN < Integer Size.
+ *
+ * Also please note that APCI ASL operator SizeOf() doesn't support
+ * Integer and there isn't any other way to figure out the Integer
+ * size. Hence we assume 8 byte as Integer size and if RLEN < 8 bytes,
+ * build dsm_out_buf byte by byte.
+ */
+ ifctx = aml_if(aml_lless(dsm_out_buf_size, aml_int(8)));
+ offset = aml_local(2);
+ aml_append(ifctx, aml_store(aml_int(0), offset));
+ aml_append(ifctx, aml_name_decl("TBUF", aml_buffer(1, NULL)));
+ aml_append(ifctx, aml_store(aml_buffer(0, NULL), dsm_out_buf));
+
+ whilectx = aml_while(aml_lless(offset, dsm_out_buf_size));
+ /* Copy 1 byte at offset from ODAT to temporary buffer(TBUF). */
+ aml_append(whilectx, aml_store(aml_derefof(aml_index(
+ aml_name(NVDIMM_DSM_OUT_BUF), offset)),
+ aml_index(aml_name("TBUF"), aml_int(0))));
+ aml_append(whilectx, aml_concatenate(dsm_out_buf, aml_name("TBUF"),
+ dsm_out_buf));
+ aml_append(whilectx, aml_increment(offset));
+ aml_append(ifctx, whilectx);
+
+ aml_append(ifctx, aml_return(dsm_out_buf));
+ aml_append(method, ifctx);
+
+ /* If RLEN >= Integer size, just use CreateField() operator */
aml_append(method, aml_store(aml_shiftleft(dsm_out_buf_size, aml_int(3)),
dsm_out_buf_size));
aml_append(method, aml_create_field(aml_name(NVDIMM_DSM_OUT_BUF),
aml_int(0), dsm_out_buf_size, "OBUF"));
- aml_append(method, aml_concatenate(aml_buffer(0, NULL), aml_name("OBUF"),
- dsm_out_buf));
- aml_append(method, aml_return(dsm_out_buf));
+ aml_append(method, aml_return(aml_name("OBUF")));
+
aml_append(dev, method);
}
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..eb8bae1407 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,3 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/SSDT.dimmpxm",
+"tests/data/acpi/q35/SSDT.dimmpxm",
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (3 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-23 15:14 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure Shameer Kolothum
` (7 subsequent siblings)
12 siblings, 1 reply; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
From: Kwangwoo Lee <kwangwoo.lee@sk.com>
This patch makes IO base and size configurable to create NPIO AML for
ACPI NFIT. Since a different architecture like AArch64 does not use
port-mapped IO, a configurable IO base is required to create correct
mapping of ACPI IO address and size.
Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
hw/acpi/nvdimm.c | 32 ++++++++++++++++++++++----------
hw/i386/acpi-build.c | 6 ++++++
hw/i386/acpi-build.h | 3 +++
hw/i386/pc_piix.c | 2 ++
hw/i386/pc_q35.c | 2 ++
include/hw/mem/nvdimm.h | 3 +++
6 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 213556f35d..fb99ad845a 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -900,11 +900,13 @@ void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev)
}
void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
+ struct AcpiGenericAddress dsm_io,
FWCfgState *fw_cfg, Object *owner)
{
+ state->dsm_io = dsm_io;
memory_region_init_io(&state->io_mr, owner, &nvdimm_dsm_ops, state,
- "nvdimm-acpi-io", NVDIMM_ACPI_IO_LEN);
- memory_region_add_subregion(io, NVDIMM_ACPI_IO_BASE, &state->io_mr);
+ "nvdimm-acpi-io", dsm_io.bit_width >> 3);
+ memory_region_add_subregion(io, dsm_io.address, &state->io_mr);
state->dsm_mem = g_array_new(false, true /* clear */, 1);
acpi_data_push(state->dsm_mem, sizeof(NvdimmDsmIn));
@@ -933,13 +935,15 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
#define NVDIMM_QEMU_RSVD_UUID "648B9CF2-CDA1-4312-8AD9-49C4AF32BD62"
-static void nvdimm_build_common_dsm(Aml *dev)
+static void nvdimm_build_common_dsm(Aml *dev,
+ NVDIMMState *nvdimm_state)
{
Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *elsectx2;
Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid;
Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf, *dsm_out_buf_size;
Aml *whilectx, *offset;
uint8_t byte_list[1];
+ AmlRegionSpace rs;
method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);
uuid = aml_arg(0);
@@ -950,9 +954,16 @@ static void nvdimm_build_common_dsm(Aml *dev)
aml_append(method, aml_store(aml_name(NVDIMM_ACPI_MEM_ADDR), dsm_mem));
+ if (nvdimm_state->dsm_io.space_id == AML_AS_SYSTEM_IO) {
+ rs = AML_SYSTEM_IO;
+ } else {
+ rs = AML_SYSTEM_MEMORY;
+ }
+
/* map DSM memory and IO into ACPI namespace. */
- aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, AML_SYSTEM_IO,
- aml_int(NVDIMM_ACPI_IO_BASE), NVDIMM_ACPI_IO_LEN));
+ aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, rs,
+ aml_int(nvdimm_state->dsm_io.address),
+ nvdimm_state->dsm_io.bit_width >> 3));
aml_append(method, aml_operation_region(NVDIMM_DSM_MEMORY,
AML_SYSTEM_MEMORY, dsm_mem, sizeof(NvdimmDsmIn)));
@@ -967,7 +978,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
field = aml_field(NVDIMM_DSM_IOPORT, AML_DWORD_ACC, AML_NOLOCK,
AML_PRESERVE);
aml_append(field, aml_named_field(NVDIMM_DSM_NOTIFY,
- NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE));
+ nvdimm_state->dsm_io.bit_width));
aml_append(method, field);
/*
@@ -1268,7 +1279,8 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)
}
static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
- BIOSLinker *linker, GArray *dsm_dma_area,
+ BIOSLinker *linker,
+ NVDIMMState *nvdimm_state,
uint32_t ram_slots)
{
Aml *ssdt, *sb_scope, *dev;
@@ -1296,7 +1308,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
*/
aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0012")));
- nvdimm_build_common_dsm(dev);
+ nvdimm_build_common_dsm(dev, nvdimm_state);
/* 0 is reserved for root device. */
nvdimm_build_device_dsm(dev, 0);
@@ -1315,7 +1327,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
NVDIMM_ACPI_MEM_ADDR);
bios_linker_loader_alloc(linker,
- NVDIMM_DSM_MEM_FILE, dsm_dma_area,
+ NVDIMM_DSM_MEM_FILE, nvdimm_state->dsm_mem,
sizeof(NvdimmDsmIn), false /* high memory */);
bios_linker_loader_add_pointer(linker,
ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),
@@ -1337,7 +1349,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
return;
}
- nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
+ nvdimm_build_ssdt(table_offsets, table_data, linker, state,
ram_slots);
device_list = nvdimm_get_device_list();
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 80f05d728d..ed2b9af8d8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -128,6 +128,12 @@ typedef struct FwCfgTPMConfig {
static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg);
+const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = {
+ .space_id = AML_AS_SYSTEM_IO,
+ .address = NVDIMM_ACPI_IO_BASE,
+ .bit_width = NVDIMM_ACPI_IO_LEN << 3
+};
+
static void init_common_fadt_data(MachineState *ms, Object *o,
AcpiFadtData *data)
{
diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h
index 007332e51c..74df5fc612 100644
--- a/hw/i386/acpi-build.h
+++ b/hw/i386/acpi-build.h
@@ -1,6 +1,9 @@
#ifndef HW_I386_ACPI_BUILD_H
#define HW_I386_ACPI_BUILD_H
+#include "hw/acpi/acpi-defs.h"
+
+extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;
void acpi_setup(void);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index e2d98243bc..f0066d2394 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -61,6 +61,7 @@
#include "migration/misc.h"
#include "sysemu/numa.h"
#include "hw/mem/nvdimm.h"
+#include "hw/i386/acpi-build.h"
#define MAX_IDE_BUS 2
@@ -297,6 +298,7 @@ else {
if (machine->nvdimms_state->is_enabled) {
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
+ x86_nvdimm_acpi_dsmio,
x86ms->fw_cfg, OBJECT(pcms));
}
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index d37c425e22..d2806c1b29 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -54,6 +54,7 @@
#include "qemu/error-report.h"
#include "sysemu/numa.h"
#include "hw/mem/nvdimm.h"
+#include "hw/i386/acpi-build.h"
/* ICH9 AHCI has 6 ports */
#define MAX_SATA_PORTS 6
@@ -315,6 +316,7 @@ static void pc_q35_init(MachineState *machine)
if (machine->nvdimms_state->is_enabled) {
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
+ x86_nvdimm_acpi_dsmio,
x86ms->fw_cfg, OBJECT(pcms));
}
}
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index 4807ca615b..a3c08955e8 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -26,6 +26,7 @@
#include "hw/mem/pc-dimm.h"
#include "hw/acpi/bios-linker-loader.h"
#include "qemu/uuid.h"
+#include "hw/acpi/aml-build.h"
#define NVDIMM_DEBUG 0
#define nvdimm_debug(fmt, ...) \
@@ -147,10 +148,12 @@ struct NVDIMMState {
*/
int32_t persistence;
char *persistence_string;
+ struct AcpiGenericAddress dsm_io;
};
typedef struct NVDIMMState NVDIMMState;
void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
+ struct AcpiGenericAddress dsm_io,
FWCfgState *fw_cfg, Object *owner);
void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
BIOSLinker *linker, NVDIMMState *state,
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (4 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-23 15:22 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support Shameer Kolothum
` (6 subsequent siblings)
12 siblings, 1 reply; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
From: Kwangwoo Lee <kwangwoo.lee@sk.com>
This adds support to init nvdimm acpi state and build nvdimm acpi tables.
Please note nvdimm_support is not yet enabled.
Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
v2 -> v3
-Modified commit log.
---
hw/arm/Kconfig | 1 +
hw/arm/virt-acpi-build.c | 6 ++++++
hw/arm/virt.c | 19 +++++++++++++++++++
hw/mem/Kconfig | 2 +-
include/hw/arm/virt.h | 1 +
5 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index bc54fd61f9..b023c0ecd5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -25,6 +25,7 @@ config ARM_VIRT
select DIMM
select ACPI_MEMORY_HOTPLUG
select ACPI_HW_REDUCED
+ select ACPI_NVDIMM
config CHEETAH
bool
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index c13710b727..b7d666b7a4 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -44,6 +44,7 @@
#include "hw/pci/pcie_host.h"
#include "hw/pci/pci.h"
#include "hw/arm/virt.h"
+#include "hw/mem/nvdimm.h"
#include "sysemu/numa.h"
#include "sysemu/reset.h"
#include "kvm_arm.h"
@@ -826,6 +827,11 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
}
}
+ if (ms->nvdimms_state->is_enabled) {
+ nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
+ ms->nvdimms_state, ms->ram_slots);
+ }
+
if (its_class_name() && !vmc->no_its) {
acpi_add_table(table_offsets, tables_blob);
build_iort(tables_blob, tables->linker, vms);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 32d865a488..18178553fa 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -148,6 +148,7 @@ static const MemMapEntry base_memmap[] = {
[VIRT_SMMU] = { 0x09050000, 0x00020000 },
[VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
[VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_EVT_SEL_LEN },
+ [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN},
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
@@ -1784,6 +1785,18 @@ static void machvirt_init(MachineState *machine)
create_platform_bus(vms);
+ if (machine->nvdimms_state->is_enabled) {
+ const struct AcpiGenericAddress arm_virt_nvdimm_acpi_dsmio = {
+ .space_id = AML_AS_SYSTEM_MEMORY,
+ .address = vms->memmap[VIRT_NVDIMM_ACPI].base,
+ .bit_width = NVDIMM_ACPI_IO_LEN << 3
+ };
+
+ nvdimm_init_acpi_state(machine->nvdimms_state, sysmem,
+ arm_virt_nvdimm_acpi_dsmio,
+ vms->fw_cfg, OBJECT(vms));
+ }
+
vms->bootinfo.ram_size = machine->ram_size;
vms->bootinfo.nb_cpus = smp_cpus;
vms->bootinfo.board_id = -1;
@@ -1970,6 +1983,8 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
+ MachineState *ms = MACHINE(hotplug_dev);
+ bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
Error *local_err = NULL;
pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
@@ -1977,6 +1992,10 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
goto out;
}
+ if (is_nvdimm) {
+ nvdimm_plug(ms->nvdimms_state);
+ }
+
hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
dev, &error_abort);
diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
index 2ad052a536..c27844900d 100644
--- a/hw/mem/Kconfig
+++ b/hw/mem/Kconfig
@@ -8,4 +8,4 @@ config MEM_DEVICE
config NVDIMM
bool
default y
- depends on (PC || PSERIES)
+ depends on (PC || PSERIES || ARM_VIRT)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 02f500cb8e..59588d18db 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -79,6 +79,7 @@ enum {
VIRT_SECURE_MEM,
VIRT_PCDIMM_ACPI,
VIRT_ACPI_GED,
+ VIRT_NVDIMM_ACPI,
VIRT_LOWMEMMAP_LAST,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (5 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-24 6:16 ` Shannon Zhao
2020-03-11 17:20 ` [PATCH v3 08/10] tests: Update ACPI tables list for upcoming arm/virt test changes Shameer Kolothum
` (5 subsequent siblings)
12 siblings, 1 reply; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
This adds support for nvdimm hotplug events through GED
and enables nvdimm for the arm/virt. Now Guests with ACPI
can have both cold and hot plug of nvdimms.
Hot removal functionality is not yet supported.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
docs/specs/acpi_hw_reduced_hotplug.rst | 1 +
hw/acpi/generic_event_device.c | 15 ++++++++++++++-
hw/arm/virt.c | 16 +++++++++++-----
include/hw/acpi/generic_event_device.h | 1 +
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/docs/specs/acpi_hw_reduced_hotplug.rst b/docs/specs/acpi_hw_reduced_hotplug.rst
index 911a98255b..e3abe975bf 100644
--- a/docs/specs/acpi_hw_reduced_hotplug.rst
+++ b/docs/specs/acpi_hw_reduced_hotplug.rst
@@ -63,6 +63,7 @@ GED IO interface (4 byte access)
bits:
0: Memory hotplug event
1: System power down event
+ 2: NVDIMM hotplug event
2-31: Reserved
**write_access:**
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 021ed2bf23..5d17f78a1e 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -16,6 +16,7 @@
#include "hw/acpi/generic_event_device.h"
#include "hw/irq.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "qemu/error-report.h"
@@ -23,6 +24,7 @@
static const uint32_t ged_supported_events[] = {
ACPI_GED_MEM_HOTPLUG_EVT,
ACPI_GED_PWR_DOWN_EVT,
+ ACPI_GED_NVDIMM_HOTPLUG_EVT,
};
/*
@@ -110,6 +112,11 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,
aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE),
aml_int(0x80)));
break;
+ case ACPI_GED_NVDIMM_HOTPLUG_EVT:
+ aml_append(if_ctx,
+ aml_notify(aml_name("\\_SB.NVDR"),
+ aml_int(0x80)));
+ break;
default:
/*
* Please make sure all the events in ged_supported_events[]
@@ -175,7 +182,11 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
AcpiGedState *s = ACPI_GED(hotplug_dev);
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
- acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
+ if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
+ nvdimm_acpi_plug_cb(hotplug_dev, dev);
+ } else {
+ acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
+ }
} else {
error_setg(errp, "virt: device plug request for unsupported device"
" type: %s", object_get_typename(OBJECT(dev)));
@@ -192,6 +203,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
sel = ACPI_GED_MEM_HOTPLUG_EVT;
} else if (ev & ACPI_POWER_DOWN_STATUS) {
sel = ACPI_GED_PWR_DOWN_EVT;
+ } else if (ev & ACPI_NVDIMM_HOTPLUG_STATUS) {
+ sel = ACPI_GED_NVDIMM_HOTPLUG_EVT;
} else {
/* Unknown event. Return without generating interrupt. */
warn_report("GED: Unsupported event %d. No irq injected", ev);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 18178553fa..f1546ec2e6 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -548,6 +548,10 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)
event |= ACPI_GED_MEM_HOTPLUG_EVT;
}
+ if (ms->nvdimms_state->is_enabled) {
+ event |= ACPI_GED_NVDIMM_HOTPLUG_EVT;
+ }
+
dev = qdev_create(NULL, TYPE_ACPI_GED);
qdev_prop_set_uint32(dev, "ged-event", event);
@@ -1963,19 +1967,20 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
+ const MachineState *ms = MACHINE(hotplug_dev);
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
- if (is_nvdimm) {
- error_setg(errp, "nvdimm is not yet supported");
- return;
- }
-
if (!vms->acpi_dev) {
error_setg(errp,
"memory hotplug is not enabled: missing acpi-ged device");
return;
}
+ if (is_nvdimm && !ms->nvdimms_state->is_enabled) {
+ error_setg(errp, "nvdimm is not enabled: add 'nvdimm=on' to '-M'");
+ return;
+ }
+
pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp);
}
@@ -2120,6 +2125,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
hc->plug = virt_machine_device_plug_cb;
hc->unplug_request = virt_machine_device_unplug_request_cb;
mc->numa_mem_supported = true;
+ mc->nvdimm_supported = true;
mc->auto_enable_numa_with_memhp = true;
mc->default_ram_id = "mach-virt.ram";
}
diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
index d157eac088..9eb86ca4fd 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -82,6 +82,7 @@
*/
#define ACPI_GED_MEM_HOTPLUG_EVT 0x1
#define ACPI_GED_PWR_DOWN_EVT 0x2
+#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4
typedef struct GEDState {
MemoryRegion io;
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 08/10] tests: Update ACPI tables list for upcoming arm/virt test changes
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (6 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test Shameer Kolothum
` (4 subsequent siblings)
12 siblings, 0 replies; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
This is in preparation to update test_acpi_virt_tcg_memhp()
with pc-dimm and nvdimm. Update the bios-tables-test-allowed-diff.h
with the affected ACPI tables so that "make check" doesn't fail.
Also add empty files for new tables required for new test.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
tests/data/acpi/virt/NFIT.memhp | 0
tests/data/acpi/virt/SSDT.memhp | 0
tests/qtest/bios-tables-test-allowed-diff.h | 3 +++
3 files changed, 3 insertions(+)
create mode 100644 tests/data/acpi/virt/NFIT.memhp
create mode 100644 tests/data/acpi/virt/SSDT.memhp
diff --git a/tests/data/acpi/virt/NFIT.memhp b/tests/data/acpi/virt/NFIT.memhp
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index eb8bae1407..862c49e675 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1,6 @@
/* List of comma-separated changed AML files to ignore */
"tests/data/acpi/pc/SSDT.dimmpxm",
"tests/data/acpi/q35/SSDT.dimmpxm",
+"tests/data/acpi/virt/DSDT.memhp",
+"tests/data/acpi/virt/SSDT.memhp",
+"tests/data/acpi/virt/NFIT.memhp",
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (7 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 08/10] tests: Update ACPI tables list for upcoming arm/virt test changes Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-23 15:28 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 10/10] tests/acpi: add expected tables for bios-tables-test Shameer Kolothum
` (3 subsequent siblings)
12 siblings, 1 reply; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
Since we now have both pc-dimm and nvdimm support, update
test_acpi_virt_tcg_memhp() to include those.
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
v2 -> v3
-Moved addition of empty table files to the previous patch
---
tests/qtest/bios-tables-test.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 0a597bbacf..c9843829b3 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -927,12 +927,17 @@ static void test_acpi_virt_tcg_memhp(void)
};
data.variant = ".memhp";
- test_acpi_one(" -cpu cortex-a57"
+ test_acpi_one(" -machine nvdimm=on"
+ " -cpu cortex-a57"
" -m 256M,slots=3,maxmem=1G"
" -object memory-backend-ram,id=ram0,size=128M"
" -object memory-backend-ram,id=ram1,size=128M"
" -numa node,memdev=ram0 -numa node,memdev=ram1"
- " -numa dist,src=0,dst=1,val=21",
+ " -numa dist,src=0,dst=1,val=21"
+ " -object memory-backend-ram,id=ram2,size=128M"
+ " -object memory-backend-ram,id=nvm0,size=128M"
+ " -device pc-dimm,id=dimm0,memdev=ram2,node=0"
+ " -device nvdimm,id=dimm1,memdev=nvm0,node=1",
&data);
free_test_data(&data);
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v3 10/10] tests/acpi: add expected tables for bios-tables-test
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (8 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test Shameer Kolothum
@ 2020-03-11 17:20 ` Shameer Kolothum
2020-03-11 19:30 ` [PATCH v3 00/10] ARM virt: Add NVDIMM support no-reply
` (2 subsequent siblings)
12 siblings, 0 replies; 32+ messages in thread
From: Shameer Kolothum @ 2020-03-11 17:20 UTC (permalink / raw)
To: qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, david, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
Because of the following changes, the expeacted tables for bios-tables-test
needs to be updated.
1. Changed NVDIM DSM output buffer AML code.
2. Updated arm/virt test_acpi_virt_tcg_memhp() to add pc-dimm/nvdimm
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
tests/data/acpi/pc/SSDT.dimmpxm | Bin 685 -> 734 bytes
tests/data/acpi/q35/SSDT.dimmpxm | Bin 685 -> 734 bytes
tests/data/acpi/virt/DSDT.memhp | Bin 6644 -> 6668 bytes
tests/data/acpi/virt/NFIT.memhp | Bin 0 -> 224 bytes
tests/data/acpi/virt/SSDT.memhp | Bin 0 -> 736 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 5 -----
6 files changed, 5 deletions(-)
diff --git a/tests/data/acpi/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT.dimmpxm
index 8ba0e67cb72daa81a65da4906d37a5e0f4af1fd4..ac55387d57e48adb99eb738a102308688a262fb8 100644
GIT binary patch
delta 125
zcmZ3>dXJSWIM^lR9uortW7tG4X>Nb5nD}6)_~<4#t%(LAOunKU-FO)N7nn^=<l-n`
zNa6@_3Uw1?W@IQ3WMW8PBs(=Jv7oub-^DQ`iJ=1|$G}jW4x-abla{0xR3>sUGbBa}
TgA_0%`UAz6fQZcnjJAvbW$GgJ
delta 76
zcmcb|x|WqIIM^j*EfWI+W57f%X>LFDnD}6)_~<5A^@#=|Og=&z-FO(~3Mv!1m>CkI
dh5cO|Ll_eMokHD;1(_H?bo!F?%?lZA83Fei6ZHT9
diff --git a/tests/data/acpi/q35/SSDT.dimmpxm b/tests/data/acpi/q35/SSDT.dimmpxm
index 2d5b721bcf9c398feb6d005761f898015042e8a4..98e6f0e3f3bb02dd419e36bdd1db9b94c728c406 100644
GIT binary patch
delta 125
zcmZ3>dXJSWIM^lR9uortquWF-X>Nb5nD}6)_~<4#t%(LAOunKU-FO)N7nn^=<l-n`
zNa6@_3Uw1?W@IQ3WMW8PBs(=Jv7oub-^DQ`iJ=1|$G}jW4x-abla{0xR3>sUGbBa}
TgA_0%`UAz6fQZcnjJAvbUiu>C
delta 76
zcmcb|x|WqIIM^j*EfWI+qr*flX>LFDnD}6)_~<5A^@#=|Og=&z-FO(~3Mv!1m>CkI
dh5cO|Ll_eMokHD;1(_H?bo!F?%?lZA83FS;6XgH^
diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/DSDT.memhp
index c527ac4739af3df3c3e042bf91c412033a2b73c3..730e95a46d2cce0af011ffc051d7342beb8f1328 100644
GIT binary patch
delta 66
zcmexj++)J!66_MfBgMeL^l>7WG*kP$jq2<oOpaWW4Mc*Od{`#8h!~455Sv_`z{SGA
W#nKj|7a!~t?-%A0w0WzDJu3iIl@a3r
delta 43
zcmeA%`C`oF66_N4MUsJmsc|BgG*kbajq2<oOr9K*4Mc(&O(wUB7;io=V#^8u9B2%1
diff --git a/tests/data/acpi/virt/NFIT.memhp b/tests/data/acpi/virt/NFIT.memhp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..738c6f74c0ce7dc329cc72cc7b930460ceb9b6a0 100644
GIT binary patch
literal 224
zcmeZs^9*^wz`($G(aGQ0BUr&HBEZ=XD8>jB1F=Cg1XwVzFffCeAhF8JAJRT=DREfi
z%xf&Mz2`Pir~{&ofdfQyG(dQa3<eBL5GGJRD~JV_hYBH45Sv&S0)VR88W<T6HiHy}
Pn+P#5Laay9LzoEwN>da8
literal 0
HcmV?d00001
diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..db61d6733284c90153e0e2c1d6c2ac25c22b1d84 100644
GIT binary patch
literal 736
zcmZWnJ&4m_7=F{1Ynryuv=ve6ky!_O6-025G-+(0NlTIzAqUNmw7s^&hj$JlLfadz
zo*?wXEh3U083lL2&DF`tL2x*5cM%-K?@e*=T;7-Od*1JPpXcE-P1*XE0AOy_+fvgM
z^q#D08a)F*{Xs{<UJ!5W_RV_VUNo;$++h1nRnCi2N3B+OYEW)p(j~E#Ct5=j2lh<w
zsBOprWHMZeo(xfgK^6-3Jc~$Dw-i;d=M@B!O}W(&j7HBCl&&rbifG)Q{Yu;OVvHKC
zhAy;a(VG2EhgX9s5Wd6}qVI*9t2gKT^UuY*!Oz|I&iYQc9Zcy)W;5{P^^1q=PetkY
zi~8|h?Stp6FUJq7Z!;2~Kj&8~7KGfZffHVN77XAd7&#DTf-yvVl8FmLrl^eUp)@i^
zZDHkU@N&YXf};stvz!2U<k0hpkDAE<T^*oaF6D-|PhE~B;IUS{s~{)g6EHlxcIvt0
zaEXRISRw|nKg2$K>_tQJ#O0FU+9ezSw@vROEagI9HnmiQA&>UP6JQO~5}~Z64Mnvw
zY+ErcAR}x9XE39S5im?~i@}LFCFj@yO3@`)kSxrd1o2Hog_0x3J#f(n8@M!%1lT2q
z6Jm8#juK%h-|N%mEE@9&_-9pypc>!7*C8JuYZjQl__`2oA({8ccl~|O@$5xK?^Ua8
nUz82zqC>`BY*Tb6M!7_p|2F_GvB7H_Joz7<WbrFft6!x*uUOFm
literal 0
HcmV?d00001
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 862c49e675..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,6 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/SSDT.dimmpxm",
-"tests/data/acpi/q35/SSDT.dimmpxm",
-"tests/data/acpi/virt/DSDT.memhp",
-"tests/data/acpi/virt/SSDT.memhp",
-"tests/data/acpi/virt/NFIT.memhp",
--
2.17.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback
2020-03-11 17:20 ` [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback Shameer Kolothum
@ 2020-03-11 17:44 ` David Hildenbrand
2020-03-23 13:03 ` Igor Mammedov
1 sibling, 0 replies; 32+ messages in thread
From: David Hildenbrand @ 2020-03-11 17:44 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
On 11.03.20 18:20, Shameer Kolothum wrote:
> From: David Hildenbrand <david@redhat.com>
>
> Summarizing the issue:
> 1. Memory regions contain ram blocks with a different size, if the
> size is not properly aligned. While memory regions can have an
> unaligned size, ram blocks can't. This is true when creating
> resizable memory region with an unaligned size.
> 2. When resizing a ram block/memory region, the size of the memory
> region is set to the aligned size. The callback is called with
> the aligned size. The unaligned piece is lost.
>
> Because of the above, if ACPI blob length modifications happens
> after the initial virt_acpi_build() call, and the changed blob
> length is within the PAGE size boundary, then the revised size
> is not seen by the firmware on Guest reboot.
>
> Hence make sure callback is called if memory region size is changed,
> irrespective of aligned or not.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> [Shameer: added commit log]
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> Please find the discussion here,
> https://patchwork.kernel.org/patch/11339591/
> ---
> exec.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index 0cc500d53a..f8974cd303 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2073,11 +2073,21 @@ static int memory_try_enable_merging(void *addr, size_t len)
> */
> int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
> {
> + const ram_addr_t unaligned_size = newsize;
> +
> assert(block);
>
> newsize = HOST_PAGE_ALIGN(newsize);
>
> if (block->used_length == newsize) {
> + /*
> + * We don't have to resize the ram block (which only knows aligned
> + * sizes), however, we have to notify if the unaligned size changed.
> + */
> + if (block->resized && unaligned_size != memory_region_size(block->mr)) {
> + block->resized(block->idstr, unaligned_size, block->host);
> + memory_region_set_size(block->mr, unaligned_size);
> + }
I guess we should do
if (unaligned_size != memory_region_size(block->mr)) {
memory_region_set_size(block->mr, unaligned_size);
if (block->resized) {
block->resized(block->idstr, unaligned_size, block->host);
}
}
Instead - like in the case below.
Note: This is not completely clean, the RAM block code should'n have to
care about unaligned stuff. Also, the resized() callback for the RAM
block is ugly, it should be a resized callback for the memory region.
But these things imply requires bigger refactorings, so I guess this is
good and simple enough for now.
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
@ 2020-03-11 17:48 ` David Hildenbrand
2020-03-11 20:43 ` Michael S. Tsirkin
` (2 subsequent siblings)
3 siblings, 0 replies; 32+ messages in thread
From: David Hildenbrand @ 2020-03-11 17:48 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, mst, linuxarm, xuwei5,
shannon.zhaosl, lersek
On 11.03.20 18:20, Shameer Kolothum wrote:
> Any sub-page size update to ACPI table MRs will be lost during
> migration, as we use aligned size in ram_load_precopy() ->
> qemu_ram_resize() path. This will result in inconsistency in sizes
> between source and destination. In order to avoid this, save and
> restore them separately during migration.
>
> Suggested-by: David Hildenbrand <david@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> Please find the discussion here,
> https://patchwork.kernel.org/patch/11339591/
> ---
> hw/core/machine.c | 1 +
> hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++++++++++++++++-
> include/hw/nvram/fw_cfg.h | 6 +++
> 3 files changed, 92 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 9e8c06036f..6d960bd47f 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> { "usb-redir", "suppress-remote-wake", "off" },
> { "qxl", "revision", "4" },
> { "qxl-vga", "revision", "4" },
> + { "fw_cfg", "acpi-mr-restore", "false" },
> };
> const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 179b302f01..36d1e32f83 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -39,6 +39,7 @@
> #include "qemu/config-file.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> +#include "hw/acpi/aml-build.h"
>
> #define FW_CFG_FILE_SLOTS_DFLT 0x20
>
> @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> return s->dma_enabled;
> }
>
> +static bool fw_cfg_acpi_mr_restore(void *opaque)
> +{
> + FWCfgState *s = opaque;
> + return s->acpi_mr_restore;
> +}
> +
> +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> +{
> + MemoryRegion *mr;
> + ram_addr_t offset;
> + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> + void *ptr;
> +
> + key &= FW_CFG_ENTRY_MASK;
> + assert(key < fw_cfg_max_entry(s));
> +
> + ptr = s->entries[arch][key].data;
> + mr = memory_region_from_host(ptr, &offset);
> +
> + memory_region_ram_resize(mr, size, &error_abort);
> +}
> +
> +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> +{
> + FWCfgState *s = opaque;
> + int i, index;
> +
> + assert(s->files);
> +
> + index = be32_to_cpu(s->files->count);
> +
> + for (i = 0; i < index; i++) {
> + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->table_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->linker_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->rsdp_mr_size);
> + }
> + }
> +
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_fw_cfg_dma = {
> .name = "fw_cfg/dma",
> .needed = fw_cfg_dma_enabled,
> @@ -619,6 +664,20 @@ static const VMStateDescription vmstate_fw_cfg_dma = {
> },
> };
>
> +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> + .name = "fw_cfg/acpi_mr",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = fw_cfg_acpi_mr_restore,
> + .post_load = fw_cfg_acpi_mr_restore_post_load,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(table_mr_size, FWCfgState),
> + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static const VMStateDescription vmstate_fw_cfg = {
> .name = "fw_cfg",
> .version_id = 2,
> @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> },
> .subsections = (const VMStateDescription*[]) {
> &vmstate_fw_cfg_dma,
> + &vmstate_fw_cfg_acpi_mr,
> NULL,
> }
> };
> @@ -815,6 +875,23 @@ static struct {
> #define FW_CFG_ORDER_OVERRIDE_LAST 200
> };
>
> +/*
> + * Any sub-page size update to these table MRs will be lost during migration,
> + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> + * In order to avoid the inconsistency in sizes save them seperately and
> + * migrate over in vmstate post_load().
> + */
> +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, size_t len)
> +{
> + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> + s->table_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> + s->linker_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> + s->rsdp_mr_size = len;
> + }
> +}
> +
> static int get_fw_cfg_order(FWCfgState *s, const char *name)
> {
> int i;
> @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
> trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
>
> s->files->count = cpu_to_be32(count+1);
> + fw_cfg_acpi_mr_save(s, filename, len);
> }
>
> void fw_cfg_add_file(FWCfgState *s, const char *filename,
> @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
> ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> data, len);
> s->files->f[i].size = cpu_to_be32(len);
> + fw_cfg_acpi_mr_save(s, filename, len);
> return ptr;
> }
> }
> @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data)
> qemu_register_reset(fw_cfg_machine_reset, s);
> }
>
> -
> +static Property fw_cfg_properties[] = {
> + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, true),
> + DEFINE_PROP_END_OF_LIST(),
> +};
>
> static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> {
> @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
>
> dc->reset = fw_cfg_reset;
> dc->vmsd = &vmstate_fw_cfg;
> +
> + device_class_set_props(dc, fw_cfg_properties);
> }
>
> static const TypeInfo fw_cfg_info = {
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index b5291eefad..457fee7425 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -53,6 +53,12 @@ struct FWCfgState {
> dma_addr_t dma_addr;
> AddressSpace *dma_as;
> MemoryRegion dma_iomem;
> +
> + /* restore during migration */
> + bool acpi_mr_restore;
> + size_t table_mr_size;
> + size_t linker_mr_size;
> + size_t rsdp_mr_size;
> };
>
> struct FWCfgIoState {
>
Makes sense to me, the RAM block migration code will migrate full pages.
Only the sub-page size has to be migrated and reset.
Not an expert of the FW code etc, but the general idea sounds correct to me
Acked-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (9 preceding siblings ...)
2020-03-11 17:20 ` [PATCH v3 10/10] tests/acpi: add expected tables for bios-tables-test Shameer Kolothum
@ 2020-03-11 19:30 ` no-reply
2020-03-11 19:32 ` no-reply
2020-03-29 10:45 ` Michael S. Tsirkin
12 siblings, 0 replies; 32+ messages in thread
From: no-reply @ 2020-03-11 19:30 UTC (permalink / raw)
To: shameerali.kolothum.thodi
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, imammedo,
lersek
Patchew URL: https://patchew.org/QEMU/20200311172014.33052-1-shameerali.kolothum.thodi@huawei.com/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
PASS 1 fdc-test /x86_64/fdc/cmos
PASS 2 fdc-test /x86_64/fdc/no_media_on_start
PASS 3 fdc-test /x86_64/fdc/read_without_media
==6418==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 4 fdc-test /x86_64/fdc/media_change
PASS 5 fdc-test /x86_64/fdc/sense_interrupt
PASS 6 fdc-test /x86_64/fdc/relative_seek
---
PASS 33 test-opts-visitor /visitor/opts/dict/unvisited
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-coroutine -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-coroutine"
PASS 11 fdc-test /x86_64/fdc/read_no_dma_18
==6473==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==6473==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7fff10aec000; bottom 0x7f8c9dbbb000; size: 0x007272f31000 (491554803712)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 1 test-coroutine /basic/no-dangling-access
---
PASS 11 test-aio /aio/event/wait
PASS 12 test-aio /aio/event/flush
PASS 13 test-aio /aio/event/wait/no-flush-cb
==6488==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 ide-test /x86_64/ide/identify
==6502==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 2 ide-test /x86_64/ide/flush
==6508==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 ide-test /x86_64/ide/bmdma/simple_rw
==6494==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 14 test-aio /aio/timer/schedule
PASS 15 test-aio /aio/coroutine/queue-chaining
PASS 16 test-aio /aio-gsource/flush
---
PASS 25 test-aio /aio-gsource/event/wait
PASS 26 test-aio /aio-gsource/event/flush
PASS 27 test-aio /aio-gsource/event/wait/no-flush-cb
==6514==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 4 ide-test /x86_64/ide/bmdma/trim
==6520==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 28 test-aio /aio-gsource/timer/schedule
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-aio-multithread -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-aio-multithread"
==6527==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-aio-multithread /aio/multi/lifecycle
PASS 2 test-aio-multithread /aio/multi/schedule
PASS 3 test-aio-multithread /aio/multi/mutex/contended
PASS 4 test-aio-multithread /aio/multi/mutex/handoff
==6550==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 5 test-aio-multithread /aio/multi/mutex/mcs
PASS 6 test-aio-multithread /aio/multi/mutex/pthread
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-throttle -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-throttle"
---
PASS 6 test-throttle /throttle/detach_attach
PASS 7 test-throttle /throttle/config_functions
PASS 8 test-throttle /throttle/accounting
==6567==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 9 test-throttle /throttle/groups
PASS 10 test-throttle /throttle/config/enabled
PASS 11 test-throttle /throttle/config/conflicting
---
PASS 14 test-throttle /throttle/config/max
PASS 15 test-throttle /throttle/config/iops_size
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-thread-pool -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-thread-pool"
==6571==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-thread-pool /thread-pool/submit
PASS 2 test-thread-pool /thread-pool/submit-aio
PASS 3 test-thread-pool /thread-pool/submit-co
PASS 4 test-thread-pool /thread-pool/submit-many
PASS 5 test-thread-pool /thread-pool/cancel
==6638==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 6 test-thread-pool /thread-pool/cancel-async
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-hbitmap -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-hbitmap"
PASS 1 test-hbitmap /hbitmap/granularity
---
PASS 28 test-hbitmap /hbitmap/truncate/shrink/medium
PASS 29 test-hbitmap /hbitmap/truncate/shrink/large
PASS 30 test-hbitmap /hbitmap/meta/zero
==6648==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 31 test-hbitmap /hbitmap/meta/one
PASS 32 test-hbitmap /hbitmap/meta/byte
PASS 33 test-hbitmap /hbitmap/meta/word
PASS 34 test-hbitmap /hbitmap/meta/sector
PASS 35 test-hbitmap /hbitmap/serialize/align
==6654==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 36 test-hbitmap /hbitmap/serialize/basic
PASS 37 test-hbitmap /hbitmap/serialize/part
PASS 38 test-hbitmap /hbitmap/serialize/zeroes
---
PASS 44 test-hbitmap /hbitmap/next_dirty_area/next_dirty_area_4
PASS 45 test-hbitmap /hbitmap/next_dirty_area/next_dirty_area_after_truncate
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-bdrv-drain -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-bdrv-drain"
==6661==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-bdrv-drain /bdrv-drain/nested
PASS 2 test-bdrv-drain /bdrv-drain/multiparent
PASS 3 test-bdrv-drain /bdrv-drain/set_aio_context
---
PASS 41 test-bdrv-drain /bdrv-drain/bdrv_drop_intermediate/poll
PASS 42 test-bdrv-drain /bdrv-drain/replace_child/mid-drain
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-bdrv-graph-mod -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-bdrv-graph-mod"
==6700==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-bdrv-graph-mod /bdrv-graph-mod/update-perm-tree
PASS 2 test-bdrv-graph-mod /bdrv-graph-mod/should-update-child
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-blockjob -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-blockjob"
==6704==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-blockjob /blockjob/ids
PASS 2 test-blockjob /blockjob/cancel/created
PASS 3 test-blockjob /blockjob/cancel/running
---
PASS 7 test-blockjob /blockjob/cancel/pending
PASS 8 test-blockjob /blockjob/cancel/concluded
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-blockjob-txn -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-blockjob-txn"
==6708==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-blockjob-txn /single/success
PASS 2 test-blockjob-txn /single/failure
PASS 3 test-blockjob-txn /single/cancel
---
PASS 6 test-blockjob-txn /pair/cancel
PASS 7 test-blockjob-txn /pair/fail-cancel-race
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-block-backend -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-block-backend"
==6712==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-block-backend /block-backend/drain_aio_error
PASS 2 test-block-backend /block-backend/drain_all_aio_error
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-block-iothread -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-block-iothread"
==6716==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-block-iothread /sync-op/pread
PASS 2 test-block-iothread /sync-op/pwrite
PASS 3 test-block-iothread /sync-op/load_vmstate
---
PASS 15 test-block-iothread /propagate/diamond
PASS 16 test-block-iothread /propagate/mirror
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-image-locking -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-image-locking"
==6736==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-image-locking /image-locking/basic
PASS 2 test-image-locking /image-locking/set-perm-abort
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-x86-cpuid -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-x86-cpuid"
---
PASS 9 test-int128 /int128/int128_gt
PASS 10 test-int128 /int128/int128_rshift
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/rcutorture -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="rcutorture"
==6758==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 rcutorture /rcu/torture/1reader
PASS 2 rcutorture /rcu/torture/10readers
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-rcu-list -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-rcu-list"
PASS 1 test-rcu-list /rcu/qlist/single-threaded
PASS 2 test-rcu-list /rcu/qlist/short-few
==6827==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 test-rcu-list /rcu/qlist/long-many
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-rcu-simpleq -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-rcu-simpleq"
PASS 1 test-rcu-simpleq /rcu/qsimpleq/single-threaded
---
PASS 3 test-rcu-simpleq /rcu/qsimpleq/long-many
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-rcu-tailq -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-rcu-tailq"
PASS 1 test-rcu-tailq /rcu/qtailq/single-threaded
==6872==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 2 test-rcu-tailq /rcu/qtailq/short-few
PASS 3 test-rcu-tailq /rcu/qtailq/long-many
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-rcu-slist -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-rcu-slist"
PASS 1 test-rcu-slist /rcu/qslist/single-threaded
PASS 2 test-rcu-slist /rcu/qslist/short-few
==6917==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 test-rcu-slist /rcu/qslist/long-many
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-qdist -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-qdist"
PASS 1 test-qdist /qdist/none
---
PASS 8 test-qdist /qdist/binning/shrink
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-qht -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-qht"
PASS 5 ide-test /x86_64/ide/bmdma/various_prdts
==6951==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==6951==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffe4a265000; bottom 0x7f98b27fe000; size: 0x006597a67000 (436335964160)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 6 ide-test /x86_64/ide/bmdma/no_busmaster
PASS 7 ide-test /x86_64/ide/flush/nodev
==6962==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 8 ide-test /x86_64/ide/flush/empty_drive
==6967==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 9 ide-test /x86_64/ide/flush/retry_pci
==6973==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 10 ide-test /x86_64/ide/flush/retry_isa
==6979==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 11 ide-test /x86_64/ide/cdrom/pio
==6985==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 12 ide-test /x86_64/ide/cdrom/pio_large
==6991==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 13 ide-test /x86_64/ide/cdrom/dma
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/ahci-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="ahci-test"
==7005==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 ahci-test /x86_64/ahci/sanity
==7011==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 2 ahci-test /x86_64/ahci/pci_spec
==7017==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 ahci-test /x86_64/ahci/pci_enable
==7023==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 4 ahci-test /x86_64/ahci/hba_spec
==7029==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-qht /qht/mode/default
PASS 5 ahci-test /x86_64/ahci/hba_enable
PASS 2 test-qht /qht/mode/resize
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-qht-par -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-qht-par"
==7035==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 6 ahci-test /x86_64/ahci/identify
==7050==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-qht-par /qht/parallel/2threads-0%updates-1s
PASS 7 ahci-test /x86_64/ahci/max
==7062==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 2 test-qht-par /qht/parallel/2threads-20%updates-1s
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-bitops -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-bitops"
PASS 1 test-bitops /bitops/sextract32
---
PASS 1 check-qom-interface /qom/interface/direct_impl
PASS 2 check-qom-interface /qom/interface/intermediate_impl
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/check-qom-proplist -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="check-qom-proplist"
==7074==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 check-qom-proplist /qom/proplist/createlist
PASS 2 check-qom-proplist /qom/proplist/createv
PASS 3 check-qom-proplist /qom/proplist/createcmdline
---
PASS 8 check-qom-proplist /qom/proplist/delchild
PASS 9 check-qom-proplist /qom/resolve/partial
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-qemu-opts -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-qemu-opts"
==7074==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd6d742000; bottom 0x7f77f31fe000; size: 0x00857a544000 (573282992128)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 9 ahci-test /x86_64/ahci/io/pio/lba28/simple/zero
---
PASS 9 test-keyval /keyval/visit/alternate
PASS 10 test-keyval /keyval/visit/any
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-write-threshold -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-write-threshold"
==7106==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-write-threshold /write-threshold/not-set-on-init
PASS 2 test-write-threshold /write-threshold/set-get
PASS 3 test-write-threshold /write-threshold/multi-set-get
PASS 4 test-write-threshold /write-threshold/not-trigger
PASS 5 test-write-threshold /write-threshold/trigger
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-crypto-hash -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-crypto-hash"
==7106==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffc72fc7000; bottom 0x7fe89bffe000; size: 0x0013d6fc9000 (85211254784)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 10 ahci-test /x86_64/ahci/io/pio/lba28/simple/low
---
PASS 27 test-crypto-cipher /crypto/cipher/null-iv
PASS 28 test-crypto-cipher /crypto/cipher/short-plaintext
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-crypto-secret -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-crypto-secret"
==7124==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-crypto-secret /crypto/secret/direct
PASS 2 test-crypto-secret /crypto/secret/indirect/good
PASS 3 test-crypto-secret /crypto/secret/indirect/badfile
---
PASS 15 test-crypto-secret /crypto/secret/crypt/missingiv
PASS 16 test-crypto-secret /crypto/secret/crypt/badiv
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-crypto-tlscredsx509 -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-crypto-tlscredsx509"
==7124==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffceff7d000; bottom 0x7fc2a7ffe000; size: 0x003a47f7f000 (250315534336)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 11 ahci-test /x86_64/ahci/io/pio/lba28/simple/high
==7146==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7146==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd3ea0e000; bottom 0x7f3fd83fe000; size: 0x00bd66610000 (813466451968)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 1 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/perfectserver
PASS 2 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/perfectclient
PASS 12 ahci-test /x86_64/ahci/io/pio/lba28/double/zero
PASS 3 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodca1
==7152==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7152==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffdfeeee000; bottom 0x7fbc617fe000; size: 0x00419d6f0000 (281814171648)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 13 ahci-test /x86_64/ahci/io/pio/lba28/double/low
==7158==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7158==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd6f897000; bottom 0x7f363d1fe000; size: 0x00c732699000 (855544270848)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 4 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodca2
---
PASS 8 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/badca3
PASS 14 ahci-test /x86_64/ahci/io/pio/lba28/double/high
PASS 9 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver1
==7164==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 10 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver2
==7164==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffdc370e000; bottom 0x7f03fa1fe000; size: 0x00f9c9510000 (1072824385536)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 15 ahci-test /x86_64/ahci/io/pio/lba28/long/zero
PASS 11 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver3
PASS 12 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver4
PASS 13 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver5
==7170==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7170==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffde74e3000; bottom 0x7f28997fe000; size: 0x00d54dce5000 (916133400576)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 16 ahci-test /x86_64/ahci/io/pio/lba28/long/low
==7176==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 14 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver6
==7176==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffe647fd000; bottom 0x7f2333bfe000; size: 0x00db30bff000 (941415723008)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 17 ahci-test /x86_64/ahci/io/pio/lba28/long/high
==7182==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 15 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/goodserver7
PASS 16 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/badserver1
PASS 17 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/badserver2
---
PASS 39 test-crypto-tlscredsx509 /qcrypto/tlscredsx509/missingclient
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-crypto-tlssession -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-crypto-tlssession"
PASS 18 ahci-test /x86_64/ahci/io/pio/lba28/short/zero
==7191==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 19 ahci-test /x86_64/ahci/io/pio/lba28/short/low
PASS 1 test-crypto-tlssession /qcrypto/tlssession/psk
==7198==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 20 ahci-test /x86_64/ahci/io/pio/lba28/short/high
PASS 2 test-crypto-tlssession /qcrypto/tlssession/basicca
==7204==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 test-crypto-tlssession /qcrypto/tlssession/differentca
==7204==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffed9a0f000; bottom 0x7f3becffe000; size: 0x00c2eca11000 (837193633792)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 21 ahci-test /x86_64/ahci/io/pio/lba48/simple/zero
==7210==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7210==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7fff8abab000; bottom 0x7fe4405fe000; size: 0x001b4a5ad000 (117211582464)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 4 test-crypto-tlssession /qcrypto/tlssession/altname1
---
PASS 22 ahci-test /x86_64/ahci/io/pio/lba48/simple/low
PASS 8 test-crypto-tlssession /qcrypto/tlssession/altname5
PASS 9 test-crypto-tlssession /qcrypto/tlssession/altname6
==7216==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 10 test-crypto-tlssession /qcrypto/tlssession/wildcard1
PASS 11 test-crypto-tlssession /qcrypto/tlssession/wildcard2
PASS 12 test-crypto-tlssession /qcrypto/tlssession/wildcard3
PASS 13 test-crypto-tlssession /qcrypto/tlssession/wildcard4
PASS 14 test-crypto-tlssession /qcrypto/tlssession/wildcard5
==7216==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd3e9cc000; bottom 0x7f96c57fe000; size: 0x0066791ce000 (440118599680)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 15 test-crypto-tlssession /qcrypto/tlssession/wildcard6
PASS 16 test-crypto-tlssession /qcrypto/tlssession/cachain
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-qga -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-qga"
PASS 23 ahci-test /x86_64/ahci/io/pio/lba48/simple/high
==7230==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-qga /qga/sync-delimited
PASS 2 test-qga /qga/sync
PASS 3 test-qga /qga/ping
---
PASS 10 test-qga /qga/file-ops
PASS 11 test-qga /qga/file-write-read
PASS 12 test-qga /qga/get-time
==7230==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffdc50b4000; bottom 0x7fab703fe000; size: 0x005254cb6000 (353609932800)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 13 test-qga /qga/id
---
PASS 16 test-qga /qga/invalid-args
PASS 17 test-qga /qga/fsfreeze-status
PASS 24 ahci-test /x86_64/ahci/io/pio/lba48/double/zero
==7239==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7239==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffcd0573000; bottom 0x7f9157bfe000; size: 0x006b78975000 (461584683008)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 18 test-qga /qga/blacklist
---
PASS 19 test-qga /qga/config
PASS 20 test-qga /qga/guest-exec
PASS 21 test-qga /qga/guest-exec-invalid
==7247==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7247==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffc6a8ef000; bottom 0x7f1f951fe000; size: 0x00dcd56f1000 (948473630720)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 26 ahci-test /x86_64/ahci/io/pio/lba48/double/high
---
PASS 24 test-qga /qga/guest-get-timezone
PASS 25 test-qga /qga/guest-get-users
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-timed-average -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-timed-average"
==7263==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-timed-average /timed-average/average
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-util-filemonitor -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-util-filemonitor"
==7263==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffff1958000; bottom 0x7fb541324000; size: 0x004ab0634000 (320786874368)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 1 test-util-filemonitor /util/filemonitor
---
PASS 5 test-authz-list /auth/list/explicit/deny
PASS 6 test-authz-list /auth/list/explicit/allow
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-authz-listfile -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-authz-listfile"
==7287==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-authz-listfile /auth/list/complex
PASS 2 test-authz-listfile /auth/list/default/deny
PASS 3 test-authz-listfile /auth/list/default/allow
PASS 4 test-authz-listfile /auth/list/explicit/deny
PASS 5 test-authz-listfile /auth/list/explicit/allow
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-io-task -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-io-task"
==7287==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffdf019f000; bottom 0x7f6b361fe000; size: 0x0092b9fa1000 (630185398272)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 1 test-io-task /crypto/task/complete
---
PASS 4 test-io-channel-file /io/channel/pipe/sync
PASS 5 test-io-channel-file /io/channel/pipe/async
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-io-channel-tls -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-io-channel-tls"
==7347==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7347==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffe1fe6b000; bottom 0x7f55b157c000; size: 0x00a86e8ef000 (723409367040)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 29 ahci-test /x86_64/ahci/io/pio/lba48/long/high
==7365==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-io-channel-tls /qio/channel/tls/basic
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-io-channel-command -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-io-channel-command"
PASS 30 ahci-test /x86_64/ahci/io/pio/lba48/short/zero
---
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-io-channel-buffer -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-io-channel-buffer"
PASS 1 test-io-channel-buffer /io/channel/buf
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-base64 -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-base64"
==7378==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-base64 /util/base64/good
PASS 2 test-base64 /util/base64/embedded-nul
PASS 3 test-base64 /util/base64/not-nul-terminated
---
PASS 8 test-crypto-ivgen /crypto/ivgen/essiv/1f2e3d4c
PASS 9 test-crypto-ivgen /crypto/ivgen/essiv/1f2e3d4c5b6a7988
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-crypto-afsplit -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-crypto-afsplit"
==7396==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-crypto-afsplit /crypto/afsplit/sha256/5
PASS 2 test-crypto-afsplit /crypto/afsplit/sha256/5000
PASS 3 test-crypto-afsplit /crypto/afsplit/sha256/big
---
PASS 3 test-logging /logging/logfile_write_path
PASS 4 test-logging /logging/logfile_lock_path
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-replication -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-replication"
==7425==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7417==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-replication /replication/primary/read
PASS 2 test-replication /replication/primary/write
PASS 33 ahci-test /x86_64/ahci/io/dma/lba28/fragmented
==7433==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 test-replication /replication/primary/start
PASS 4 test-replication /replication/primary/stop
PASS 5 test-replication /replication/primary/do_checkpoint
PASS 6 test-replication /replication/primary/get_error_all
PASS 34 ahci-test /x86_64/ahci/io/dma/lba28/retry
==7439==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 7 test-replication /replication/secondary/read
PASS 35 ahci-test /x86_64/ahci/io/dma/lba28/simple/zero
==7445==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 36 ahci-test /x86_64/ahci/io/dma/lba28/simple/low
PASS 8 test-replication /replication/secondary/write
==7451==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 37 ahci-test /x86_64/ahci/io/dma/lba28/simple/high
==7457==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 38 ahci-test /x86_64/ahci/io/dma/lba28/double/zero
==7464==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7425==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd5b956000; bottom 0x7f499b069000; size: 0x00b3c08ed000 (772029730816)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 39 ahci-test /x86_64/ahci/io/dma/lba28/double/low
PASS 9 test-replication /replication/secondary/start
==7488==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 40 ahci-test /x86_64/ahci/io/dma/lba28/double/high
==7494==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7494==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffe80b58000; bottom 0x7f26f61fd000; size: 0x00d78a95b000 (925743034368)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 41 ahci-test /x86_64/ahci/io/dma/lba28/long/zero
==7501==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7501==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd15770000; bottom 0x7f32febfd000; size: 0x00ca16b73000 (867964497920)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 42 ahci-test /x86_64/ahci/io/dma/lba28/long/low
PASS 10 test-replication /replication/secondary/stop
==7508==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7508==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffcf3e8c000; bottom 0x7f654537b000; size: 0x0097aeb11000 (651470901248)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 43 ahci-test /x86_64/ahci/io/dma/lba28/long/high
==7515==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 44 ahci-test /x86_64/ahci/io/dma/lba28/short/zero
==7521==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 11 test-replication /replication/secondary/continuous_replication
PASS 45 ahci-test /x86_64/ahci/io/dma/lba28/short/low
==7527==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 46 ahci-test /x86_64/ahci/io/dma/lba28/short/high
==7533==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 12 test-replication /replication/secondary/do_checkpoint
PASS 47 ahci-test /x86_64/ahci/io/dma/lba48/simple/zero
==7539==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 13 test-replication /replication/secondary/get_error_all
PASS 48 ahci-test /x86_64/ahci/io/dma/lba48/simple/low
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-bufferiszero -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-bufferiszero"
==7545==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 49 ahci-test /x86_64/ahci/io/dma/lba48/simple/high
==7554==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 50 ahci-test /x86_64/ahci/io/dma/lba48/double/zero
==7560==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 51 ahci-test /x86_64/ahci/io/dma/lba48/double/low
==7566==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 52 ahci-test /x86_64/ahci/io/dma/lba48/double/high
==7572==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7572==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffecfc3d000; bottom 0x7fbfbfb23000; size: 0x003f1011a000 (270852530176)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 53 ahci-test /x86_64/ahci/io/dma/lba48/long/zero
==7579==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7579==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7fffef84e000; bottom 0x7fef2017b000; size: 0x0010cf6d3000 (72199516160)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 54 ahci-test /x86_64/ahci/io/dma/lba48/long/low
==7586==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7586==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffd92cf8000; bottom 0x7efbeef7b000; size: 0x0101a3d7d000 (1106555424768)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 55 ahci-test /x86_64/ahci/io/dma/lba48/long/high
==7593==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 56 ahci-test /x86_64/ahci/io/dma/lba48/short/zero
==7599==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 57 ahci-test /x86_64/ahci/io/dma/lba48/short/low
==7605==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 58 ahci-test /x86_64/ahci/io/dma/lba48/short/high
==7611==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 59 ahci-test /x86_64/ahci/io/ncq/simple
==7617==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 60 ahci-test /x86_64/ahci/io/ncq/retry
==7623==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 61 ahci-test /x86_64/ahci/flush/simple
==7629==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 62 ahci-test /x86_64/ahci/flush/retry
==7635==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7641==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 63 ahci-test /x86_64/ahci/flush/migrate
==7649==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7655==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 64 ahci-test /x86_64/ahci/migrate/sanity
==7663==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7669==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 65 ahci-test /x86_64/ahci/migrate/dma/simple
==7677==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7683==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 66 ahci-test /x86_64/ahci/migrate/dma/halted
==7691==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7697==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 67 ahci-test /x86_64/ahci/migrate/ncq/simple
==7705==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 test-bufferiszero /cutils/bufferiszero
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/test-uuid -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="test-uuid"
PASS 1 test-uuid /uuid/is_null
---
PASS 4 test-uuid /uuid/unparse
PASS 5 test-uuid /uuid/unparse_strdup
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} tests/ptimer-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="ptimer-test"
==7711==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 1 ptimer-test /ptimer/set_count policy=default
PASS 2 ptimer-test /ptimer/set_limit policy=default
PASS 3 ptimer-test /ptimer/oneshot policy=default
---
PASS 22 test-qgraph /qgraph/test_test_in_path
PASS 23 test-qgraph /qgraph/test_double_edge
PASS 68 ahci-test /x86_64/ahci/migrate/ncq/halted
==7732==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 69 ahci-test /x86_64/ahci/cdrom/eject
==7737==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 70 ahci-test /x86_64/ahci/cdrom/dma/single
==7743==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 71 ahci-test /x86_64/ahci/cdrom/dma/multi
==7749==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 72 ahci-test /x86_64/ahci/cdrom/pio/single
==7755==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7755==WARNING: ASan is ignoring requested __asan_handle_no_return: stack top: 0x7ffed605d000; bottom 0x7fc58abba000; size: 0x00394b4a3000 (246076289024)
False positive error reports may follow
For details see https://github.com/google/sanitizers/issues/189
PASS 73 ahci-test /x86_64/ahci/cdrom/pio/multi
==7761==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 74 ahci-test /x86_64/ahci/cdrom/pio/bcl
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/hd-geo-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="hd-geo-test"
PASS 1 hd-geo-test /x86_64/hd-geo/ide/none
==7775==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 2 hd-geo-test /x86_64/hd-geo/ide/drive/cd_0
==7781==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 hd-geo-test /x86_64/hd-geo/ide/drive/mbr/blank
==7787==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 4 hd-geo-test /x86_64/hd-geo/ide/drive/mbr/lba
==7793==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 5 hd-geo-test /x86_64/hd-geo/ide/drive/mbr/chs
==7799==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 6 hd-geo-test /x86_64/hd-geo/ide/device/mbr/blank
==7805==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 7 hd-geo-test /x86_64/hd-geo/ide/device/mbr/lba
==7811==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 8 hd-geo-test /x86_64/hd-geo/ide/device/mbr/chs
==7817==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 9 hd-geo-test /x86_64/hd-geo/ide/device/user/chs
==7822==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 10 hd-geo-test /x86_64/hd-geo/ide/device/user/chst
==7828==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7832==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7836==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7840==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7844==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7848==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7852==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7856==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7859==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 11 hd-geo-test /x86_64/hd-geo/override/ide
==7866==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7870==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7874==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7878==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7882==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7886==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7890==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7894==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7897==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 12 hd-geo-test /x86_64/hd-geo/override/scsi
==7904==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7908==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7912==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7916==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7920==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7924==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7928==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7932==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7935==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 13 hd-geo-test /x86_64/hd-geo/override/scsi_2_controllers
==7942==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7946==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7950==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7954==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7957==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 14 hd-geo-test /x86_64/hd-geo/override/virtio_blk
==7964==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7968==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7971==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 15 hd-geo-test /x86_64/hd-geo/override/zero_chs
==7978==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7982==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7986==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7990==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==7993==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 16 hd-geo-test /x86_64/hd-geo/override/scsi_hot_unplug
==8000==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==8004==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==8008==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==8012==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
==8015==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 17 hd-geo-test /x86_64/hd-geo/override/virtio_hot_unplug
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/boot-order-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="boot-order-test"
PASS 1 boot-order-test /x86_64/boot-order/pc
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8084==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP'
Using expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8090==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP'
Using expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8096==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.bridge'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8102==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.ipmikcs'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8108==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.cphp'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8115==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.memhp'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8121==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.numamem'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8127==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.dimmpxm'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8136==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/pc/FACP.acpihmat'
Looking for expected file 'tests/data/acpi/pc/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8143==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.bridge'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8149==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.mmio64'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8155==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.ipmibt'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8161==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.cphp'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8168==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.memhp'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8174==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.numamem'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8180==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.dimmpxm'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
==8189==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
Looking for expected file 'tests/data/acpi/q35/FACP.acpihmat'
Looking for expected file 'tests/data/acpi/q35/FACP'
---
PASS 1 i440fx-test /x86_64/i440fx/defaults
PASS 2 i440fx-test /x86_64/i440fx/pam
PASS 3 i440fx-test /x86_64/i440fx/firmware/bios
==8281==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 4 i440fx-test /x86_64/i440fx/firmware/pflash
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/fw_cfg-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="fw_cfg-test"
PASS 1 fw_cfg-test /x86_64/fw_cfg/signature
---
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/drive_del-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="drive_del-test"
PASS 1 drive_del-test /x86_64/drive_del/without-dev
PASS 2 drive_del-test /x86_64/drive_del/after_failed_device_add
==8374==WARNING: ASan doesn't fully support makecontext/swapcontext functions and may produce false positives in some cases!
PASS 3 drive_del-test /x86_64/blockdev/drive_del_device_del
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/wdt_ib700-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="wdt_ib700-test"
PASS 1 wdt_ib700-test /x86_64/wdt_ib700/pause
---
dbus-daemon[8544]: Could not get password database information for UID of current process: User "???" unknown or no memory to allocate password entry
**
ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18)
ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18)
cleaning up pid 8544
make: *** [/tmp/qemu-test/src/tests/Makefile.include:632: check-qtest-x86_64] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=01530e53d67346b1816a7f7c8df2b34b', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=x86_64-softmmu', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-qu9hgsdg/src/docker-src.2020-03-11-15.02.39.16429:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-debug']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=01530e53d67346b1816a7f7c8df2b34b
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-qu9hgsdg/src'
make: *** [docker-run-test-debug@fedora] Error 2
real 28m9.966s
user 0m8.980s
The full log is available at
http://patchew.org/logs/20200311172014.33052-1-shameerali.kolothum.thodi@huawei.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (10 preceding siblings ...)
2020-03-11 19:30 ` [PATCH v3 00/10] ARM virt: Add NVDIMM support no-reply
@ 2020-03-11 19:32 ` no-reply
2020-03-29 10:45 ` Michael S. Tsirkin
12 siblings, 0 replies; 32+ messages in thread
From: no-reply @ 2020-03-11 19:32 UTC (permalink / raw)
To: shameerali.kolothum.thodi
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, imammedo,
lersek
Patchew URL: https://patchew.org/QEMU/20200311172014.33052-1-shameerali.kolothum.thodi@huawei.com/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
CC hw/timer/arm_timer.o
In file included from /tmp/qemu-test/src/include/qemu/osdep.h:51,
from /tmp/qemu-test/src/hw/nvram/fw_cfg.c:25:
/tmp/qemu-test/src/include/qemu/compiler.h:81:35: error: invalid operands to binary - (have 'uint64_t *' {aka 'long long unsigned int *'} and 'size_t *' {aka 'unsigned int *'})
#define type_check(t1,t2) ((t1*)0 - (t2*)0)
^
/tmp/qemu-test/src/include/migration/vmstate.h:254:6: note: in expansion of macro 'type_check'
---
/tmp/qemu-test/src/hw/nvram/fw_cfg.c:674:9: note: in expansion of macro 'VMSTATE_UINT64'
VMSTATE_UINT64(table_mr_size, FWCfgState),
^~~~~~~~~~~~~~
/tmp/qemu-test/src/include/qemu/compiler.h:81:35: error: invalid operands to binary - (have 'uint64_t *' {aka 'long long unsigned int *'} and 'size_t *' {aka 'unsigned int *'})
#define type_check(t1,t2) ((t1*)0 - (t2*)0)
^
/tmp/qemu-test/src/include/migration/vmstate.h:254:6: note: in expansion of macro 'type_check'
---
/tmp/qemu-test/src/hw/nvram/fw_cfg.c:675:9: note: in expansion of macro 'VMSTATE_UINT64'
VMSTATE_UINT64(linker_mr_size, FWCfgState),
^~~~~~~~~~~~~~
/tmp/qemu-test/src/include/qemu/compiler.h:81:35: error: invalid operands to binary - (have 'uint64_t *' {aka 'long long unsigned int *'} and 'size_t *' {aka 'unsigned int *'})
#define type_check(t1,t2) ((t1*)0 - (t2*)0)
^
/tmp/qemu-test/src/include/migration/vmstate.h:254:6: note: in expansion of macro 'type_check'
---
/tmp/qemu-test/src/hw/nvram/fw_cfg.c:676:9: note: in expansion of macro 'VMSTATE_UINT64'
VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
^~~~~~~~~~~~~~
make: *** [/tmp/qemu-test/src/rules.mak:69: hw/nvram/fw_cfg.o] Error 1
make: *** Waiting for unfinished jobs....
CC hw/timer/arm_mptimer.o
Traceback (most recent call last):
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=25b77fea135a4b9993893172efb88f55', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-ijsb_x7a/src/docker-src.2020-03-11-15.27.35.7372:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=25b77fea135a4b9993893172efb88f55
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-ijsb_x7a/src'
make: *** [docker-run-test-mingw@fedora] Error 2
real 5m14.744s
user 0m8.333s
The full log is available at
http://patchew.org/logs/20200311172014.33052-1-shameerali.kolothum.thodi@huawei.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
2020-03-11 17:48 ` David Hildenbrand
@ 2020-03-11 20:43 ` Michael S. Tsirkin
2020-03-11 21:09 ` Michael S. Tsirkin
2020-03-23 12:34 ` Igor Mammedov
3 siblings, 0 replies; 32+ messages in thread
From: Michael S. Tsirkin @ 2020-03-11 20:43 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, imammedo,
lersek
On Wed, Mar 11, 2020 at 05:20:06PM +0000, Shameer Kolothum wrote:
> Any sub-page size update to ACPI table MRs will be lost during
> migration, as we use aligned size in ram_load_precopy() ->
> qemu_ram_resize() path. This will result in inconsistency in sizes
> between source and destination. In order to avoid this, save and
> restore them separately during migration.
>
> Suggested-by: David Hildenbrand <david@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Is there a reason this is part of nvdimm patchset?
> ---
> Please find the discussion here,
> https://patchwork.kernel.org/patch/11339591/
> ---
> hw/core/machine.c | 1 +
> hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++++++++++++++++-
> include/hw/nvram/fw_cfg.h | 6 +++
> 3 files changed, 92 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 9e8c06036f..6d960bd47f 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> { "usb-redir", "suppress-remote-wake", "off" },
> { "qxl", "revision", "4" },
> { "qxl-vga", "revision", "4" },
> + { "fw_cfg", "acpi-mr-restore", "false" },
> };
> const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 179b302f01..36d1e32f83 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -39,6 +39,7 @@
> #include "qemu/config-file.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> +#include "hw/acpi/aml-build.h"
>
> #define FW_CFG_FILE_SLOTS_DFLT 0x20
>
> @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> return s->dma_enabled;
> }
>
> +static bool fw_cfg_acpi_mr_restore(void *opaque)
> +{
> + FWCfgState *s = opaque;
> + return s->acpi_mr_restore;
> +}
> +
> +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> +{
> + MemoryRegion *mr;
> + ram_addr_t offset;
> + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> + void *ptr;
> +
> + key &= FW_CFG_ENTRY_MASK;
> + assert(key < fw_cfg_max_entry(s));
> +
> + ptr = s->entries[arch][key].data;
> + mr = memory_region_from_host(ptr, &offset);
> +
> + memory_region_ram_resize(mr, size, &error_abort);
> +}
> +
> +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> +{
> + FWCfgState *s = opaque;
> + int i, index;
> +
> + assert(s->files);
> +
> + index = be32_to_cpu(s->files->count);
> +
> + for (i = 0; i < index; i++) {
> + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->table_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->linker_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->rsdp_mr_size);
> + }
> + }
> +
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_fw_cfg_dma = {
> .name = "fw_cfg/dma",
> .needed = fw_cfg_dma_enabled,
> @@ -619,6 +664,20 @@ static const VMStateDescription vmstate_fw_cfg_dma = {
> },
> };
>
> +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> + .name = "fw_cfg/acpi_mr",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = fw_cfg_acpi_mr_restore,
> + .post_load = fw_cfg_acpi_mr_restore_post_load,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(table_mr_size, FWCfgState),
> + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static const VMStateDescription vmstate_fw_cfg = {
> .name = "fw_cfg",
> .version_id = 2,
> @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> },
> .subsections = (const VMStateDescription*[]) {
> &vmstate_fw_cfg_dma,
> + &vmstate_fw_cfg_acpi_mr,
> NULL,
> }
> };
> @@ -815,6 +875,23 @@ static struct {
> #define FW_CFG_ORDER_OVERRIDE_LAST 200
> };
>
> +/*
> + * Any sub-page size update to these table MRs will be lost during migration,
> + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> + * In order to avoid the inconsistency in sizes save them seperately and
> + * migrate over in vmstate post_load().
> + */
> +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, size_t len)
> +{
> + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> + s->table_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> + s->linker_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> + s->rsdp_mr_size = len;
> + }
> +}
> +
> static int get_fw_cfg_order(FWCfgState *s, const char *name)
> {
> int i;
> @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
> trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
>
> s->files->count = cpu_to_be32(count+1);
> + fw_cfg_acpi_mr_save(s, filename, len);
> }
>
> void fw_cfg_add_file(FWCfgState *s, const char *filename,
> @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
> ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> data, len);
> s->files->f[i].size = cpu_to_be32(len);
> + fw_cfg_acpi_mr_save(s, filename, len);
> return ptr;
> }
> }
> @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data)
> qemu_register_reset(fw_cfg_machine_reset, s);
> }
>
> -
> +static Property fw_cfg_properties[] = {
> + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, true),
> + DEFINE_PROP_END_OF_LIST(),
> +};
>
> static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> {
> @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
>
> dc->reset = fw_cfg_reset;
> dc->vmsd = &vmstate_fw_cfg;
> +
> + device_class_set_props(dc, fw_cfg_properties);
> }
>
> static const TypeInfo fw_cfg_info = {
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index b5291eefad..457fee7425 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -53,6 +53,12 @@ struct FWCfgState {
> dma_addr_t dma_addr;
> AddressSpace *dma_as;
> MemoryRegion dma_iomem;
> +
> + /* restore during migration */
> + bool acpi_mr_restore;
> + size_t table_mr_size;
> + size_t linker_mr_size;
> + size_t rsdp_mr_size;
> };
>
> struct FWCfgIoState {
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
2020-03-11 17:48 ` David Hildenbrand
2020-03-11 20:43 ` Michael S. Tsirkin
@ 2020-03-11 21:09 ` Michael S. Tsirkin
2020-03-12 9:27 ` Shameerali Kolothum Thodi
2020-03-23 12:34 ` Igor Mammedov
3 siblings, 1 reply; 32+ messages in thread
From: Michael S. Tsirkin @ 2020-03-11 21:09 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, imammedo,
lersek
On Wed, Mar 11, 2020 at 05:20:06PM +0000, Shameer Kolothum wrote:
> Any sub-page size update to ACPI table MRs will be lost during
> migration, as we use aligned size in ram_load_precopy() ->
> qemu_ram_resize() path. This will result in inconsistency in sizes
> between source and destination. In order to avoid this, save and
> restore them separately during migration.
Hmm but for old machine types we still have a problem right?
How about aligning size on source for them?
Then there won't be an inconsistency across migration.
Wastes some boot time/memory but maybe that's better
than a chance of not booting ...
> Suggested-by: David Hildenbrand <david@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> Please find the discussion here,
> https://patchwork.kernel.org/patch/11339591/
> ---
> hw/core/machine.c | 1 +
> hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++++++++++++++++-
> include/hw/nvram/fw_cfg.h | 6 +++
> 3 files changed, 92 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 9e8c06036f..6d960bd47f 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> { "usb-redir", "suppress-remote-wake", "off" },
> { "qxl", "revision", "4" },
> { "qxl-vga", "revision", "4" },
> + { "fw_cfg", "acpi-mr-restore", "false" },
> };
> const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 179b302f01..36d1e32f83 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -39,6 +39,7 @@
> #include "qemu/config-file.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> +#include "hw/acpi/aml-build.h"
>
> #define FW_CFG_FILE_SLOTS_DFLT 0x20
>
> @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> return s->dma_enabled;
> }
>
> +static bool fw_cfg_acpi_mr_restore(void *opaque)
> +{
> + FWCfgState *s = opaque;
> + return s->acpi_mr_restore;
> +}
> +
> +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> +{
> + MemoryRegion *mr;
> + ram_addr_t offset;
> + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> + void *ptr;
> +
> + key &= FW_CFG_ENTRY_MASK;
> + assert(key < fw_cfg_max_entry(s));
> +
> + ptr = s->entries[arch][key].data;
> + mr = memory_region_from_host(ptr, &offset);
> +
> + memory_region_ram_resize(mr, size, &error_abort);
> +}
> +
> +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> +{
> + FWCfgState *s = opaque;
> + int i, index;
> +
> + assert(s->files);
> +
> + index = be32_to_cpu(s->files->count);
> +
> + for (i = 0; i < index; i++) {
> + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->table_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->linker_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->rsdp_mr_size);
> + }
> + }
> +
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_fw_cfg_dma = {
> .name = "fw_cfg/dma",
> .needed = fw_cfg_dma_enabled,
> @@ -619,6 +664,20 @@ static const VMStateDescription vmstate_fw_cfg_dma = {
> },
> };
>
> +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> + .name = "fw_cfg/acpi_mr",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = fw_cfg_acpi_mr_restore,
> + .post_load = fw_cfg_acpi_mr_restore_post_load,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(table_mr_size, FWCfgState),
> + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static const VMStateDescription vmstate_fw_cfg = {
> .name = "fw_cfg",
> .version_id = 2,
> @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> },
> .subsections = (const VMStateDescription*[]) {
> &vmstate_fw_cfg_dma,
> + &vmstate_fw_cfg_acpi_mr,
> NULL,
> }
> };
> @@ -815,6 +875,23 @@ static struct {
> #define FW_CFG_ORDER_OVERRIDE_LAST 200
> };
>
> +/*
> + * Any sub-page size update to these table MRs will be lost during migration,
> + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> + * In order to avoid the inconsistency in sizes save them seperately and
> + * migrate over in vmstate post_load().
> + */
> +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, size_t len)
> +{
> + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> + s->table_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> + s->linker_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> + s->rsdp_mr_size = len;
> + }
> +}
> +
> static int get_fw_cfg_order(FWCfgState *s, const char *name)
> {
> int i;
> @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
> trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
>
> s->files->count = cpu_to_be32(count+1);
> + fw_cfg_acpi_mr_save(s, filename, len);
> }
>
> void fw_cfg_add_file(FWCfgState *s, const char *filename,
> @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
> ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> data, len);
> s->files->f[i].size = cpu_to_be32(len);
> + fw_cfg_acpi_mr_save(s, filename, len);
> return ptr;
> }
> }
> @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data)
> qemu_register_reset(fw_cfg_machine_reset, s);
> }
>
> -
> +static Property fw_cfg_properties[] = {
> + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, true),
> + DEFINE_PROP_END_OF_LIST(),
> +};
>
> static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> {
> @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
>
> dc->reset = fw_cfg_reset;
> dc->vmsd = &vmstate_fw_cfg;
> +
> + device_class_set_props(dc, fw_cfg_properties);
> }
>
> static const TypeInfo fw_cfg_info = {
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index b5291eefad..457fee7425 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -53,6 +53,12 @@ struct FWCfgState {
> dma_addr_t dma_addr;
> AddressSpace *dma_as;
> MemoryRegion dma_iomem;
> +
> + /* restore during migration */
> + bool acpi_mr_restore;
> + size_t table_mr_size;
> + size_t linker_mr_size;
> + size_t rsdp_mr_size;
> };
>
> struct FWCfgIoState {
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* RE: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-11 21:09 ` Michael S. Tsirkin
@ 2020-03-12 9:27 ` Shameerali Kolothum Thodi
2020-03-19 17:51 ` Michael S. Tsirkin
0 siblings, 1 reply; 32+ messages in thread
From: Shameerali Kolothum Thodi @ 2020-03-12 9:27 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, Linuxarm, eric.auger, qemu-arm, xuwei (O),
imammedo, lersek
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 11 March 2020 21:10
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
> Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
> eric.auger@redhat.com; imammedo@redhat.com; peter.maydell@linaro.org;
> shannon.zhaosl@gmail.com; xiaoguangrong.eric@gmail.com;
> david@redhat.com; xuwei (O) <xuwei5@huawei.com>; lersek@redhat.com;
> Linuxarm <linuxarm@huawei.com>
> Subject: Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
>
> On Wed, Mar 11, 2020 at 05:20:06PM +0000, Shameer Kolothum wrote:
> > Any sub-page size update to ACPI table MRs will be lost during
> > migration, as we use aligned size in ram_load_precopy() ->
> > qemu_ram_resize() path. This will result in inconsistency in sizes
> > between source and destination. In order to avoid this, save and
> > restore them separately during migration.
> Is there a reason this is part of nvdimm patchset?
Not really. But this problem is more visible if we have nvdimm hotplug
support added to arm/virt. On x86, both acpi table and linker MRs are already
aligned and I don't know a use case where you can change RSDP MR size(See below).
>
> Hmm but for old machine types we still have a problem right?
> How about aligning size on source for them?
> Then there won't be an inconsistency across migration.
> Wastes some boot time/memory but maybe that's better
> than a chance of not booting ...
Right. That was considered. On x86, except RSDP MR, both the LINKER and ACPI
TABLE MRs are already aligned/padded. And we cannot make RSDP mr aligned
as it will break the seabios based boot. So a generic solution based on alignment
is not possible unless we guarantee that RSDP is not going to be modified.
What we could do for Arm/virt is just follow the x86 way and add padding for
table and linker MRs. But this was discussed before and IIRC, was not well
received.
Thanks,
Shameer
> > Suggested-by: David Hildenbrand <david@redhat.com>
> > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> > ---
> > Please find the discussion here,
> > https://patchwork.kernel.org/patch/11339591/
> > ---
> > hw/core/machine.c | 1 +
> > hw/nvram/fw_cfg.c | 86
> ++++++++++++++++++++++++++++++++++++++-
> > include/hw/nvram/fw_cfg.h | 6 +++
> > 3 files changed, 92 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/core/machine.c b/hw/core/machine.c
> > index 9e8c06036f..6d960bd47f 100644
> > --- a/hw/core/machine.c
> > +++ b/hw/core/machine.c
> > @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> > { "usb-redir", "suppress-remote-wake", "off" },
> > { "qxl", "revision", "4" },
> > { "qxl-vga", "revision", "4" },
> > + { "fw_cfg", "acpi-mr-restore", "false" },
> > };
> > const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
> >
> > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> > index 179b302f01..36d1e32f83 100644
> > --- a/hw/nvram/fw_cfg.c
> > +++ b/hw/nvram/fw_cfg.c
> > @@ -39,6 +39,7 @@
> > #include "qemu/config-file.h"
> > #include "qemu/cutils.h"
> > #include "qapi/error.h"
> > +#include "hw/acpi/aml-build.h"
> >
> > #define FW_CFG_FILE_SLOTS_DFLT 0x20
> >
> > @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> > return s->dma_enabled;
> > }
> >
> > +static bool fw_cfg_acpi_mr_restore(void *opaque)
> > +{
> > + FWCfgState *s = opaque;
> > + return s->acpi_mr_restore;
> > +}
> > +
> > +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> > +{
> > + MemoryRegion *mr;
> > + ram_addr_t offset;
> > + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> > + void *ptr;
> > +
> > + key &= FW_CFG_ENTRY_MASK;
> > + assert(key < fw_cfg_max_entry(s));
> > +
> > + ptr = s->entries[arch][key].data;
> > + mr = memory_region_from_host(ptr, &offset);
> > +
> > + memory_region_ram_resize(mr, size, &error_abort);
> > +}
> > +
> > +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> > +{
> > + FWCfgState *s = opaque;
> > + int i, index;
> > +
> > + assert(s->files);
> > +
> > + index = be32_to_cpu(s->files->count);
> > +
> > + for (i = 0; i < index; i++) {
> > + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> s->table_mr_size);
> > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> s->linker_mr_size);
> > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> s->rsdp_mr_size);
> > + }
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static const VMStateDescription vmstate_fw_cfg_dma = {
> > .name = "fw_cfg/dma",
> > .needed = fw_cfg_dma_enabled,
> > @@ -619,6 +664,20 @@ static const VMStateDescription
> vmstate_fw_cfg_dma = {
> > },
> > };
> >
> > +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> > + .name = "fw_cfg/acpi_mr",
> > + .version_id = 1,
> > + .minimum_version_id = 1,
> > + .needed = fw_cfg_acpi_mr_restore,
> > + .post_load = fw_cfg_acpi_mr_restore_post_load,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_UINT64(table_mr_size, FWCfgState),
> > + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> > + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> > + VMSTATE_END_OF_LIST()
> > + },
> > +};
> > +
> > static const VMStateDescription vmstate_fw_cfg = {
> > .name = "fw_cfg",
> > .version_id = 2,
> > @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> > },
> > .subsections = (const VMStateDescription*[]) {
> > &vmstate_fw_cfg_dma,
> > + &vmstate_fw_cfg_acpi_mr,
> > NULL,
> > }
> > };
> > @@ -815,6 +875,23 @@ static struct {
> > #define FW_CFG_ORDER_OVERRIDE_LAST 200
> > };
> >
> > +/*
> > + * Any sub-page size update to these table MRs will be lost during migration,
> > + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> > + * In order to avoid the inconsistency in sizes save them seperately and
> > + * migrate over in vmstate post_load().
> > + */
> > +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename,
> size_t len)
> > +{
> > + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> > + s->table_mr_size = len;
> > + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> > + s->linker_mr_size = len;
> > + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> > + s->rsdp_mr_size = len;
> > + }
> > +}
> > +
> > static int get_fw_cfg_order(FWCfgState *s, const char *name)
> > {
> > int i;
> > @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s,
> const char *filename,
> > trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
> >
> > s->files->count = cpu_to_be32(count+1);
> > + fw_cfg_acpi_mr_save(s, filename, len);
> > }
> >
> > void fw_cfg_add_file(FWCfgState *s, const char *filename,
> > @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char
> *filename,
> > ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> > data, len);
> > s->files->f[i].size = cpu_to_be32(len);
> > + fw_cfg_acpi_mr_save(s, filename, len);
> > return ptr;
> > }
> > }
> > @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier
> *n, void *data)
> > qemu_register_reset(fw_cfg_machine_reset, s);
> > }
> >
> > -
> > +static Property fw_cfg_properties[] = {
> > + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore,
> true),
> > + DEFINE_PROP_END_OF_LIST(),
> > +};
> >
> > static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> > {
> > @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass,
> void *data)
> >
> > dc->reset = fw_cfg_reset;
> > dc->vmsd = &vmstate_fw_cfg;
> > +
> > + device_class_set_props(dc, fw_cfg_properties);
> > }
> >
> > static const TypeInfo fw_cfg_info = {
> > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> > index b5291eefad..457fee7425 100644
> > --- a/include/hw/nvram/fw_cfg.h
> > +++ b/include/hw/nvram/fw_cfg.h
> > @@ -53,6 +53,12 @@ struct FWCfgState {
> > dma_addr_t dma_addr;
> > AddressSpace *dma_as;
> > MemoryRegion dma_iomem;
> > +
> > + /* restore during migration */
> > + bool acpi_mr_restore;
> > + size_t table_mr_size;
> > + size_t linker_mr_size;
> > + size_t rsdp_mr_size;
> > };
> >
> > struct FWCfgIoState {
> > --
> > 2.17.1
> >
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-12 9:27 ` Shameerali Kolothum Thodi
@ 2020-03-19 17:51 ` Michael S. Tsirkin
2020-03-20 11:53 ` Shameerali Kolothum Thodi
0 siblings, 1 reply; 32+ messages in thread
From: Michael S. Tsirkin @ 2020-03-19 17:51 UTC (permalink / raw)
To: Shameerali Kolothum Thodi
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, Linuxarm, eric.auger, qemu-arm, xuwei (O),
imammedo, lersek
On Thu, Mar 12, 2020 at 09:27:32AM +0000, Shameerali Kolothum Thodi wrote:
>
>
> > -----Original Message-----
> > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > Sent: 11 March 2020 21:10
> > To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
> > Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
> > eric.auger@redhat.com; imammedo@redhat.com; peter.maydell@linaro.org;
> > shannon.zhaosl@gmail.com; xiaoguangrong.eric@gmail.com;
> > david@redhat.com; xuwei (O) <xuwei5@huawei.com>; lersek@redhat.com;
> > Linuxarm <linuxarm@huawei.com>
> > Subject: Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
> >
> > On Wed, Mar 11, 2020 at 05:20:06PM +0000, Shameer Kolothum wrote:
> > > Any sub-page size update to ACPI table MRs will be lost during
> > > migration, as we use aligned size in ram_load_precopy() ->
> > > qemu_ram_resize() path. This will result in inconsistency in sizes
> > > between source and destination. In order to avoid this, save and
> > > restore them separately during migration.
>
>
> > Is there a reason this is part of nvdimm patchset?
>
> Not really. But this problem is more visible if we have nvdimm hotplug
> support added to arm/virt. On x86, both acpi table and linker MRs are already
> aligned and I don't know a use case where you can change RSDP MR size(See below).
>
> >
> > Hmm but for old machine types we still have a problem right?
> > How about aligning size on source for them?
> > Then there won't be an inconsistency across migration.
> > Wastes some boot time/memory but maybe that's better
> > than a chance of not booting ...
>
> Right. That was considered. On x86, except RSDP MR, both the LINKER and ACPI
> TABLE MRs are already aligned/padded. And we cannot make RSDP mr aligned
> as it will break the seabios based boot.
Hmm. So right now if we migrate just before RSDP is read, there's
a failure?
> So a generic solution based on alignment
> is not possible unless we guarantee that RSDP is not going to be modified.
>
> What we could do for Arm/virt is just follow the x86 way and add padding for
> table and linker MRs. But this was discussed before and IIRC, was not well
> received.
>
> Thanks,
> Shameer
>
> > > Suggested-by: David Hildenbrand <david@redhat.com>
> > > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> > > ---
> > > Please find the discussion here,
> > > https://patchwork.kernel.org/patch/11339591/
> > > ---
> > > hw/core/machine.c | 1 +
> > > hw/nvram/fw_cfg.c | 86
> > ++++++++++++++++++++++++++++++++++++++-
> > > include/hw/nvram/fw_cfg.h | 6 +++
> > > 3 files changed, 92 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/hw/core/machine.c b/hw/core/machine.c
> > > index 9e8c06036f..6d960bd47f 100644
> > > --- a/hw/core/machine.c
> > > +++ b/hw/core/machine.c
> > > @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> > > { "usb-redir", "suppress-remote-wake", "off" },
> > > { "qxl", "revision", "4" },
> > > { "qxl-vga", "revision", "4" },
> > > + { "fw_cfg", "acpi-mr-restore", "false" },
> > > };
> > > const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
> > >
> > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> > > index 179b302f01..36d1e32f83 100644
> > > --- a/hw/nvram/fw_cfg.c
> > > +++ b/hw/nvram/fw_cfg.c
> > > @@ -39,6 +39,7 @@
> > > #include "qemu/config-file.h"
> > > #include "qemu/cutils.h"
> > > #include "qapi/error.h"
> > > +#include "hw/acpi/aml-build.h"
> > >
> > > #define FW_CFG_FILE_SLOTS_DFLT 0x20
> > >
> > > @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> > > return s->dma_enabled;
> > > }
> > >
> > > +static bool fw_cfg_acpi_mr_restore(void *opaque)
> > > +{
> > > + FWCfgState *s = opaque;
> > > + return s->acpi_mr_restore;
> > > +}
> > > +
> > > +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> > > +{
> > > + MemoryRegion *mr;
> > > + ram_addr_t offset;
> > > + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> > > + void *ptr;
> > > +
> > > + key &= FW_CFG_ENTRY_MASK;
> > > + assert(key < fw_cfg_max_entry(s));
> > > +
> > > + ptr = s->entries[arch][key].data;
> > > + mr = memory_region_from_host(ptr, &offset);
> > > +
> > > + memory_region_ram_resize(mr, size, &error_abort);
> > > +}
> > > +
> > > +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> > > +{
> > > + FWCfgState *s = opaque;
> > > + int i, index;
> > > +
> > > + assert(s->files);
> > > +
> > > + index = be32_to_cpu(s->files->count);
> > > +
> > > + for (i = 0; i < index; i++) {
> > > + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> > > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> > s->table_mr_size);
> > > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> > > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> > s->linker_mr_size);
> > > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> > > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> > s->rsdp_mr_size);
> > > + }
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > static const VMStateDescription vmstate_fw_cfg_dma = {
> > > .name = "fw_cfg/dma",
> > > .needed = fw_cfg_dma_enabled,
> > > @@ -619,6 +664,20 @@ static const VMStateDescription
> > vmstate_fw_cfg_dma = {
> > > },
> > > };
> > >
> > > +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> > > + .name = "fw_cfg/acpi_mr",
> > > + .version_id = 1,
> > > + .minimum_version_id = 1,
> > > + .needed = fw_cfg_acpi_mr_restore,
> > > + .post_load = fw_cfg_acpi_mr_restore_post_load,
> > > + .fields = (VMStateField[]) {
> > > + VMSTATE_UINT64(table_mr_size, FWCfgState),
> > > + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> > > + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> > > + VMSTATE_END_OF_LIST()
> > > + },
> > > +};
> > > +
> > > static const VMStateDescription vmstate_fw_cfg = {
> > > .name = "fw_cfg",
> > > .version_id = 2,
> > > @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> > > },
> > > .subsections = (const VMStateDescription*[]) {
> > > &vmstate_fw_cfg_dma,
> > > + &vmstate_fw_cfg_acpi_mr,
> > > NULL,
> > > }
> > > };
> > > @@ -815,6 +875,23 @@ static struct {
> > > #define FW_CFG_ORDER_OVERRIDE_LAST 200
> > > };
> > >
> > > +/*
> > > + * Any sub-page size update to these table MRs will be lost during migration,
> > > + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> > > + * In order to avoid the inconsistency in sizes save them seperately and
> > > + * migrate over in vmstate post_load().
> > > + */
> > > +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename,
> > size_t len)
> > > +{
> > > + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> > > + s->table_mr_size = len;
> > > + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> > > + s->linker_mr_size = len;
> > > + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> > > + s->rsdp_mr_size = len;
> > > + }
> > > +}
> > > +
> > > static int get_fw_cfg_order(FWCfgState *s, const char *name)
> > > {
> > > int i;
> > > @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s,
> > const char *filename,
> > > trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
> > >
> > > s->files->count = cpu_to_be32(count+1);
> > > + fw_cfg_acpi_mr_save(s, filename, len);
> > > }
> > >
> > > void fw_cfg_add_file(FWCfgState *s, const char *filename,
> > > @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char
> > *filename,
> > > ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> > > data, len);
> > > s->files->f[i].size = cpu_to_be32(len);
> > > + fw_cfg_acpi_mr_save(s, filename, len);
> > > return ptr;
> > > }
> > > }
> > > @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier
> > *n, void *data)
> > > qemu_register_reset(fw_cfg_machine_reset, s);
> > > }
> > >
> > > -
> > > +static Property fw_cfg_properties[] = {
> > > + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore,
> > true),
> > > + DEFINE_PROP_END_OF_LIST(),
> > > +};
> > >
> > > static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> > > {
> > > @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass,
> > void *data)
> > >
> > > dc->reset = fw_cfg_reset;
> > > dc->vmsd = &vmstate_fw_cfg;
> > > +
> > > + device_class_set_props(dc, fw_cfg_properties);
> > > }
> > >
> > > static const TypeInfo fw_cfg_info = {
> > > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> > > index b5291eefad..457fee7425 100644
> > > --- a/include/hw/nvram/fw_cfg.h
> > > +++ b/include/hw/nvram/fw_cfg.h
> > > @@ -53,6 +53,12 @@ struct FWCfgState {
> > > dma_addr_t dma_addr;
> > > AddressSpace *dma_as;
> > > MemoryRegion dma_iomem;
> > > +
> > > + /* restore during migration */
> > > + bool acpi_mr_restore;
> > > + size_t table_mr_size;
> > > + size_t linker_mr_size;
> > > + size_t rsdp_mr_size;
> > > };
> > >
> > > struct FWCfgIoState {
> > > --
> > > 2.17.1
> > >
^ permalink raw reply [flat|nested] 32+ messages in thread
* RE: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-19 17:51 ` Michael S. Tsirkin
@ 2020-03-20 11:53 ` Shameerali Kolothum Thodi
0 siblings, 0 replies; 32+ messages in thread
From: Shameerali Kolothum Thodi @ 2020-03-20 11:53 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, Linuxarm, eric.auger, qemu-arm, xuwei (O),
imammedo, lersek
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 19 March 2020 17:51
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
> Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
> eric.auger@redhat.com; imammedo@redhat.com; peter.maydell@linaro.org;
> shannon.zhaosl@gmail.com; xiaoguangrong.eric@gmail.com;
> david@redhat.com; xuwei (O) <xuwei5@huawei.com>; lersek@redhat.com;
> Linuxarm <linuxarm@huawei.com>
> Subject: Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
>
> On Thu, Mar 12, 2020 at 09:27:32AM +0000, Shameerali Kolothum Thodi
> wrote:
> >
> >
> > > -----Original Message-----
> > > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > > Sent: 11 March 2020 21:10
> > > To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
> > > Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
> > > eric.auger@redhat.com; imammedo@redhat.com;
> peter.maydell@linaro.org;
> > > shannon.zhaosl@gmail.com; xiaoguangrong.eric@gmail.com;
> > > david@redhat.com; xuwei (O) <xuwei5@huawei.com>;
> lersek@redhat.com;
> > > Linuxarm <linuxarm@huawei.com>
> > > Subject: Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes
> separately
> > >
> > > On Wed, Mar 11, 2020 at 05:20:06PM +0000, Shameer Kolothum wrote:
> > > > Any sub-page size update to ACPI table MRs will be lost during
> > > > migration, as we use aligned size in ram_load_precopy() ->
> > > > qemu_ram_resize() path. This will result in inconsistency in sizes
> > > > between source and destination. In order to avoid this, save and
> > > > restore them separately during migration.
> >
> >
> > > Is there a reason this is part of nvdimm patchset?
> >
> > Not really. But this problem is more visible if we have nvdimm hotplug
> > support added to arm/virt. On x86, both acpi table and linker MRs are already
> > aligned and I don't know a use case where you can change RSDP MR size(See
> below).
> >
> > >
> > > Hmm but for old machine types we still have a problem right?
> > > How about aligning size on source for them?
> > > Then there won't be an inconsistency across migration.
> > > Wastes some boot time/memory but maybe that's better
> > > than a chance of not booting ...
> >
> > Right. That was considered. On x86, except RSDP MR, both the LINKER and
> ACPI
> > TABLE MRs are already aligned/padded. And we cannot make RSDP mr
> aligned
> > as it will break the seabios based boot.
>
> Hmm. So right now if we migrate just before RSDP is read, there's
> a failure?
I am not sure that will be the case. IIUC, on migration path, ram_load_precopy() -->qemu_ram_resize()
won't be called as both length and block->used_length will be aligned size.
Even if it calls, the current qemu_ram_resize() works on aligned size and wont invoke
the callback to update the FWCfgEntry. And I believe on destination, the bios read will trigger
the fw_cfg_select() which will call the acpi_build_update() to rebuild the tables and update the
FWCfgEntry.
Having said that my knowledge on this is limited, but I can test and confirm this, if there is
an easy way to trigger this usecase. Please let me know.
Thanks,
Shameer
> > So a generic solution based on alignment
> > is not possible unless we guarantee that RSDP is not going to be modified.
> >
> > What we could do for Arm/virt is just follow the x86 way and add padding for
> > table and linker MRs. But this was discussed before and IIRC, was not well
> > received.
> >
> > Thanks,
> > Shameer
> >
> > > > Suggested-by: David Hildenbrand <david@redhat.com>
> > > > Signed-off-by: Shameer Kolothum
> <shameerali.kolothum.thodi@huawei.com>
> > > > ---
> > > > Please find the discussion here,
> > > > https://patchwork.kernel.org/patch/11339591/
> > > > ---
> > > > hw/core/machine.c | 1 +
> > > > hw/nvram/fw_cfg.c | 86
> > > ++++++++++++++++++++++++++++++++++++++-
> > > > include/hw/nvram/fw_cfg.h | 6 +++
> > > > 3 files changed, 92 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/hw/core/machine.c b/hw/core/machine.c
> > > > index 9e8c06036f..6d960bd47f 100644
> > > > --- a/hw/core/machine.c
> > > > +++ b/hw/core/machine.c
> > > > @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> > > > { "usb-redir", "suppress-remote-wake", "off" },
> > > > { "qxl", "revision", "4" },
> > > > { "qxl-vga", "revision", "4" },
> > > > + { "fw_cfg", "acpi-mr-restore", "false" },
> > > > };
> > > > const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
> > > >
> > > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> > > > index 179b302f01..36d1e32f83 100644
> > > > --- a/hw/nvram/fw_cfg.c
> > > > +++ b/hw/nvram/fw_cfg.c
> > > > @@ -39,6 +39,7 @@
> > > > #include "qemu/config-file.h"
> > > > #include "qemu/cutils.h"
> > > > #include "qapi/error.h"
> > > > +#include "hw/acpi/aml-build.h"
> > > >
> > > > #define FW_CFG_FILE_SLOTS_DFLT 0x20
> > > >
> > > > @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> > > > return s->dma_enabled;
> > > > }
> > > >
> > > > +static bool fw_cfg_acpi_mr_restore(void *opaque)
> > > > +{
> > > > + FWCfgState *s = opaque;
> > > > + return s->acpi_mr_restore;
> > > > +}
> > > > +
> > > > +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> > > > +{
> > > > + MemoryRegion *mr;
> > > > + ram_addr_t offset;
> > > > + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> > > > + void *ptr;
> > > > +
> > > > + key &= FW_CFG_ENTRY_MASK;
> > > > + assert(key < fw_cfg_max_entry(s));
> > > > +
> > > > + ptr = s->entries[arch][key].data;
> > > > + mr = memory_region_from_host(ptr, &offset);
> > > > +
> > > > + memory_region_ram_resize(mr, size, &error_abort);
> > > > +}
> > > > +
> > > > +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int
> version_id)
> > > > +{
> > > > + FWCfgState *s = opaque;
> > > > + int i, index;
> > > > +
> > > > + assert(s->files);
> > > > +
> > > > + index = be32_to_cpu(s->files->count);
> > > > +
> > > > + for (i = 0; i < index; i++) {
> > > > + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> > > > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> > > s->table_mr_size);
> > > > + } else if (!strcmp(s->files->f[i].name,
> ACPI_BUILD_LOADER_FILE)) {
> > > > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> > > s->linker_mr_size);
> > > > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE))
> {
> > > > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> > > s->rsdp_mr_size);
> > > > + }
> > > > + }
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > static const VMStateDescription vmstate_fw_cfg_dma = {
> > > > .name = "fw_cfg/dma",
> > > > .needed = fw_cfg_dma_enabled,
> > > > @@ -619,6 +664,20 @@ static const VMStateDescription
> > > vmstate_fw_cfg_dma = {
> > > > },
> > > > };
> > > >
> > > > +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> > > > + .name = "fw_cfg/acpi_mr",
> > > > + .version_id = 1,
> > > > + .minimum_version_id = 1,
> > > > + .needed = fw_cfg_acpi_mr_restore,
> > > > + .post_load = fw_cfg_acpi_mr_restore_post_load,
> > > > + .fields = (VMStateField[]) {
> > > > + VMSTATE_UINT64(table_mr_size, FWCfgState),
> > > > + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> > > > + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> > > > + VMSTATE_END_OF_LIST()
> > > > + },
> > > > +};
> > > > +
> > > > static const VMStateDescription vmstate_fw_cfg = {
> > > > .name = "fw_cfg",
> > > > .version_id = 2,
> > > > @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg
> = {
> > > > },
> > > > .subsections = (const VMStateDescription*[]) {
> > > > &vmstate_fw_cfg_dma,
> > > > + &vmstate_fw_cfg_acpi_mr,
> > > > NULL,
> > > > }
> > > > };
> > > > @@ -815,6 +875,23 @@ static struct {
> > > > #define FW_CFG_ORDER_OVERRIDE_LAST 200
> > > > };
> > > >
> > > > +/*
> > > > + * Any sub-page size update to these table MRs will be lost during
> migration,
> > > > + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize()
> path.
> > > > + * In order to avoid the inconsistency in sizes save them seperately and
> > > > + * migrate over in vmstate post_load().
> > > > + */
> > > > +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename,
> > > size_t len)
> > > > +{
> > > > + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> > > > + s->table_mr_size = len;
> > > > + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> > > > + s->linker_mr_size = len;
> > > > + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> > > > + s->rsdp_mr_size = len;
> > > > + }
> > > > +}
> > > > +
> > > > static int get_fw_cfg_order(FWCfgState *s, const char *name)
> > > > {
> > > > int i;
> > > > @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s,
> > > const char *filename,
> > > > trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
> > > >
> > > > s->files->count = cpu_to_be32(count+1);
> > > > + fw_cfg_acpi_mr_save(s, filename, len);
> > > > }
> > > >
> > > > void fw_cfg_add_file(FWCfgState *s, const char *filename,
> > > > @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const
> char
> > > *filename,
> > > > ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST
> + i,
> > > > data, len);
> > > > s->files->f[i].size = cpu_to_be32(len);
> > > > + fw_cfg_acpi_mr_save(s, filename, len);
> > > > return ptr;
> > > > }
> > > > }
> > > > @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct
> Notifier
> > > *n, void *data)
> > > > qemu_register_reset(fw_cfg_machine_reset, s);
> > > > }
> > > >
> > > > -
> > > > +static Property fw_cfg_properties[] = {
> > > > + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState,
> acpi_mr_restore,
> > > true),
> > > > + DEFINE_PROP_END_OF_LIST(),
> > > > +};
> > > >
> > > > static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> > > > {
> > > > @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass
> *klass,
> > > void *data)
> > > >
> > > > dc->reset = fw_cfg_reset;
> > > > dc->vmsd = &vmstate_fw_cfg;
> > > > +
> > > > + device_class_set_props(dc, fw_cfg_properties);
> > > > }
> > > >
> > > > static const TypeInfo fw_cfg_info = {
> > > > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> > > > index b5291eefad..457fee7425 100644
> > > > --- a/include/hw/nvram/fw_cfg.h
> > > > +++ b/include/hw/nvram/fw_cfg.h
> > > > @@ -53,6 +53,12 @@ struct FWCfgState {
> > > > dma_addr_t dma_addr;
> > > > AddressSpace *dma_as;
> > > > MemoryRegion dma_iomem;
> > > > +
> > > > + /* restore during migration */
> > > > + bool acpi_mr_restore;
> > > > + size_t table_mr_size;
> > > > + size_t linker_mr_size;
> > > > + size_t rsdp_mr_size;
> > > > };
> > > >
> > > > struct FWCfgIoState {
> > > > --
> > > > 2.17.1
> > > >
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 01/10] acpi: Use macro for table-loader file name
2020-03-11 17:20 ` [PATCH v3 01/10] acpi: Use macro for table-loader file name Shameer Kolothum
@ 2020-03-23 12:23 ` Igor Mammedov
0 siblings, 0 replies; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 12:23 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, mst, lersek
On Wed, 11 Mar 2020 17:20:05 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> Use macro for "etc/table-loader" and move it to the header
> file similar to ACPI_BUILD_TABLE_FILE/ACPI_BUILD_RSDP_FILE etc.
>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/arm/virt-acpi-build.c | 2 +-
> hw/i386/acpi-build.c | 2 +-
> include/hw/acpi/aml-build.h | 1 +
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index fb4b166f82..c13710b727 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -929,7 +929,7 @@ void virt_acpi_setup(VirtMachineState *vms)
>
> build_state->linker_mr =
> acpi_add_rom_blob(virt_acpi_build_update, build_state,
> - tables.linker->cmd_blob, "etc/table-loader", 0);
> + tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0);
>
> fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
> acpi_data_len(tables.tcpalog));
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 9a19c14e66..80f05d728d 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -3043,7 +3043,7 @@ void acpi_setup(void)
>
> build_state->linker_mr =
> acpi_add_rom_blob(acpi_build_update, build_state,
> - tables.linker->cmd_blob, "etc/table-loader", 0);
> + tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0);
>
> fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
> tables.tcpalog->data, acpi_data_len(tables.tcpalog));
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index de4a406568..0f4ed53d7f 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -13,6 +13,7 @@
> #define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
> #define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
> #define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
> +#define ACPI_BUILD_LOADER_FILE "etc/table-loader"
>
> #define AML_NOTIFY_METHOD "NTFY"
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
` (2 preceding siblings ...)
2020-03-11 21:09 ` Michael S. Tsirkin
@ 2020-03-23 12:34 ` Igor Mammedov
2020-03-23 13:59 ` Shameerali Kolothum Thodi
3 siblings, 1 reply; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 12:34 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, lersek
On Wed, 11 Mar 2020 17:20:06 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> Any sub-page size update to ACPI table MRs will be lost during
> migration, as we use aligned size in ram_load_precopy() ->
> qemu_ram_resize() path. This will result in inconsistency in sizes
> between source and destination.
I'm not sure what problem is and if it matters in case of migration,
an example here with numbers from affected acpi blob would be useful here.
PS:
could you point to mail thread where problem was discussed
> In order to avoid this, save and
> restore them separately during migration.
>
> Suggested-by: David Hildenbrand <david@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> Please find the discussion here,
> https://patchwork.kernel.org/patch/11339591/
> ---
> hw/core/machine.c | 1 +
> hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++++++++++++++++-
> include/hw/nvram/fw_cfg.h | 6 +++
> 3 files changed, 92 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 9e8c06036f..6d960bd47f 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> { "usb-redir", "suppress-remote-wake", "off" },
> { "qxl", "revision", "4" },
> { "qxl-vga", "revision", "4" },
> + { "fw_cfg", "acpi-mr-restore", "false" },
> };
> const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 179b302f01..36d1e32f83 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -39,6 +39,7 @@
> #include "qemu/config-file.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> +#include "hw/acpi/aml-build.h"
>
> #define FW_CFG_FILE_SLOTS_DFLT 0x20
>
> @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> return s->dma_enabled;
> }
>
> +static bool fw_cfg_acpi_mr_restore(void *opaque)
> +{
> + FWCfgState *s = opaque;
> + return s->acpi_mr_restore;
> +}
> +
> +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> +{
> + MemoryRegion *mr;
> + ram_addr_t offset;
> + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> + void *ptr;
> +
> + key &= FW_CFG_ENTRY_MASK;
> + assert(key < fw_cfg_max_entry(s));
> +
> + ptr = s->entries[arch][key].data;
> + mr = memory_region_from_host(ptr, &offset);
> +
> + memory_region_ram_resize(mr, size, &error_abort);
> +}
> +
> +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> +{
> + FWCfgState *s = opaque;
> + int i, index;
> +
> + assert(s->files);
> +
> + index = be32_to_cpu(s->files->count);
> +
> + for (i = 0; i < index; i++) {
> + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->table_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->linker_mr_size);
> + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i, s->rsdp_mr_size);
> + }
> + }
> +
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_fw_cfg_dma = {
> .name = "fw_cfg/dma",
> .needed = fw_cfg_dma_enabled,
> @@ -619,6 +664,20 @@ static const VMStateDescription vmstate_fw_cfg_dma = {
> },
> };
>
> +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> + .name = "fw_cfg/acpi_mr",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = fw_cfg_acpi_mr_restore,
> + .post_load = fw_cfg_acpi_mr_restore_post_load,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(table_mr_size, FWCfgState),
> + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static const VMStateDescription vmstate_fw_cfg = {
> .name = "fw_cfg",
> .version_id = 2,
> @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> },
> .subsections = (const VMStateDescription*[]) {
> &vmstate_fw_cfg_dma,
> + &vmstate_fw_cfg_acpi_mr,
> NULL,
> }
> };
> @@ -815,6 +875,23 @@ static struct {
> #define FW_CFG_ORDER_OVERRIDE_LAST 200
> };
>
> +/*
> + * Any sub-page size update to these table MRs will be lost during migration,
> + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> + * In order to avoid the inconsistency in sizes save them seperately and
> + * migrate over in vmstate post_load().
> + */
> +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, size_t len)
> +{
> + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> + s->table_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> + s->linker_mr_size = len;
> + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> + s->rsdp_mr_size = len;
> + }
> +}
> +
> static int get_fw_cfg_order(FWCfgState *s, const char *name)
> {
> int i;
> @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
> trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
>
> s->files->count = cpu_to_be32(count+1);
> + fw_cfg_acpi_mr_save(s, filename, len);
> }
>
> void fw_cfg_add_file(FWCfgState *s, const char *filename,
> @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
> ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> data, len);
> s->files->f[i].size = cpu_to_be32(len);
> + fw_cfg_acpi_mr_save(s, filename, len);
> return ptr;
> }
> }
> @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data)
> qemu_register_reset(fw_cfg_machine_reset, s);
> }
>
> -
> +static Property fw_cfg_properties[] = {
> + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, true),
> + DEFINE_PROP_END_OF_LIST(),
> +};
>
> static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> {
> @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
>
> dc->reset = fw_cfg_reset;
> dc->vmsd = &vmstate_fw_cfg;
> +
> + device_class_set_props(dc, fw_cfg_properties);
> }
>
> static const TypeInfo fw_cfg_info = {
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index b5291eefad..457fee7425 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -53,6 +53,12 @@ struct FWCfgState {
> dma_addr_t dma_addr;
> AddressSpace *dma_as;
> MemoryRegion dma_iomem;
> +
> + /* restore during migration */
> + bool acpi_mr_restore;
> + size_t table_mr_size;
> + size_t linker_mr_size;
> + size_t rsdp_mr_size;
> };
>
> struct FWCfgIoState {
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback
2020-03-11 17:20 ` [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback Shameer Kolothum
2020-03-11 17:44 ` David Hildenbrand
@ 2020-03-23 13:03 ` Igor Mammedov
1 sibling, 0 replies; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 13:03 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, lersek
On Wed, 11 Mar 2020 17:20:07 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> From: David Hildenbrand <david@redhat.com>
>
> Summarizing the issue:
> 1. Memory regions contain ram blocks with a different size, if the
> size is not properly aligned. While memory regions can have an
> unaligned size, ram blocks can't. This is true when creating
> resizable memory region with an unaligned size.
> 2. When resizing a ram block/memory region, the size of the memory
> region is set to the aligned size. The callback is called with
> the aligned size. The unaligned piece is lost.
>
> Because of the above, if ACPI blob length modifications happens
> after the initial virt_acpi_build() call, and the changed blob
> length is within the PAGE size boundary, then the revised size
> is not seen by the firmware on Guest reboot.
>
> Hence make sure callback is called if memory region size is changed,
> irrespective of aligned or not.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> [Shameer: added commit log]
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> Please find the discussion here,
> https://patchwork.kernel.org/patch/11339591/
> ---
> exec.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index 0cc500d53a..f8974cd303 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2073,11 +2073,21 @@ static int memory_try_enable_merging(void *addr, size_t len)
> */
> int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
> {
> + const ram_addr_t unaligned_size = newsize;
> +
> assert(block);
>
> newsize = HOST_PAGE_ALIGN(newsize);
>
> if (block->used_length == newsize) {
> + /*
> + * We don't have to resize the ram block (which only knows aligned
> + * sizes), however, we have to notify if the unaligned size changed.
> + */
> + if (block->resized && unaligned_size != memory_region_size(block->mr)) {
> + block->resized(block->idstr, unaligned_size, block->host);
> + memory_region_set_size(block->mr, unaligned_size);
> + }
> return 0;
> }
>
> @@ -2101,9 +2111,9 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
> block->used_length = newsize;
> cpu_physical_memory_set_dirty_range(block->offset, block->used_length,
> DIRTY_CLIENTS_ALL);
> - memory_region_set_size(block->mr, newsize);
> + memory_region_set_size(block->mr, unaligned_size);
> if (block->resized) {
> - block->resized(block->idstr, newsize, block->host);
> + block->resized(block->idstr, unaligned_size, block->host);
> }
> return 0;
> }
^ permalink raw reply [flat|nested] 32+ messages in thread
* RE: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
2020-03-23 12:34 ` Igor Mammedov
@ 2020-03-23 13:59 ` Shameerali Kolothum Thodi
0 siblings, 0 replies; 32+ messages in thread
From: Shameerali Kolothum Thodi @ 2020-03-23 13:59 UTC (permalink / raw)
To: Igor Mammedov
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, Linuxarm, eric.auger, qemu-arm, xuwei (O),
lersek
> -----Original Message-----
> From: Igor Mammedov [mailto:imammedo@redhat.com]
> Sent: 23 March 2020 12:35
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
> Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
> eric.auger@redhat.com; peter.maydell@linaro.org;
> xiaoguangrong.eric@gmail.com; david@redhat.com; mst@redhat.com;
> Linuxarm <linuxarm@huawei.com>; xuwei (O) <xuwei5@huawei.com>;
> shannon.zhaosl@gmail.com; lersek@redhat.com
> Subject: Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately
>
> On Wed, 11 Mar 2020 17:20:06 +0000
> Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
>
> > Any sub-page size update to ACPI table MRs will be lost during
> > migration, as we use aligned size in ram_load_precopy() ->
> > qemu_ram_resize() path. This will result in inconsistency in sizes
> > between source and destination.
> I'm not sure what problem is and if it matters in case of migration,
> an example here with numbers from affected acpi blob would be useful here.
This happens when we try to fix the qemu_ram_resize() callback for sub-age
changes(patch # 03/10 in this series). In the previous discussion
David Hildenbrand pointed out that the fix will create an inconsistency between
source and target. I can add more details and some numbers in the
commit log here.
> PS:
> could you point to mail thread where problem was discussed
It is here ,
https://patchwork.kernel.org/patch/11339591/#23138505
Thanks,
Shameer
> > In order to avoid this, save and
> > restore them separately during migration.
> >
> > Suggested-by: David Hildenbrand <david@redhat.com>
> > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> > ---
> > Please find the discussion here,
> > https://patchwork.kernel.org/patch/11339591/
> > ---
> > hw/core/machine.c | 1 +
> > hw/nvram/fw_cfg.c | 86
> ++++++++++++++++++++++++++++++++++++++-
> > include/hw/nvram/fw_cfg.h | 6 +++
> > 3 files changed, 92 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/core/machine.c b/hw/core/machine.c
> > index 9e8c06036f..6d960bd47f 100644
> > --- a/hw/core/machine.c
> > +++ b/hw/core/machine.c
> > @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] = {
> > { "usb-redir", "suppress-remote-wake", "off" },
> > { "qxl", "revision", "4" },
> > { "qxl-vga", "revision", "4" },
> > + { "fw_cfg", "acpi-mr-restore", "false" },
> > };
> > const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
> >
> > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> > index 179b302f01..36d1e32f83 100644
> > --- a/hw/nvram/fw_cfg.c
> > +++ b/hw/nvram/fw_cfg.c
> > @@ -39,6 +39,7 @@
> > #include "qemu/config-file.h"
> > #include "qemu/cutils.h"
> > #include "qapi/error.h"
> > +#include "hw/acpi/aml-build.h"
> >
> > #define FW_CFG_FILE_SLOTS_DFLT 0x20
> >
> > @@ -610,6 +611,50 @@ bool fw_cfg_dma_enabled(void *opaque)
> > return s->dma_enabled;
> > }
> >
> > +static bool fw_cfg_acpi_mr_restore(void *opaque)
> > +{
> > + FWCfgState *s = opaque;
> > + return s->acpi_mr_restore;
> > +}
> > +
> > +static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
> > +{
> > + MemoryRegion *mr;
> > + ram_addr_t offset;
> > + int arch = !!(key & FW_CFG_ARCH_LOCAL);
> > + void *ptr;
> > +
> > + key &= FW_CFG_ENTRY_MASK;
> > + assert(key < fw_cfg_max_entry(s));
> > +
> > + ptr = s->entries[arch][key].data;
> > + mr = memory_region_from_host(ptr, &offset);
> > +
> > + memory_region_ram_resize(mr, size, &error_abort);
> > +}
> > +
> > +static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
> > +{
> > + FWCfgState *s = opaque;
> > + int i, index;
> > +
> > + assert(s->files);
> > +
> > + index = be32_to_cpu(s->files->count);
> > +
> > + for (i = 0; i < index; i++) {
> > + if (!strcmp(s->files->f[i].name, ACPI_BUILD_TABLE_FILE)) {
> > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> s->table_mr_size);
> > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_LOADER_FILE)) {
> > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> s->linker_mr_size);
> > + } else if (!strcmp(s->files->f[i].name, ACPI_BUILD_RSDP_FILE)) {
> > + fw_cfg_update_mr(s, FW_CFG_FILE_FIRST + i,
> s->rsdp_mr_size);
> > + }
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static const VMStateDescription vmstate_fw_cfg_dma = {
> > .name = "fw_cfg/dma",
> > .needed = fw_cfg_dma_enabled,
> > @@ -619,6 +664,20 @@ static const VMStateDescription
> vmstate_fw_cfg_dma = {
> > },
> > };
> >
> > +static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
> > + .name = "fw_cfg/acpi_mr",
> > + .version_id = 1,
> > + .minimum_version_id = 1,
> > + .needed = fw_cfg_acpi_mr_restore,
> > + .post_load = fw_cfg_acpi_mr_restore_post_load,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_UINT64(table_mr_size, FWCfgState),
> > + VMSTATE_UINT64(linker_mr_size, FWCfgState),
> > + VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
> > + VMSTATE_END_OF_LIST()
> > + },
> > +};
> > +
> > static const VMStateDescription vmstate_fw_cfg = {
> > .name = "fw_cfg",
> > .version_id = 2,
> > @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg = {
> > },
> > .subsections = (const VMStateDescription*[]) {
> > &vmstate_fw_cfg_dma,
> > + &vmstate_fw_cfg_acpi_mr,
> > NULL,
> > }
> > };
> > @@ -815,6 +875,23 @@ static struct {
> > #define FW_CFG_ORDER_OVERRIDE_LAST 200
> > };
> >
> > +/*
> > + * Any sub-page size update to these table MRs will be lost during migration,
> > + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path.
> > + * In order to avoid the inconsistency in sizes save them seperately and
> > + * migrate over in vmstate post_load().
> > + */
> > +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename,
> size_t len)
> > +{
> > + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) {
> > + s->table_mr_size = len;
> > + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) {
> > + s->linker_mr_size = len;
> > + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) {
> > + s->rsdp_mr_size = len;
> > + }
> > +}
> > +
> > static int get_fw_cfg_order(FWCfgState *s, const char *name)
> > {
> > int i;
> > @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s,
> const char *filename,
> > trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);
> >
> > s->files->count = cpu_to_be32(count+1);
> > + fw_cfg_acpi_mr_save(s, filename, len);
> > }
> >
> > void fw_cfg_add_file(FWCfgState *s, const char *filename,
> > @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char
> *filename,
> > ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
> > data, len);
> > s->files->f[i].size = cpu_to_be32(len);
> > + fw_cfg_acpi_mr_save(s, filename, len);
> > return ptr;
> > }
> > }
> > @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier
> *n, void *data)
> > qemu_register_reset(fw_cfg_machine_reset, s);
> > }
> >
> > -
> > +static Property fw_cfg_properties[] = {
> > + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore,
> true),
> > + DEFINE_PROP_END_OF_LIST(),
> > +};
> >
> > static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
> > {
> > @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass,
> void *data)
> >
> > dc->reset = fw_cfg_reset;
> > dc->vmsd = &vmstate_fw_cfg;
> > +
> > + device_class_set_props(dc, fw_cfg_properties);
> > }
> >
> > static const TypeInfo fw_cfg_info = {
> > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> > index b5291eefad..457fee7425 100644
> > --- a/include/hw/nvram/fw_cfg.h
> > +++ b/include/hw/nvram/fw_cfg.h
> > @@ -53,6 +53,12 @@ struct FWCfgState {
> > dma_addr_t dma_addr;
> > AddressSpace *dma_as;
> > MemoryRegion dma_iomem;
> > +
> > + /* restore during migration */
> > + bool acpi_mr_restore;
> > + size_t table_mr_size;
> > + size_t linker_mr_size;
> > + size_t rsdp_mr_size;
> > };
> >
> > struct FWCfgIoState {
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length
2020-03-11 17:20 ` [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length Shameer Kolothum
@ 2020-03-23 14:59 ` Igor Mammedov
0 siblings, 0 replies; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 14:59 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, mst, lersek
On Wed, 11 Mar 2020 17:20:08 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> As per ACPI spec 6.3, Table 19-419 Object Conversion Rules, if
> the Buffer Field <= to the size of an Integer (in bits), it will
> be treated as an integer. Moreover, the integer size depends on
> DSDT tables revision number. If revision number is < 2, integer
> size is 32 bits, otherwise it is 64 bits. Current NVDIMM common
> DSM aml code (NCAL) uses CreateField() for creating DSM output
> buffer. This creates an issue in arm/virt platform where DSDT
> revision number is 2 and results in DSM buffer with a wrong
> size(8 bytes) gets returned when actual length is < 8 bytes.
> This causes guest kernel to report,
>
> "nfit ACPI0012:00: found a zero length table '0' parsing nfit"
>
> In order to fix this, aml code is now modified such that it builds
> the DSM output buffer in a byte by byte fashion when length is
> smaller than Integer size.
>
> Suggested-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v2 -> v3
> - Using Integer size as 8 bytes instead of SizeOf(Integer)
> ---
> hw/acpi/nvdimm.c | 40 +++++++++++++++++++--
> tests/qtest/bios-tables-test-allowed-diff.h | 2 ++
> 2 files changed, 39 insertions(+), 3 deletions(-)
>
> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> index 5219dd0e2e..213556f35d 100644
> --- a/hw/acpi/nvdimm.c
> +++ b/hw/acpi/nvdimm.c
> @@ -938,6 +938,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
> Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *elsectx2;
> Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid;
> Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf, *dsm_out_buf_size;
> + Aml *whilectx, *offset;
> uint8_t byte_list[1];
>
> method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);
> @@ -1091,13 +1092,46 @@ static void nvdimm_build_common_dsm(Aml *dev)
> /* RLEN is not included in the payload returned to guest. */
> aml_append(method, aml_subtract(aml_name(NVDIMM_DSM_OUT_BUF_SIZE),
> aml_int(4), dsm_out_buf_size));
> +
> + /*
> + * As per ACPI spec 6.3, Table 19-419 Object Conversion Rules, if
> + * the Buffer Field <= to the size of an Integer (in bits), it will
> + * be treated as an integer. Moreover, the integer size depends on
> + * DSDT tables revision number. If revision number is < 2, integer
> + * size is 32 bits, otherwise it is 64 bits.
> + * Because of this CreateField() canot be used if RLEN < Integer Size.
> + *
> + * Also please note that APCI ASL operator SizeOf() doesn't support
> + * Integer and there isn't any other way to figure out the Integer
> + * size. Hence we assume 8 byte as Integer size and if RLEN < 8 bytes,
> + * build dsm_out_buf byte by byte.
> + */
> + ifctx = aml_if(aml_lless(dsm_out_buf_size, aml_int(8)));
> + offset = aml_local(2);
> + aml_append(ifctx, aml_store(aml_int(0), offset));
> + aml_append(ifctx, aml_name_decl("TBUF", aml_buffer(1, NULL)));
> + aml_append(ifctx, aml_store(aml_buffer(0, NULL), dsm_out_buf));
> +
> + whilectx = aml_while(aml_lless(offset, dsm_out_buf_size));
> + /* Copy 1 byte at offset from ODAT to temporary buffer(TBUF). */
> + aml_append(whilectx, aml_store(aml_derefof(aml_index(
> + aml_name(NVDIMM_DSM_OUT_BUF), offset)),
> + aml_index(aml_name("TBUF"), aml_int(0))));
> + aml_append(whilectx, aml_concatenate(dsm_out_buf, aml_name("TBUF"),
> + dsm_out_buf));
> + aml_append(whilectx, aml_increment(offset));
> + aml_append(ifctx, whilectx);
> +
> + aml_append(ifctx, aml_return(dsm_out_buf));
> + aml_append(method, ifctx);
> +
> + /* If RLEN >= Integer size, just use CreateField() operator */
> aml_append(method, aml_store(aml_shiftleft(dsm_out_buf_size, aml_int(3)),
> dsm_out_buf_size));
> aml_append(method, aml_create_field(aml_name(NVDIMM_DSM_OUT_BUF),
> aml_int(0), dsm_out_buf_size, "OBUF"));
> - aml_append(method, aml_concatenate(aml_buffer(0, NULL), aml_name("OBUF"),
> - dsm_out_buf));
> - aml_append(method, aml_return(dsm_out_buf));
> + aml_append(method, aml_return(aml_name("OBUF")));
> +
> aml_append(dev, method);
> }
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..eb8bae1407 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,3 @@
> /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/pc/SSDT.dimmpxm",
> +"tests/data/acpi/q35/SSDT.dimmpxm",
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size
2020-03-11 17:20 ` [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size Shameer Kolothum
@ 2020-03-23 15:14 ` Igor Mammedov
0 siblings, 0 replies; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 15:14 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, lersek
On Wed, 11 Mar 2020 17:20:09 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> From: Kwangwoo Lee <kwangwoo.lee@sk.com>
>
> This patch makes IO base and size configurable to create NPIO AML for
> ACPI NFIT. Since a different architecture like AArch64 does not use
> port-mapped IO, a configurable IO base is required to create correct
> mapping of ACPI IO address and size.
>
> Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/acpi/nvdimm.c | 32 ++++++++++++++++++++++----------
> hw/i386/acpi-build.c | 6 ++++++
> hw/i386/acpi-build.h | 3 +++
> hw/i386/pc_piix.c | 2 ++
> hw/i386/pc_q35.c | 2 ++
> include/hw/mem/nvdimm.h | 3 +++
> 6 files changed, 38 insertions(+), 10 deletions(-)
>
> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> index 213556f35d..fb99ad845a 100644
> --- a/hw/acpi/nvdimm.c
> +++ b/hw/acpi/nvdimm.c
> @@ -900,11 +900,13 @@ void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev)
> }
>
> void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
> + struct AcpiGenericAddress dsm_io,
> FWCfgState *fw_cfg, Object *owner)
> {
> + state->dsm_io = dsm_io;
> memory_region_init_io(&state->io_mr, owner, &nvdimm_dsm_ops, state,
> - "nvdimm-acpi-io", NVDIMM_ACPI_IO_LEN);
> - memory_region_add_subregion(io, NVDIMM_ACPI_IO_BASE, &state->io_mr);
> + "nvdimm-acpi-io", dsm_io.bit_width >> 3);
> + memory_region_add_subregion(io, dsm_io.address, &state->io_mr);
>
> state->dsm_mem = g_array_new(false, true /* clear */, 1);
> acpi_data_push(state->dsm_mem, sizeof(NvdimmDsmIn));
> @@ -933,13 +935,15 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
>
> #define NVDIMM_QEMU_RSVD_UUID "648B9CF2-CDA1-4312-8AD9-49C4AF32BD62"
>
> -static void nvdimm_build_common_dsm(Aml *dev)
> +static void nvdimm_build_common_dsm(Aml *dev,
> + NVDIMMState *nvdimm_state)
> {
> Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *elsectx2;
> Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid;
> Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf, *dsm_out_buf_size;
> Aml *whilectx, *offset;
> uint8_t byte_list[1];
> + AmlRegionSpace rs;
>
> method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);
> uuid = aml_arg(0);
> @@ -950,9 +954,16 @@ static void nvdimm_build_common_dsm(Aml *dev)
>
> aml_append(method, aml_store(aml_name(NVDIMM_ACPI_MEM_ADDR), dsm_mem));
>
> + if (nvdimm_state->dsm_io.space_id == AML_AS_SYSTEM_IO) {
> + rs = AML_SYSTEM_IO;
> + } else {
> + rs = AML_SYSTEM_MEMORY;
> + }
> +
> /* map DSM memory and IO into ACPI namespace. */
> - aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, AML_SYSTEM_IO,
> - aml_int(NVDIMM_ACPI_IO_BASE), NVDIMM_ACPI_IO_LEN));
> + aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, rs,
> + aml_int(nvdimm_state->dsm_io.address),
> + nvdimm_state->dsm_io.bit_width >> 3));
> aml_append(method, aml_operation_region(NVDIMM_DSM_MEMORY,
> AML_SYSTEM_MEMORY, dsm_mem, sizeof(NvdimmDsmIn)));
>
> @@ -967,7 +978,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
> field = aml_field(NVDIMM_DSM_IOPORT, AML_DWORD_ACC, AML_NOLOCK,
> AML_PRESERVE);
> aml_append(field, aml_named_field(NVDIMM_DSM_NOTIFY,
> - NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE));
> + nvdimm_state->dsm_io.bit_width));
> aml_append(method, field);
>
> /*
> @@ -1268,7 +1279,8 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)
> }
>
> static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
> - BIOSLinker *linker, GArray *dsm_dma_area,
> + BIOSLinker *linker,
> + NVDIMMState *nvdimm_state,
> uint32_t ram_slots)
> {
> Aml *ssdt, *sb_scope, *dev;
> @@ -1296,7 +1308,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
> */
> aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0012")));
>
> - nvdimm_build_common_dsm(dev);
> + nvdimm_build_common_dsm(dev, nvdimm_state);
>
> /* 0 is reserved for root device. */
> nvdimm_build_device_dsm(dev, 0);
> @@ -1315,7 +1327,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
> NVDIMM_ACPI_MEM_ADDR);
>
> bios_linker_loader_alloc(linker,
> - NVDIMM_DSM_MEM_FILE, dsm_dma_area,
> + NVDIMM_DSM_MEM_FILE, nvdimm_state->dsm_mem,
> sizeof(NvdimmDsmIn), false /* high memory */);
> bios_linker_loader_add_pointer(linker,
> ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),
> @@ -1337,7 +1349,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
> return;
> }
>
> - nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
> + nvdimm_build_ssdt(table_offsets, table_data, linker, state,
> ram_slots);
>
> device_list = nvdimm_get_device_list();
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 80f05d728d..ed2b9af8d8 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -128,6 +128,12 @@ typedef struct FwCfgTPMConfig {
>
> static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg);
>
> +const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = {
> + .space_id = AML_AS_SYSTEM_IO,
> + .address = NVDIMM_ACPI_IO_BASE,
> + .bit_width = NVDIMM_ACPI_IO_LEN << 3
> +};
> +
> static void init_common_fadt_data(MachineState *ms, Object *o,
> AcpiFadtData *data)
> {
> diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h
> index 007332e51c..74df5fc612 100644
> --- a/hw/i386/acpi-build.h
> +++ b/hw/i386/acpi-build.h
> @@ -1,6 +1,9 @@
>
> #ifndef HW_I386_ACPI_BUILD_H
> #define HW_I386_ACPI_BUILD_H
> +#include "hw/acpi/acpi-defs.h"
> +
> +extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;
>
> void acpi_setup(void);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index e2d98243bc..f0066d2394 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -61,6 +61,7 @@
> #include "migration/misc.h"
> #include "sysemu/numa.h"
> #include "hw/mem/nvdimm.h"
> +#include "hw/i386/acpi-build.h"
>
> #define MAX_IDE_BUS 2
>
> @@ -297,6 +298,7 @@ else {
>
> if (machine->nvdimms_state->is_enabled) {
> nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
> + x86_nvdimm_acpi_dsmio,
> x86ms->fw_cfg, OBJECT(pcms));
> }
> }
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index d37c425e22..d2806c1b29 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -54,6 +54,7 @@
> #include "qemu/error-report.h"
> #include "sysemu/numa.h"
> #include "hw/mem/nvdimm.h"
> +#include "hw/i386/acpi-build.h"
>
> /* ICH9 AHCI has 6 ports */
> #define MAX_SATA_PORTS 6
> @@ -315,6 +316,7 @@ static void pc_q35_init(MachineState *machine)
>
> if (machine->nvdimms_state->is_enabled) {
> nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
> + x86_nvdimm_acpi_dsmio,
> x86ms->fw_cfg, OBJECT(pcms));
> }
> }
> diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
> index 4807ca615b..a3c08955e8 100644
> --- a/include/hw/mem/nvdimm.h
> +++ b/include/hw/mem/nvdimm.h
> @@ -26,6 +26,7 @@
> #include "hw/mem/pc-dimm.h"
> #include "hw/acpi/bios-linker-loader.h"
> #include "qemu/uuid.h"
> +#include "hw/acpi/aml-build.h"
>
> #define NVDIMM_DEBUG 0
> #define nvdimm_debug(fmt, ...) \
> @@ -147,10 +148,12 @@ struct NVDIMMState {
> */
> int32_t persistence;
> char *persistence_string;
> + struct AcpiGenericAddress dsm_io;
> };
> typedef struct NVDIMMState NVDIMMState;
>
> void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
> + struct AcpiGenericAddress dsm_io,
> FWCfgState *fw_cfg, Object *owner);
> void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
> BIOSLinker *linker, NVDIMMState *state,
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure
2020-03-11 17:20 ` [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure Shameer Kolothum
@ 2020-03-23 15:22 ` Igor Mammedov
0 siblings, 0 replies; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 15:22 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, david, shannon.zhaosl, mst,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, lersek
On Wed, 11 Mar 2020 17:20:10 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
> From: Kwangwoo Lee <kwangwoo.lee@sk.com>
>
> This adds support to init nvdimm acpi state and build nvdimm acpi tables.
> Please note nvdimm_support is not yet enabled.
>
> Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v2 -> v3
> -Modified commit log.
> ---
> hw/arm/Kconfig | 1 +
> hw/arm/virt-acpi-build.c | 6 ++++++
> hw/arm/virt.c | 19 +++++++++++++++++++
> hw/mem/Kconfig | 2 +-
> include/hw/arm/virt.h | 1 +
> 5 files changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index bc54fd61f9..b023c0ecd5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -25,6 +25,7 @@ config ARM_VIRT
> select DIMM
> select ACPI_MEMORY_HOTPLUG
> select ACPI_HW_REDUCED
> + select ACPI_NVDIMM
>
> config CHEETAH
> bool
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index c13710b727..b7d666b7a4 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -44,6 +44,7 @@
> #include "hw/pci/pcie_host.h"
> #include "hw/pci/pci.h"
> #include "hw/arm/virt.h"
> +#include "hw/mem/nvdimm.h"
> #include "sysemu/numa.h"
> #include "sysemu/reset.h"
> #include "kvm_arm.h"
> @@ -826,6 +827,11 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
> }
> }
>
> + if (ms->nvdimms_state->is_enabled) {
> + nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
> + ms->nvdimms_state, ms->ram_slots);
> + }
> +
> if (its_class_name() && !vmc->no_its) {
> acpi_add_table(table_offsets, tables_blob);
> build_iort(tables_blob, tables->linker, vms);
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 32d865a488..18178553fa 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -148,6 +148,7 @@ static const MemMapEntry base_memmap[] = {
> [VIRT_SMMU] = { 0x09050000, 0x00020000 },
> [VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
> [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_EVT_SEL_LEN },
> + [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN},
> [VIRT_MMIO] = { 0x0a000000, 0x00000200 },
> /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
> [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
> @@ -1784,6 +1785,18 @@ static void machvirt_init(MachineState *machine)
>
> create_platform_bus(vms);
>
> + if (machine->nvdimms_state->is_enabled) {
> + const struct AcpiGenericAddress arm_virt_nvdimm_acpi_dsmio = {
> + .space_id = AML_AS_SYSTEM_MEMORY,
> + .address = vms->memmap[VIRT_NVDIMM_ACPI].base,
> + .bit_width = NVDIMM_ACPI_IO_LEN << 3
> + };
> +
> + nvdimm_init_acpi_state(machine->nvdimms_state, sysmem,
> + arm_virt_nvdimm_acpi_dsmio,
> + vms->fw_cfg, OBJECT(vms));
> + }
> +
> vms->bootinfo.ram_size = machine->ram_size;
> vms->bootinfo.nb_cpus = smp_cpus;
> vms->bootinfo.board_id = -1;
> @@ -1970,6 +1983,8 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> + MachineState *ms = MACHINE(hotplug_dev);
> + bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
> Error *local_err = NULL;
>
> pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
> @@ -1977,6 +1992,10 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
> goto out;
> }
>
> + if (is_nvdimm) {
> + nvdimm_plug(ms->nvdimms_state);
> + }
> +
> hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
> dev, &error_abort);
>
> diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
> index 2ad052a536..c27844900d 100644
> --- a/hw/mem/Kconfig
> +++ b/hw/mem/Kconfig
> @@ -8,4 +8,4 @@ config MEM_DEVICE
> config NVDIMM
> bool
> default y
> - depends on (PC || PSERIES)
> + depends on (PC || PSERIES || ARM_VIRT)
> diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> index 02f500cb8e..59588d18db 100644
> --- a/include/hw/arm/virt.h
> +++ b/include/hw/arm/virt.h
> @@ -79,6 +79,7 @@ enum {
> VIRT_SECURE_MEM,
> VIRT_PCDIMM_ACPI,
> VIRT_ACPI_GED,
> + VIRT_NVDIMM_ACPI,
> VIRT_LOWMEMMAP_LAST,
> };
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test
2020-03-11 17:20 ` [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test Shameer Kolothum
@ 2020-03-23 15:28 ` Igor Mammedov
0 siblings, 0 replies; 32+ messages in thread
From: Igor Mammedov @ 2020-03-23 15:28 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, mst, lersek
On Wed, 11 Mar 2020 17:20:13 +0000
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:
SUBJ is pointless,
s/Update.../
arm/virt: test pc-dimm and nvdimm coldplug
> Since we now have both pc-dimm and nvdimm support, update
> test_acpi_virt_tcg_memhp() to include those.
>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> v2 -> v3
> -Moved addition of empty table files to the previous patch
> ---
> tests/qtest/bios-tables-test.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 0a597bbacf..c9843829b3 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -927,12 +927,17 @@ static void test_acpi_virt_tcg_memhp(void)
> };
>
> data.variant = ".memhp";
> - test_acpi_one(" -cpu cortex-a57"
> + test_acpi_one(" -machine nvdimm=on"
> + " -cpu cortex-a57"
> " -m 256M,slots=3,maxmem=1G"
> " -object memory-backend-ram,id=ram0,size=128M"
> " -object memory-backend-ram,id=ram1,size=128M"
> " -numa node,memdev=ram0 -numa node,memdev=ram1"
> - " -numa dist,src=0,dst=1,val=21",
> + " -numa dist,src=0,dst=1,val=21"
> + " -object memory-backend-ram,id=ram2,size=128M"
> + " -object memory-backend-ram,id=nvm0,size=128M"
> + " -device pc-dimm,id=dimm0,memdev=ram2,node=0"
> + " -device nvdimm,id=dimm1,memdev=nvm0,node=1",
> &data);
>
> free_test_data(&data);
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support
2020-03-11 17:20 ` [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support Shameer Kolothum
@ 2020-03-24 6:16 ` Shannon Zhao
0 siblings, 0 replies; 32+ messages in thread
From: Shannon Zhao @ 2020-03-24 6:16 UTC (permalink / raw)
To: Shameer Kolothum, qemu-devel, qemu-arm, eric.auger, imammedo
Cc: peter.maydell, xiaoguangrong.eric, mst, david, linuxarm, xuwei5, lersek
On 2020/3/12 1:20, Shameer Kolothum wrote:
> diff --git a/docs/specs/acpi_hw_reduced_hotplug.rst b/docs/specs/acpi_hw_reduced_hotplug.rst
> index 911a98255b..e3abe975bf 100644
> --- a/docs/specs/acpi_hw_reduced_hotplug.rst
> +++ b/docs/specs/acpi_hw_reduced_hotplug.rst
> @@ -63,6 +63,7 @@ GED IO interface (4 byte access)
> bits:
> 0: Memory hotplug event
> 1: System power down event
> + 2: NVDIMM hotplug event
> 2-31: Reserved
should modify "2-31: Reserved"
Thanks,
Shannon
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
` (11 preceding siblings ...)
2020-03-11 19:32 ` no-reply
@ 2020-03-29 10:45 ` Michael S. Tsirkin
2020-03-30 8:44 ` Shameerali Kolothum Thodi
12 siblings, 1 reply; 32+ messages in thread
From: Michael S. Tsirkin @ 2020-03-29 10:45 UTC (permalink / raw)
To: Shameer Kolothum
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, xuwei5, linuxarm, eric.auger, qemu-arm, imammedo,
lersek
On Wed, Mar 11, 2020 at 05:20:04PM +0000, Shameer Kolothum wrote:
> This series adds NVDIMM support to arm/virt platform.
So I'm still confused about whether there's a bugfix here
that we need for 5.0. If yes pls post just that part
with acks included and for-5.0 in the subject.
> The series reuses some of the patches posted by Eric
> in his earlier attempt here[1].
>
> This also include few fixes to qemu in general which were
> discovered while adding nvdimm support to arm/virt.
>
> Patch #2 addresses the issue[2] that, during migration, the
> source and destination might end up with an inconsistency
> in acpi table memory region sizes.
>
> Patch #3 is to fix the qemu_ram_resize() callback issue[2].
>
> Patch #4 is another fix to the nvdimm aml issue discussed
> here[3].
>
> I have done a basic sanity testing of NVDIMM devices
> with Guest booting with ACPI. Further testing is always
> welcome.
>
> Please let me know your feedback.
>
> Thanks,
> Shameer
>
> [1] https://patchwork.kernel.org/cover/10830777/
> [2] https://patchwork.kernel.org/patch/11339591/
> [3] https://patchwork.kernel.org/cover/11174959/
>
> v2 --> v3
> - Added patch #1 and # 2 to fix the inconsistency in acpi
> table memory region sizes during migration. Thanks to
> David H.
> - The fix for qemu_ram_resize() callback was modified to
> the one in patch #3. Again thanks to David H.
> - Addressed comments from MST and Eric on tests added.
> - Addressed comments from Igor/MST on Integer size in patch #4
> - Added Eric's R-by to patch #7.
>
> v1 --> v2
> -Reworked patch #1 and now fix is inside qemu_ram_resize().
> -Added patch #2 to fix the nvdim aml issue.
> -Dropped support to DT cold plug.
> -Updated test_acpi_virt_tcg_memhp() with pc-dimm and nvdimms(patch #7)
>
> David Hildenbrand (1):
> exec: Fix for qemu_ram_resize() callback
>
> Kwangwoo Lee (2):
> nvdimm: Use configurable ACPI IO base and size
> hw/arm/virt: Add nvdimm hot-plug infrastructure
>
> Shameer Kolothum (7):
> acpi: Use macro for table-loader file name
> fw_cfg: Migrate ACPI table mr sizes separately
> hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length
> hw/arm/virt: Add nvdimm hotplug support
> tests: Update ACPI tables list for upcoming arm/virt test changes
> tests/bios-tables-test: Update arm/virt memhp test
> tests/acpi: add expected tables for bios-tables-test
>
> docs/specs/acpi_hw_reduced_hotplug.rst | 1 +
> exec.c | 14 +++-
> hw/acpi/generic_event_device.c | 15 ++++-
> hw/acpi/nvdimm.c | 72 +++++++++++++++++----
> hw/arm/Kconfig | 1 +
> hw/arm/virt-acpi-build.c | 8 ++-
> hw/arm/virt.c | 35 ++++++++--
> hw/core/machine.c | 1 +
> hw/i386/acpi-build.c | 8 ++-
> hw/i386/acpi-build.h | 3 +
> hw/i386/pc_piix.c | 2 +
> hw/i386/pc_q35.c | 2 +
> hw/mem/Kconfig | 2 +-
> hw/nvram/fw_cfg.c | 86 ++++++++++++++++++++++++-
> include/hw/acpi/aml-build.h | 1 +
> include/hw/acpi/generic_event_device.h | 1 +
> include/hw/arm/virt.h | 1 +
> include/hw/mem/nvdimm.h | 3 +
> include/hw/nvram/fw_cfg.h | 6 ++
> tests/data/acpi/pc/SSDT.dimmpxm | Bin 685 -> 734 bytes
> tests/data/acpi/q35/SSDT.dimmpxm | Bin 685 -> 734 bytes
> tests/data/acpi/virt/DSDT.memhp | Bin 6644 -> 6668 bytes
> tests/data/acpi/virt/NFIT.memhp | Bin 0 -> 224 bytes
> tests/data/acpi/virt/SSDT.memhp | Bin 0 -> 736 bytes
> tests/qtest/bios-tables-test.c | 9 ++-
> 25 files changed, 244 insertions(+), 27 deletions(-)
> create mode 100644 tests/data/acpi/virt/NFIT.memhp
> create mode 100644 tests/data/acpi/virt/SSDT.memhp
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* RE: [PATCH v3 00/10] ARM virt: Add NVDIMM support
2020-03-29 10:45 ` Michael S. Tsirkin
@ 2020-03-30 8:44 ` Shameerali Kolothum Thodi
2020-03-30 8:46 ` David Hildenbrand
0 siblings, 1 reply; 32+ messages in thread
From: Shameerali Kolothum Thodi @ 2020-03-30 8:44 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, david,
qemu-devel, Linuxarm, eric.auger, qemu-arm, xuwei (O),
imammedo, lersek
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 29 March 2020 11:46
> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
> Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
> eric.auger@redhat.com; imammedo@redhat.com; peter.maydell@linaro.org;
> shannon.zhaosl@gmail.com; xiaoguangrong.eric@gmail.com;
> david@redhat.com; xuwei (O) <xuwei5@huawei.com>; lersek@redhat.com;
> Linuxarm <linuxarm@huawei.com>
> Subject: Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support
>
> On Wed, Mar 11, 2020 at 05:20:04PM +0000, Shameer Kolothum wrote:
> > This series adds NVDIMM support to arm/virt platform.
>
>
> So I'm still confused about whether there's a bugfix here
> that we need for 5.0. If yes pls post just that part
> with acks included and for-5.0 in the subject.
Ok. I can send the first 4 patches in this series as general fixes,
but as I mentioned earlier they only matter if we add nvdimm arm/virt
support. The only case I am not sure that may break x86 is the RSDP
table update and the resulting size inconsistency during migration
discussed in patch #2.
Anyways I think it is better to send those separately.
Thanks,
Shameer
> > The series reuses some of the patches posted by Eric
> > in his earlier attempt here[1].
> >
> > This also include few fixes to qemu in general which were
> > discovered while adding nvdimm support to arm/virt.
> >
> > Patch #2 addresses the issue[2] that, during migration, the
> > source and destination might end up with an inconsistency
> > in acpi table memory region sizes.
> >
> > Patch #3 is to fix the qemu_ram_resize() callback issue[2].
> >
> > Patch #4 is another fix to the nvdimm aml issue discussed
> > here[3].
> >
> > I have done a basic sanity testing of NVDIMM devices
> > with Guest booting with ACPI. Further testing is always
> > welcome.
> >
> > Please let me know your feedback.
> >
> > Thanks,
> > Shameer
> >
> > [1] https://patchwork.kernel.org/cover/10830777/
> > [2] https://patchwork.kernel.org/patch/11339591/
> > [3] https://patchwork.kernel.org/cover/11174959/
> >
> > v2 --> v3
> > - Added patch #1 and # 2 to fix the inconsistency in acpi
> > table memory region sizes during migration. Thanks to
> > David H.
> > - The fix for qemu_ram_resize() callback was modified to
> > the one in patch #3. Again thanks to David H.
> > - Addressed comments from MST and Eric on tests added.
> > - Addressed comments from Igor/MST on Integer size in patch #4
> > - Added Eric's R-by to patch #7.
> >
> > v1 --> v2
> > -Reworked patch #1 and now fix is inside qemu_ram_resize().
> > -Added patch #2 to fix the nvdim aml issue.
> > -Dropped support to DT cold plug.
> > -Updated test_acpi_virt_tcg_memhp() with pc-dimm and nvdimms(patch
> #7)
> >
> > David Hildenbrand (1):
> > exec: Fix for qemu_ram_resize() callback
> >
> > Kwangwoo Lee (2):
> > nvdimm: Use configurable ACPI IO base and size
> > hw/arm/virt: Add nvdimm hot-plug infrastructure
> >
> > Shameer Kolothum (7):
> > acpi: Use macro for table-loader file name
> > fw_cfg: Migrate ACPI table mr sizes separately
> > hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length
> > hw/arm/virt: Add nvdimm hotplug support
> > tests: Update ACPI tables list for upcoming arm/virt test changes
> > tests/bios-tables-test: Update arm/virt memhp test
> > tests/acpi: add expected tables for bios-tables-test
> >
> > docs/specs/acpi_hw_reduced_hotplug.rst | 1 +
> > exec.c | 14 +++-
> > hw/acpi/generic_event_device.c | 15 ++++-
> > hw/acpi/nvdimm.c | 72
> +++++++++++++++++----
> > hw/arm/Kconfig | 1 +
> > hw/arm/virt-acpi-build.c | 8 ++-
> > hw/arm/virt.c | 35 ++++++++--
> > hw/core/machine.c | 1 +
> > hw/i386/acpi-build.c | 8 ++-
> > hw/i386/acpi-build.h | 3 +
> > hw/i386/pc_piix.c | 2 +
> > hw/i386/pc_q35.c | 2 +
> > hw/mem/Kconfig | 2 +-
> > hw/nvram/fw_cfg.c | 86
> ++++++++++++++++++++++++-
> > include/hw/acpi/aml-build.h | 1 +
> > include/hw/acpi/generic_event_device.h | 1 +
> > include/hw/arm/virt.h | 1 +
> > include/hw/mem/nvdimm.h | 3 +
> > include/hw/nvram/fw_cfg.h | 6 ++
> > tests/data/acpi/pc/SSDT.dimmpxm | Bin 685 -> 734 bytes
> > tests/data/acpi/q35/SSDT.dimmpxm | Bin 685 -> 734 bytes
> > tests/data/acpi/virt/DSDT.memhp | Bin 6644 -> 6668 bytes
> > tests/data/acpi/virt/NFIT.memhp | Bin 0 -> 224 bytes
> > tests/data/acpi/virt/SSDT.memhp | Bin 0 -> 736 bytes
> > tests/qtest/bios-tables-test.c | 9 ++-
> > 25 files changed, 244 insertions(+), 27 deletions(-)
> > create mode 100644 tests/data/acpi/virt/NFIT.memhp
> > create mode 100644 tests/data/acpi/virt/SSDT.memhp
> >
> > --
> > 2.17.1
> >
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support
2020-03-30 8:44 ` Shameerali Kolothum Thodi
@ 2020-03-30 8:46 ` David Hildenbrand
0 siblings, 0 replies; 32+ messages in thread
From: David Hildenbrand @ 2020-03-30 8:46 UTC (permalink / raw)
To: Shameerali Kolothum Thodi, Michael S. Tsirkin
Cc: peter.maydell, xiaoguangrong.eric, shannon.zhaosl, qemu-devel,
Linuxarm, eric.auger, qemu-arm, xuwei (O),
imammedo, lersek
On 30.03.20 10:44, Shameerali Kolothum Thodi wrote:
>
>
>> -----Original Message-----
>> From: Michael S. Tsirkin [mailto:mst@redhat.com]
>> Sent: 29 March 2020 11:46
>> To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>
>> Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org;
>> eric.auger@redhat.com; imammedo@redhat.com; peter.maydell@linaro.org;
>> shannon.zhaosl@gmail.com; xiaoguangrong.eric@gmail.com;
>> david@redhat.com; xuwei (O) <xuwei5@huawei.com>; lersek@redhat.com;
>> Linuxarm <linuxarm@huawei.com>
>> Subject: Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support
>>
>> On Wed, Mar 11, 2020 at 05:20:04PM +0000, Shameer Kolothum wrote:
>>> This series adds NVDIMM support to arm/virt platform.
>>
>>
>> So I'm still confused about whether there's a bugfix here
>> that we need for 5.0. If yes pls post just that part
>> with acks included and for-5.0 in the subject.
>
> Ok. I can send the first 4 patches in this series as general fixes,
> but as I mentioned earlier they only matter if we add nvdimm arm/virt
> support. The only case I am not sure that may break x86 is the RSDP
> table update and the resulting size inconsistency during migration
> discussed in patch #2.
I think at least the first three patches fix real issues that are
possible on x86.
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2020-03-30 8:47 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-11 17:20 [PATCH v3 00/10] ARM virt: Add NVDIMM support Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 01/10] acpi: Use macro for table-loader file name Shameer Kolothum
2020-03-23 12:23 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately Shameer Kolothum
2020-03-11 17:48 ` David Hildenbrand
2020-03-11 20:43 ` Michael S. Tsirkin
2020-03-11 21:09 ` Michael S. Tsirkin
2020-03-12 9:27 ` Shameerali Kolothum Thodi
2020-03-19 17:51 ` Michael S. Tsirkin
2020-03-20 11:53 ` Shameerali Kolothum Thodi
2020-03-23 12:34 ` Igor Mammedov
2020-03-23 13:59 ` Shameerali Kolothum Thodi
2020-03-11 17:20 ` [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback Shameer Kolothum
2020-03-11 17:44 ` David Hildenbrand
2020-03-23 13:03 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length Shameer Kolothum
2020-03-23 14:59 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size Shameer Kolothum
2020-03-23 15:14 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure Shameer Kolothum
2020-03-23 15:22 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support Shameer Kolothum
2020-03-24 6:16 ` Shannon Zhao
2020-03-11 17:20 ` [PATCH v3 08/10] tests: Update ACPI tables list for upcoming arm/virt test changes Shameer Kolothum
2020-03-11 17:20 ` [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test Shameer Kolothum
2020-03-23 15:28 ` Igor Mammedov
2020-03-11 17:20 ` [PATCH v3 10/10] tests/acpi: add expected tables for bios-tables-test Shameer Kolothum
2020-03-11 19:30 ` [PATCH v3 00/10] ARM virt: Add NVDIMM support no-reply
2020-03-11 19:32 ` no-reply
2020-03-29 10:45 ` Michael S. Tsirkin
2020-03-30 8:44 ` Shameerali Kolothum Thodi
2020-03-30 8:46 ` David Hildenbrand
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.