| Message ID | 20230316095432.1514080-3-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | edk2: update to 2023-02 stable tag | expand |
On Thu, 16 Mar 2023 10:54:28 +0100 Gerd Hoffmann <kraxel@redhat.com> wrote: > Recent edk2 versions don't boot with very small numa nodes. > Bump the size from 64M to 128M. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/qtest/bios-tables-test.c | 6 +++--- > tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes > tests/data/acpi/virt/SSDT.memhp | Bin 1817 -> 1817 bytes binary blob updates should be in a separate patch with this fixed: Reviewed-by: Igor Mammedov <imammedo@redhat.com> > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index 76d510091177..873358943784 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void) > test_acpi_one(" -machine hmat=on" > " -cpu cortex-a57" > " -smp 4,sockets=2" > - " -m 256M" > - " -object memory-backend-ram,size=64M,id=ram0" > - " -object memory-backend-ram,size=64M,id=ram1" > + " -m 384M" > + " -object memory-backend-ram,size=128M,id=ram0" > + " -object memory-backend-ram,size=128M,id=ram1" > " -object memory-backend-ram,size=128M,id=ram2" > " -numa node,nodeid=0,memdev=ram0" > " -numa node,nodeid=1,memdev=ram1" > diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt > index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644 > GIT binary patch > delta 67 > zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6 > AJ^%m! > > delta 59 > zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66 > > diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp > index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644 > GIT binary patch > delta 22 > dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG- > > delta 22 > dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG- >
On Tue, Mar 28, 2023 at 02:03:38PM +0200, Igor Mammedov wrote: > On Thu, 16 Mar 2023 10:54:28 +0100 > Gerd Hoffmann <kraxel@redhat.com> wrote: > > > Recent edk2 versions don't boot with very small numa nodes. > > Bump the size from 64M to 128M. > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > tests/qtest/bios-tables-test.c | 6 +++--- > > > tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes > > tests/data/acpi/virt/SSDT.memhp | Bin 1817 -> 1817 bytes > binary blob updates should be in a separate patch Won't that break git bisect if it lands on the commit with the bios-tables-test.c change and is thus missing the corresponding blob change ? > > with this fixed: > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > > > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > > index 76d510091177..873358943784 100644 > > --- a/tests/qtest/bios-tables-test.c > > +++ b/tests/qtest/bios-tables-test.c > > @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void) > > test_acpi_one(" -machine hmat=on" > > " -cpu cortex-a57" > > " -smp 4,sockets=2" > > - " -m 256M" > > - " -object memory-backend-ram,size=64M,id=ram0" > > - " -object memory-backend-ram,size=64M,id=ram1" > > + " -m 384M" > > + " -object memory-backend-ram,size=128M,id=ram0" > > + " -object memory-backend-ram,size=128M,id=ram1" > > " -object memory-backend-ram,size=128M,id=ram2" > > " -numa node,nodeid=0,memdev=ram0" > > " -numa node,nodeid=1,memdev=ram1" > > diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt > > index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644 > > GIT binary patch > > delta 67 > > zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6 > > AJ^%m! > > > > delta 59 > > zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66 > > > > diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp > > index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644 > > GIT binary patch > > delta 22 > > dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG- > > > > delta 22 > > dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG- > > > > With regards, Daniel
On Tue, 28 Mar 2023 13:09:37 +0100 Daniel P. Berrangé <berrange@redhat.com> wrote: > On Tue, Mar 28, 2023 at 02:03:38PM +0200, Igor Mammedov wrote: > > On Thu, 16 Mar 2023 10:54:28 +0100 > > Gerd Hoffmann <kraxel@redhat.com> wrote: > > > > > Recent edk2 versions don't boot with very small numa nodes. > > > Bump the size from 64M to 128M. > > > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > > --- > > > tests/qtest/bios-tables-test.c | 6 +++--- > > > > > tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes > > > tests/data/acpi/virt/SSDT.memhp | Bin 1817 -> 1817 bytes > > binary blob updates should be in a separate patch > > Won't that break git bisect if it lands on the commit with the > bios-tables-test.c change and is thus missing the corresponding > blob change ? nope, before change is introduced the affected blobs are white-listed (see patch 1/6 (btw it should be fixed to inl, all affected blobs)) and the patch updating blobs also may cleanup whitelist as well or do it in separate patch (but it's usually done at the same time). The process is described in at the top of tests/qtest/bios-tables-test.c > > > > > with this fixed: > > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > > > > > > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > > > index 76d510091177..873358943784 100644 > > > --- a/tests/qtest/bios-tables-test.c > > > +++ b/tests/qtest/bios-tables-test.c > > > @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void) > > > test_acpi_one(" -machine hmat=on" > > > " -cpu cortex-a57" > > > " -smp 4,sockets=2" > > > - " -m 256M" > > > - " -object memory-backend-ram,size=64M,id=ram0" > > > - " -object memory-backend-ram,size=64M,id=ram1" > > > + " -m 384M" > > > + " -object memory-backend-ram,size=128M,id=ram0" > > > + " -object memory-backend-ram,size=128M,id=ram1" > > > " -object memory-backend-ram,size=128M,id=ram2" > > > " -numa node,nodeid=0,memdev=ram0" > > > " -numa node,nodeid=1,memdev=ram1" > > > diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt > > > index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644 > > > GIT binary patch > > > delta 67 > > > zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6 > > > AJ^%m! > > > > > > delta 59 > > > zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66 > > > > > > diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp > > > index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644 > > > GIT binary patch > > > delta 22 > > > dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG- > > > > > > delta 22 > > > dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG- > > > > > > > > > With regards, > Daniel
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 76d510091177..873358943784 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void) test_acpi_one(" -machine hmat=on" " -cpu cortex-a57" " -smp 4,sockets=2" - " -m 256M" - " -object memory-backend-ram,size=64M,id=ram0" - " -object memory-backend-ram,size=64M,id=ram1" + " -m 384M" + " -object memory-backend-ram,size=128M,id=ram0" + " -object memory-backend-ram,size=128M,id=ram1" " -object memory-backend-ram,size=128M,id=ram2" " -numa node,nodeid=0,memdev=ram0" " -numa node,nodeid=1,memdev=ram1"
Recent edk2 versions don't boot with very small numa nodes. Bump the size from 64M to 128M. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/qtest/bios-tables-test.c | 6 +++--- tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes tests/data/acpi/virt/SSDT.memhp | Bin 1817 -> 1817 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644 GIT binary patch delta 67 zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6 AJ^%m! delta 59 zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66 diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644 GIT binary patch delta 22 dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG- delta 22 dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG-