Message ID | 20230705120631.27670-5-npiggin@gmail.com |
---|---|
State | New |
Headers | show |
Series | ppc/pnv: SMT support for powernv | expand |
On 7/5/23 14:06, Nicholas Piggin wrote: > This copies ppc_pseries.py to start a set of powernv tests, including > a Linux boot test for the newly added SMT mode. > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > I didn't add the powernv10 support yet as Cedric suggested, and kept the > same vmlinuz because it's common with the pseries tests. We should do > that in later tests though. Might be time to update default to power10 > soon if the model is becoming more complete... power10 is as good as power9, I would say. power9 has been the default for 4 years now. power9 systems are publicly available though. As you wish. If we had some ways to deactivate the doorbells when booting Linux, we would test XIVE with the CPU IPIs also with the tests you introduced. Pity this wasn't merged : https://lore.kernel.org/all/20211105102636.1016378-12-clg@kaod.org/ May be it is possible to tweak the CPU features in OPAL with a QEMU DT property to remove doorbells ? C. > > Thanks, > Nick > > tests/avocado/ppc_powernv.py | 87 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 87 insertions(+) > create mode 100644 tests/avocado/ppc_powernv.py > > diff --git a/tests/avocado/ppc_powernv.py b/tests/avocado/ppc_powernv.py > new file mode 100644 > index 0000000000..d0e5c07bde > --- /dev/null > +++ b/tests/avocado/ppc_powernv.py > @@ -0,0 +1,87 @@ > +# Test that Linux kernel boots on ppc powernv machines and check the console > +# > +# Copyright (c) 2018, 2020 Red Hat, Inc. > +# > +# This work is licensed under the terms of the GNU GPL, version 2 or > +# later. See the COPYING file in the top-level directory. > + > +from avocado.utils import archive > +from avocado_qemu import QemuSystemTest > +from avocado_qemu import wait_for_console_pattern > + > +class powernvMachine(QemuSystemTest): > + > + timeout = 90 > + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' > + panic_message = 'Kernel panic - not syncing' > + good_message = 'VFS: Cannot open root device' > + > + def do_test_linux_boot(self): > + self.require_accelerator("tcg") > + kernel_url = ('https://archives.fedoraproject.org/pub/archive' > + '/fedora-secondary/releases/29/Everything/ppc64le/os' > + '/ppc/ppc64/vmlinuz') > + kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > + > + self.vm.set_console() > + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' > + self.vm.add_args('-kernel', kernel_path, > + '-append', kernel_command_line) > + self.vm.launch() > + > + def test_linux_boot(self): > + """ > + :avocado: tags=arch:ppc64 > + :avocado: tags=machine:powernv > + :avocado: tags=accel:tcg > + """ > + > + self.do_test_linux_boot() > + console_pattern = 'VFS: Cannot open root device' > + wait_for_console_pattern(self, console_pattern, self.panic_message) > + > + def test_linux_smp_boot(self): > + """ > + :avocado: tags=arch:ppc64 > + :avocado: tags=machine:powernv > + :avocado: tags=accel:tcg > + """ > + > + self.vm.add_args('-smp', '4') > + self.do_test_linux_boot() > + console_pattern = 'smp: Brought up 1 node, 4 CPUs' > + wait_for_console_pattern(self, console_pattern, self.panic_message) > + wait_for_console_pattern(self, self.good_message, self.panic_message) > + > + def test_linux_smt_boot(self): > + """ > + :avocado: tags=arch:ppc64 > + :avocado: tags=machine:powernv > + :avocado: tags=accel:tcg > + """ > + > + self.vm.add_args('-smp', '4,threads=4') > + self.do_test_linux_boot() > + console_pattern = 'CPU maps initialized for 4 threads per core' > + wait_for_console_pattern(self, console_pattern, self.panic_message) > + console_pattern = 'smp: Brought up 1 node, 4 CPUs' > + wait_for_console_pattern(self, console_pattern, self.panic_message) > + wait_for_console_pattern(self, self.good_message, self.panic_message) > + > + def test_linux_big_boot(self): > + """ > + :avocado: tags=arch:ppc64 > + :avocado: tags=machine:powernv > + :avocado: tags=accel:tcg > + """ > + > + self.vm.add_args('-smp', '16,threads=4,cores=2,sockets=2') > + > + # powernv does not support NUMA > + self.do_test_linux_boot() > + console_pattern = 'CPU maps initialized for 4 threads per core' > + wait_for_console_pattern(self, console_pattern, self.panic_message) > + console_pattern = 'smp: Brought up 2 nodes, 16 CPUs' > + wait_for_console_pattern(self, console_pattern, self.panic_message) > + wait_for_console_pattern(self, self.good_message, self.panic_message)
diff --git a/tests/avocado/ppc_powernv.py b/tests/avocado/ppc_powernv.py new file mode 100644 index 0000000000..d0e5c07bde --- /dev/null +++ b/tests/avocado/ppc_powernv.py @@ -0,0 +1,87 @@ +# Test that Linux kernel boots on ppc powernv machines and check the console +# +# Copyright (c) 2018, 2020 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado.utils import archive +from avocado_qemu import QemuSystemTest +from avocado_qemu import wait_for_console_pattern + +class powernvMachine(QemuSystemTest): + + timeout = 90 + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + panic_message = 'Kernel panic - not syncing' + good_message = 'VFS: Cannot open root device' + + def do_test_linux_boot(self): + self.require_accelerator("tcg") + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/ppc64le/os' + '/ppc/ppc64/vmlinuz') + kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + self.vm.set_console() + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' + self.vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.launch() + + def test_linux_boot(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:powernv + :avocado: tags=accel:tcg + """ + + self.do_test_linux_boot() + console_pattern = 'VFS: Cannot open root device' + wait_for_console_pattern(self, console_pattern, self.panic_message) + + def test_linux_smp_boot(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:powernv + :avocado: tags=accel:tcg + """ + + self.vm.add_args('-smp', '4') + self.do_test_linux_boot() + console_pattern = 'smp: Brought up 1 node, 4 CPUs' + wait_for_console_pattern(self, console_pattern, self.panic_message) + wait_for_console_pattern(self, self.good_message, self.panic_message) + + def test_linux_smt_boot(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:powernv + :avocado: tags=accel:tcg + """ + + self.vm.add_args('-smp', '4,threads=4') + self.do_test_linux_boot() + console_pattern = 'CPU maps initialized for 4 threads per core' + wait_for_console_pattern(self, console_pattern, self.panic_message) + console_pattern = 'smp: Brought up 1 node, 4 CPUs' + wait_for_console_pattern(self, console_pattern, self.panic_message) + wait_for_console_pattern(self, self.good_message, self.panic_message) + + def test_linux_big_boot(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:powernv + :avocado: tags=accel:tcg + """ + + self.vm.add_args('-smp', '16,threads=4,cores=2,sockets=2') + + # powernv does not support NUMA + self.do_test_linux_boot() + console_pattern = 'CPU maps initialized for 4 threads per core' + wait_for_console_pattern(self, console_pattern, self.panic_message) + console_pattern = 'smp: Brought up 2 nodes, 16 CPUs' + wait_for_console_pattern(self, console_pattern, self.panic_message) + wait_for_console_pattern(self, self.good_message, self.panic_message)