* [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing for RISC-V
2024-08-09 3:09 [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V Haibo Xu
@ 2024-08-09 3:09 ` Haibo Xu
2024-08-09 6:16 ` Sunil V L
2024-08-19 3:54 ` Alistair Francis
2024-08-09 3:09 ` [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file " Haibo Xu
` (2 subsequent siblings)
3 siblings, 2 replies; 10+ messages in thread
From: Haibo Xu @ 2024-08-09 3:09 UTC (permalink / raw)
To: sunilvl, alistair.francis
Cc: xiaobo55x, Haibo Xu, Michael S. Tsirkin, Igor Mammedov, Ani Sinha,
qemu-devel
Add ACPI SRAT table test case for RISC-V when NUMA was enabled.
Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
---
tests/qtest/bios-tables-test.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 36e5c0adde..e79f3a03df 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1706,6 +1706,32 @@ static void test_acpi_microvm_ioapic2_tcg(void)
free_test_data(&data);
}
+static void test_acpi_riscv64_virt_tcg_numamem(void)
+{
+ test_data data = {
+ .machine = "virt",
+ .arch = "riscv64",
+ .tcg_only = true,
+ .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
+ .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
+ .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
+ .ram_start = 0x80000000ULL,
+ .scan_len = 128ULL * 1024 * 1024,
+ };
+
+ data.variant = ".numamem";
+ /*
+ * RHCT will have ISA string encoded. To reduce the effort
+ * of updating expected AML file for any new default ISA extension,
+ * use the profile rva22s64.
+ */
+ test_acpi_one(" -cpu rva22s64"
+ " -object memory-backend-ram,id=ram0,size=128M"
+ " -numa node,memdev=ram0",
+ &data);
+ free_test_data(&data);
+}
+
static void test_acpi_aarch64_virt_tcg_numamem(void)
{
test_data data = {
@@ -2466,6 +2492,8 @@ int main(int argc, char *argv[])
} else if (strcmp(arch, "riscv64") == 0) {
if (has_tcg && qtest_has_device("virtio-blk-pci")) {
qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg);
+ qtest_add_func("acpi/virt/numamem",
+ test_acpi_riscv64_virt_tcg_numamem);
}
}
ret = g_test_run();
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing for RISC-V
2024-08-09 3:09 ` [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing " Haibo Xu
@ 2024-08-09 6:16 ` Sunil V L
2024-08-19 3:54 ` Alistair Francis
1 sibling, 0 replies; 10+ messages in thread
From: Sunil V L @ 2024-08-09 6:16 UTC (permalink / raw)
To: Haibo Xu
Cc: alistair.francis, xiaobo55x, Michael S. Tsirkin, Igor Mammedov,
Ani Sinha, qemu-devel
On Fri, Aug 09, 2024 at 11:09:48AM +0800, Haibo Xu wrote:
> Add ACPI SRAT table test case for RISC-V when NUMA was enabled.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> ---
> tests/qtest/bios-tables-test.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 36e5c0adde..e79f3a03df 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1706,6 +1706,32 @@ static void test_acpi_microvm_ioapic2_tcg(void)
> free_test_data(&data);
> }
>
> +static void test_acpi_riscv64_virt_tcg_numamem(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .arch = "riscv64",
> + .tcg_only = true,
> + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
> + .ram_start = 0x80000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + data.variant = ".numamem";
> + /*
> + * RHCT will have ISA string encoded. To reduce the effort
> + * of updating expected AML file for any new default ISA extension,
> + * use the profile rva22s64.
> + */
> + test_acpi_one(" -cpu rva22s64"
> + " -object memory-backend-ram,id=ram0,size=128M"
> + " -numa node,memdev=ram0",
> + &data);
> + free_test_data(&data);
> +}
> +
> static void test_acpi_aarch64_virt_tcg_numamem(void)
> {
> test_data data = {
> @@ -2466,6 +2492,8 @@ int main(int argc, char *argv[])
> } else if (strcmp(arch, "riscv64") == 0) {
> if (has_tcg && qtest_has_device("virtio-blk-pci")) {
> qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg);
> + qtest_add_func("acpi/virt/numamem",
> + test_acpi_riscv64_virt_tcg_numamem);
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Thanks,
Sunil
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing for RISC-V
2024-08-09 3:09 ` [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing " Haibo Xu
2024-08-09 6:16 ` Sunil V L
@ 2024-08-19 3:54 ` Alistair Francis
1 sibling, 0 replies; 10+ messages in thread
From: Alistair Francis @ 2024-08-19 3:54 UTC (permalink / raw)
To: Haibo Xu
Cc: sunilvl, alistair.francis, xiaobo55x, Michael S. Tsirkin,
Igor Mammedov, Ani Sinha, qemu-devel
On Fri, Aug 9, 2024 at 12:50 PM Haibo Xu <haibo1.xu@intel.com> wrote:
>
> Add ACPI SRAT table test case for RISC-V when NUMA was enabled.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> tests/qtest/bios-tables-test.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 36e5c0adde..e79f3a03df 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1706,6 +1706,32 @@ static void test_acpi_microvm_ioapic2_tcg(void)
> free_test_data(&data);
> }
>
> +static void test_acpi_riscv64_virt_tcg_numamem(void)
> +{
> + test_data data = {
> + .machine = "virt",
> + .arch = "riscv64",
> + .tcg_only = true,
> + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
> + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
> + .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
> + .ram_start = 0x80000000ULL,
> + .scan_len = 128ULL * 1024 * 1024,
> + };
> +
> + data.variant = ".numamem";
> + /*
> + * RHCT will have ISA string encoded. To reduce the effort
> + * of updating expected AML file for any new default ISA extension,
> + * use the profile rva22s64.
> + */
> + test_acpi_one(" -cpu rva22s64"
> + " -object memory-backend-ram,id=ram0,size=128M"
> + " -numa node,memdev=ram0",
> + &data);
> + free_test_data(&data);
> +}
> +
> static void test_acpi_aarch64_virt_tcg_numamem(void)
> {
> test_data data = {
> @@ -2466,6 +2492,8 @@ int main(int argc, char *argv[])
> } else if (strcmp(arch, "riscv64") == 0) {
> if (has_tcg && qtest_has_device("virtio-blk-pci")) {
> qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg);
> + qtest_add_func("acpi/virt/numamem",
> + test_acpi_riscv64_virt_tcg_numamem);
> }
> }
> ret = g_test_run();
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file for RISC-V
2024-08-09 3:09 [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V Haibo Xu
2024-08-09 3:09 ` [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing " Haibo Xu
@ 2024-08-09 3:09 ` Haibo Xu
2024-08-09 6:17 ` Sunil V L
` (2 more replies)
2024-08-09 6:14 ` [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data " Sunil V L
2024-08-19 3:50 ` Alistair Francis
3 siblings, 3 replies; 10+ messages in thread
From: Haibo Xu @ 2024-08-09 3:09 UTC (permalink / raw)
To: sunilvl, alistair.francis
Cc: xiaobo55x, Haibo Xu, Michael S. Tsirkin, Igor Mammedov, Ani Sinha,
qemu-devel
As per the step 5 in the process documented in bios-tables-test.c,
generate the expected ACPI SRAT AML data file for RISC-V using the
rebuild-expected-aml.sh script and update the
bios-tables-test-allowed-diff.h.
This is a new file being added for the first time. Hence, iASL diff
output is not added.
Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
---
tests/data/acpi/riscv64/virt/SRAT.numamem | Bin 0 -> 108 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
2 files changed, 1 deletion(-)
diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2b6467364b7673c366c9abf948142eaf60c9311f 100644
GIT binary patch
literal 108
zcmWFzatz5~U|?XDb@F%i2v%^42yj*a0!E-1hz+7a7zWryU@U|<qXt~80m|Zli6H9*
E0AFAS0RR91
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 a3e01d2eb7..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/riscv64/virt/SRAT.numamem",
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file for RISC-V
2024-08-09 3:09 ` [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file " Haibo Xu
@ 2024-08-09 6:17 ` Sunil V L
2024-08-19 3:54 ` Alistair Francis
2024-08-19 4:50 ` Alistair Francis
2 siblings, 0 replies; 10+ messages in thread
From: Sunil V L @ 2024-08-09 6:17 UTC (permalink / raw)
To: Haibo Xu
Cc: alistair.francis, xiaobo55x, Michael S. Tsirkin, Igor Mammedov,
Ani Sinha, qemu-devel
On Fri, Aug 09, 2024 at 11:09:49AM +0800, Haibo Xu wrote:
> As per the step 5 in the process documented in bios-tables-test.c,
> generate the expected ACPI SRAT AML data file for RISC-V using the
> rebuild-expected-aml.sh script and update the
> bios-tables-test-allowed-diff.h.
>
> This is a new file being added for the first time. Hence, iASL diff
> output is not added.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> ---
> tests/data/acpi/riscv64/virt/SRAT.numamem | Bin 0 -> 108 bytes
> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
> 2 files changed, 1 deletion(-)
>
> diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2b6467364b7673c366c9abf948142eaf60c9311f 100644
> GIT binary patch
> literal 108
> zcmWFzatz5~U|?XDb@F%i2v%^42yj*a0!E-1hz+7a7zWryU@U|<qXt~80m|Zli6H9*
> E0AFAS0RR91
>
> 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 a3e01d2eb7..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,2 +1 @@
> /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/riscv64/virt/SRAT.numamem",
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Thanks,
Sunil
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file for RISC-V
2024-08-09 3:09 ` [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file " Haibo Xu
2024-08-09 6:17 ` Sunil V L
@ 2024-08-19 3:54 ` Alistair Francis
2024-08-19 4:50 ` Alistair Francis
2 siblings, 0 replies; 10+ messages in thread
From: Alistair Francis @ 2024-08-19 3:54 UTC (permalink / raw)
To: Haibo Xu
Cc: sunilvl, alistair.francis, xiaobo55x, Michael S. Tsirkin,
Igor Mammedov, Ani Sinha, qemu-devel
On Fri, Aug 9, 2024 at 12:50 PM Haibo Xu <haibo1.xu@intel.com> wrote:
>
> As per the step 5 in the process documented in bios-tables-test.c,
> generate the expected ACPI SRAT AML data file for RISC-V using the
> rebuild-expected-aml.sh script and update the
> bios-tables-test-allowed-diff.h.
>
> This is a new file being added for the first time. Hence, iASL diff
> output is not added.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> tests/data/acpi/riscv64/virt/SRAT.numamem | Bin 0 -> 108 bytes
> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
> 2 files changed, 1 deletion(-)
>
> diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2b6467364b7673c366c9abf948142eaf60c9311f 100644
> GIT binary patch
> literal 108
> zcmWFzatz5~U|?XDb@F%i2v%^42yj*a0!E-1hz+7a7zWryU@U|<qXt~80m|Zli6H9*
> E0AFAS0RR91
>
> 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 a3e01d2eb7..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,2 +1 @@
> /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/riscv64/virt/SRAT.numamem",
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file for RISC-V
2024-08-09 3:09 ` [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file " Haibo Xu
2024-08-09 6:17 ` Sunil V L
2024-08-19 3:54 ` Alistair Francis
@ 2024-08-19 4:50 ` Alistair Francis
2 siblings, 0 replies; 10+ messages in thread
From: Alistair Francis @ 2024-08-19 4:50 UTC (permalink / raw)
To: Haibo Xu
Cc: sunilvl, alistair.francis, xiaobo55x, Michael S. Tsirkin,
Igor Mammedov, Ani Sinha, qemu-devel
On Fri, Aug 9, 2024 at 12:50 PM Haibo Xu <haibo1.xu@intel.com> wrote:
>
> As per the step 5 in the process documented in bios-tables-test.c,
> generate the expected ACPI SRAT AML data file for RISC-V using the
> rebuild-expected-aml.sh script and update the
> bios-tables-test-allowed-diff.h.
>
> This is a new file being added for the first time. Hence, iASL diff
> output is not added.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Thanks!
Applied to riscv-to-apply.next
Alistair
> ---
> tests/data/acpi/riscv64/virt/SRAT.numamem | Bin 0 -> 108 bytes
> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
> 2 files changed, 1 deletion(-)
>
> diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2b6467364b7673c366c9abf948142eaf60c9311f 100644
> GIT binary patch
> literal 108
> zcmWFzatz5~U|?XDb@F%i2v%^42yj*a0!E-1hz+7a7zWryU@U|<qXt~80m|Zli6H9*
> E0AFAS0RR91
>
> 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 a3e01d2eb7..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,2 +1 @@
> /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/riscv64/virt/SRAT.numamem",
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V
2024-08-09 3:09 [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V Haibo Xu
2024-08-09 3:09 ` [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing " Haibo Xu
2024-08-09 3:09 ` [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file " Haibo Xu
@ 2024-08-09 6:14 ` Sunil V L
2024-08-19 3:50 ` Alistair Francis
3 siblings, 0 replies; 10+ messages in thread
From: Sunil V L @ 2024-08-09 6:14 UTC (permalink / raw)
To: Haibo Xu
Cc: alistair.francis, xiaobo55x, Michael S. Tsirkin, Igor Mammedov,
Ani Sinha, qemu-devel
On Fri, Aug 09, 2024 at 11:09:47AM +0800, Haibo Xu wrote:
> As per process documented (steps 1-3) in bios-tables-test.c, add
> empty AML data file for RISC-V ACPI SRAT table and add the entry
> in bios-tables-test-allowed-diff.h.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> ---
> tests/data/acpi/riscv64/virt/SRAT.numamem | 0
> tests/qtest/bios-tables-test-allowed-diff.h | 1 +
> 2 files changed, 1 insertion(+)
> create mode 100644 tests/data/acpi/riscv64/virt/SRAT.numamem
>
> diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem
> 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 dfb8523c8b..a3e01d2eb7 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,2 @@
> /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/riscv64/virt/SRAT.numamem",
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Thanks,
Sunil
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V
2024-08-09 3:09 [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V Haibo Xu
` (2 preceding siblings ...)
2024-08-09 6:14 ` [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data " Sunil V L
@ 2024-08-19 3:50 ` Alistair Francis
3 siblings, 0 replies; 10+ messages in thread
From: Alistair Francis @ 2024-08-19 3:50 UTC (permalink / raw)
To: Haibo Xu
Cc: sunilvl, alistair.francis, xiaobo55x, Michael S. Tsirkin,
Igor Mammedov, Ani Sinha, qemu-devel
On Fri, Aug 9, 2024 at 12:50 PM Haibo Xu <haibo1.xu@intel.com> wrote:
>
> As per process documented (steps 1-3) in bios-tables-test.c, add
> empty AML data file for RISC-V ACPI SRAT table and add the entry
> in bios-tables-test-allowed-diff.h.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> tests/data/acpi/riscv64/virt/SRAT.numamem | 0
> tests/qtest/bios-tables-test-allowed-diff.h | 1 +
> 2 files changed, 1 insertion(+)
> create mode 100644 tests/data/acpi/riscv64/virt/SRAT.numamem
>
> diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem
> 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 dfb8523c8b..a3e01d2eb7 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,2 @@
> /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/riscv64/virt/SRAT.numamem",
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread