migration, powerpc improvements
Subsystems (7)
v7 cover migration, powerpc improvements
Tree here
https://gitlab.com/npiggin/kvm-unit-tests/-/tree/powerpc?ref_type=heads
Sorry I lost the v6 tag on the previous series. Since then, I merged the series with the migration ones since they touch the same things.
Addressed almost all comments since the last post, I think just one case where a "elif kvm" branch was kept in the powerpc/run script because I find it convenient to add KVM specific things there if needed.
Main changes since v6 (thanks to reviewers):
- Rebased on new stack backtrace patches, and cherry picks from v6.
- Move new files to SPDX headers.
- Improve comments on and simplify interrupt stack frame and backtracing.
- Add a docs/ directory with unittests.cfg documentation deduplicated from arch code and moved there, and document new machine= option. Not exactly 1:1 move of comments, so suggestions and improvements welcome there.
- Made new shell script a bit more consistent with style. I do have shellcheck working and some patches started, btw., will look at submitting that after this series.
- Fix up a few unittests and gitlab CI to avoid failing on the QEMU TCG migration bug. Reduced runtime of some of the new migration tests.
Thanks,
Nick
Nicholas Piggin (35):
arch-run: Add functions to help handle migration directives from test
arch-run: Keep infifo open
migration: Add a migrate_skip command
(arm|s390): Use migrate_skip in test cases
arch-run: Add a "continuous" migration option for tests
gitlab-ci: Run migration selftest on s390x and powerpc
common: add memory dirtying vs migration test
powerpc: Fix KVM caps on POWER9 hosts
powerpc: Fix stack backtrace termination
powerpc: interrupt stack backtracing
powerpc/sprs: Specify SPRs with data rather than code powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing
doc: start documentation directory with unittests.cfg doc
scripts: allow machine option to be specified in unittests.cfg
scripts: Accommodate powerpc powernv machine differences
powerpc: Support powernv machine with QEMU TCG
powerpc: Fix emulator illegal instruction test for powernv powerpc/sprs: Test hypervisor registers on powernv machine
powerpc: general interrupt tests
powerpc: Add rtas stop-self support
powerpc: Remove broken SMP exception stack setup
powerpc: add SMP and IPI support
powerpc: Permit ACCEL=tcg,thread=single
powerpc: Avoid using larx/stcx. in spinlocks when only one CPU is
running
powerpc: Add atomics tests
powerpc: Add timebase tests
powerpc: Add MMU support
common/sieve: Use vmalloc.h for setup_mmu definition common/sieve: Support machines without MMU
powerpc: Add sieve.c common test
powerpc: add usermode support
powerpc: add pmu tests
configure: Make arch_libdir a first-class entity
powerpc: Remove remnants of ppc64 directory and build structure
powerpc: gitlab CI update
.gitlab-ci.yml | 26 +-
MAINTAINERS | 1 -
Makefile | 2 +-
arm/gic.c | 21 +-
arm/unittests.cfg | 26 +-
common/memory-verify.c | 67 +++
common/selftest-migration.c | 26 +-
common/sieve.c | 15 +-
configure | 58 +-
docs/unittests.txt | 95 ++++
lib/libcflat.h | 2 -
lib/migrate.c | 37 +-
lib/migrate.h | 5 +
lib/{ppc64 => powerpc}/asm-offsets.c | 7 +
lib/{ppc64 => powerpc}/asm/asm-offsets.h | 0
lib/powerpc/asm/atomic.h | 6 +
lib/powerpc/asm/barrier.h | 12 +
lib/{ppc64 => powerpc}/asm/bitops.h | 4 +-
lib/powerpc/asm/hcall.h | 6 +
lib/{ppc64 => powerpc}/asm/io.h | 4 +-
lib/powerpc/asm/mmu.h | 10 +
lib/powerpc/asm/opal.h | 22 +
lib/powerpc/asm/page.h | 65 +++
lib/powerpc/asm/pgtable-hwdef.h | 66 +++
lib/powerpc/asm/pgtable.h | 125 +++++
lib/powerpc/asm/processor.h | 63 +++
lib/{ppc64 => powerpc}/asm/ptrace.h | 22 +-
lib/powerpc/asm/reg.h | 42 ++
lib/powerpc/asm/rtas.h | 2 +
lib/powerpc/asm/setup.h | 3 +-
lib/powerpc/asm/smp.h | 50 +-
lib/powerpc/asm/spinlock.h | 11 +
lib/powerpc/asm/stack.h | 3 +
lib/{ppc64 => powerpc}/asm/vpa.h | 0
lib/powerpc/hcall.c | 4 +-
lib/powerpc/io.c | 41 +-
lib/powerpc/io.h | 6 +
lib/powerpc/mmu.c | 274 ++++++++++
lib/powerpc/opal-calls.S | 50 ++
lib/powerpc/opal.c | 76 +++
lib/powerpc/processor.c | 91 +++-
lib/powerpc/rtas.c | 81 ++-
lib/powerpc/setup.c | 159 +++++-
lib/powerpc/smp.c | 287 ++++++++--
lib/powerpc/spinlock.c | 33 ++
lib/powerpc/stack.c | 53 ++
lib/ppc64/.gitignore | 1 -
lib/ppc64/asm/barrier.h | 9 -
lib/ppc64/asm/handlers.h | 1 -
lib/ppc64/asm/hcall.h | 1 -
lib/ppc64/asm/memory_areas.h | 6 -
lib/ppc64/asm/page.h | 1 -
lib/ppc64/asm/ppc_asm.h | 1 -
lib/ppc64/asm/processor.h | 1 -
lib/ppc64/asm/reg.h | 1 -
lib/ppc64/asm/rtas.h | 1 -
lib/ppc64/asm/setup.h | 1 -
lib/ppc64/asm/smp.h | 1 -
lib/ppc64/asm/spinlock.h | 6 -
lib/ppc64/asm/stack.h | 8 -
lib/s390x/io.c | 1 +
lib/s390x/uv.h | 1 +
lib/vmalloc.c | 7 +
lib/vmalloc.h | 2 +
lib/x86/vm.h | 1 +
powerpc/Makefile | 111 +++-
powerpc/Makefile.common | 85 ---
powerpc/Makefile.ppc64 | 27 -
powerpc/atomics.c | 374 +++++++++++++
powerpc/cstart64.S | 66 ++-
powerpc/emulator.c | 16 +
powerpc/interrupts.c | 516 ++++++++++++++++++
powerpc/memory-verify.c | 1 +
powerpc/pmu.c | 336 ++++++++++++
powerpc/run | 42 +-
powerpc/selftest.c | 4 +-
powerpc/sieve.c | 1 +
powerpc/smp.c | 348 ++++++++++++
powerpc/sprs.c | 659 ++++++++++++++++-------
powerpc/timebase.c | 329 +++++++++++
powerpc/tm.c | 4 +-
powerpc/unittests.cfg | 101 +++-
riscv/unittests.cfg | 26 +-
s390x/Makefile | 1 +
s390x/memory-verify.c | 1 +
s390x/migration-cmm.c | 8 +-
s390x/migration-skey.c | 4 +-
s390x/migration.c | 1 +
s390x/mvpg.c | 1 +
s390x/selftest.c | 1 +
s390x/unittests.cfg | 37 +-
scripts/arch-run.bash | 116 +++-
scripts/common.bash | 8 +-
scripts/runtime.bash | 22 +-
x86/pmu.c | 1 +
x86/pmu_lbr.c | 1 +
x86/unittests.cfg | 26 +-
x86/vmexit.c | 1 +
x86/vmware_backdoors.c | 1 +
99 files changed, 4729 insertions(+), 657 deletions(-)
create mode 100644 common/memory-verify.c
create mode 100644 docs/unittests.txt
rename lib/{ppc64 => powerpc}/asm-offsets.c (94%)
rename lib/{ppc64 => powerpc}/asm/asm-offsets.h (100%)
create mode 100644 lib/powerpc/asm/atomic.h
create mode 100644 lib/powerpc/asm/barrier.h
rename lib/{ppc64 => powerpc}/asm/bitops.h (69%)
rename lib/{ppc64 => powerpc}/asm/io.h (50%)
create mode 100644 lib/powerpc/asm/mmu.h
create mode 100644 lib/powerpc/asm/opal.h
create mode 100644 lib/powerpc/asm/page.h
create mode 100644 lib/powerpc/asm/pgtable-hwdef.h
create mode 100644 lib/powerpc/asm/pgtable.h
rename lib/{ppc64 => powerpc}/asm/ptrace.h (59%)
create mode 100644 lib/powerpc/asm/spinlock.h
rename lib/{ppc64 => powerpc}/asm/vpa.h (100%)
create mode 100644 lib/powerpc/mmu.c
create mode 100644 lib/powerpc/opal-calls.S
create mode 100644 lib/powerpc/opal.c
create mode 100644 lib/powerpc/spinlock.c
create mode 100644 lib/powerpc/stack.c
delete mode 100644 lib/ppc64/.gitignore
delete mode 100644 lib/ppc64/asm/barrier.h
delete mode 100644 lib/ppc64/asm/handlers.h
delete mode 100644 lib/ppc64/asm/hcall.h
delete mode 100644 lib/ppc64/asm/memory_areas.h
delete mode 100644 lib/ppc64/asm/page.h
delete mode 100644 lib/ppc64/asm/ppc_asm.h
delete mode 100644 lib/ppc64/asm/processor.h
delete mode 100644 lib/ppc64/asm/reg.h
delete mode 100644 lib/ppc64/asm/rtas.h
delete mode 100644 lib/ppc64/asm/setup.h
delete mode 100644 lib/ppc64/asm/smp.h
delete mode 100644 lib/ppc64/asm/spinlock.h
delete mode 100644 lib/ppc64/asm/stack.h
delete mode 100644 powerpc/Makefile.common
delete mode 100644 powerpc/Makefile.ppc64
create mode 100644 powerpc/atomics.c
create mode 100644 powerpc/interrupts.c
create mode 120000 powerpc/memory-verify.c
create mode 100644 powerpc/pmu.c
create mode 120000 powerpc/sieve.c
create mode 100644 powerpc/smp.c
create mode 100644 powerpc/timebase.c
create mode 120000 s390x/memory-verify.cSignature · 1 line
2.42.0
PATCH v7 1/35 arch-run: Add functions to help handle migration directives from test
The migration harness will be expanded to deal with more commands from the test, moving these checks into functions helps keep things managable.
--- scripts/arch-run.bash | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
scripts/arch-run.bash +15 -5
@@ -122,6 +122,16 @@ qmp_events () jq -c 'select(has("event"))' } +filter_quiet_msgs () +{ + grep -v "Now migrate the VM (quiet)" +} + +seen_migrate_msg () +{ + grep -q -e "Now migrate the VM" < $1 +} + run_migration () { if ! command -v ncat >/dev/null 2>&1; then
@@ -152,7 +162,7 @@ run_migration () -chardev socket,id=mon,path=${src_qmp},server=on,wait=off \ -mon chardev=mon,mode=control > ${src_outfifo} & live_pid=$! - cat ${src_outfifo} | tee ${src_out} | grep -v "Now migrate the VM (quiet)" & + cat ${src_outfifo} | tee ${src_out} | filter_quiet_msgs & # Start the first destination QEMU machine in advance of the test # reaching the migration point, since we expect at least one migration.
@@ -162,7 +172,7 @@ run_migration () while ps -p ${live_pid} > /dev/null ; do # Wait for test exit or further migration messages. - if ! grep -q -i "Now migrate the VM" < ${src_out} ; then + if ! seen_migrate_msg ${src_out} ; then sleep 0.1 else do_migration || return $?
@@ -190,11 +200,11 @@ do_migration () -mon chardev=mon,mode=control -incoming unix:${dst_incoming} \ < <(cat ${dst_infifo}) > ${dst_outfifo} & incoming_pid=$! - cat ${dst_outfifo} | tee ${dst_out} | grep -v "Now migrate the VM (quiet)" & + cat ${dst_outfifo} | tee ${dst_out} | filter_quiet_msgs & # The test must prompt the user to migrate, so wait for the - # "Now migrate VM" console message. - while ! grep -q -i "Now migrate the VM" < ${src_out} ; do + # "Now migrate VM" or similar console message. + while ! seen_migrate_msg ${src_out} ; do if ! ps -p ${live_pid} > /dev/null ; then echo "ERROR: Test exit before migration point." >&2 echo > ${dst_infifo}
Signature · 1 line
2.42.0
Re: [kvm-unit-tests PATCH v7 01/35] arch-run: Add functions to help handle migration directives from test
Quoted 8 lines · Nicholas Piggin
The migration harness will be expanded to deal with more commands from the test, moving these checks into functions helps keep things managable.
Signed-off-by Nicholas Piggin <[email protected]>--- scripts/arch-run.bash | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
PATCH v7 2/35 arch-run: Keep infifo open
In reply to Nicholas PigginThe infifo fifo that is used to send characters to QEMU console is only able to receive one character before the cat process exits. Supporting interactions between test and harness involving multiple characters requires the fifo to remain open.
The infifo is removed by the exit handler like other files and fifos so it does not have to be removed explicitly.
With this we can let the cat out of the subshell, simplifying the input pipeline.
--- scripts/arch-run.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
scripts/arch-run.bash +6 -6
@@ -158,6 +158,11 @@ run_migration () mkfifo ${src_outfifo} mkfifo ${dst_outfifo} + # Holding both ends of the input fifo open prevents opens from + # blocking and readers getting EOF when a writer closes it. + mkfifo ${dst_infifo} + exec {dst_infifo_fd}<>${dst_infifo} + eval "$migcmdline" \ -chardev socket,id=mon,path=${src_qmp},server=on,wait=off \ -mon chardev=mon,mode=control > ${src_outfifo} &
@@ -191,14 +196,10 @@ run_migration () do_migration () { - # We have to use cat to open the named FIFO, because named FIFO's, - # unlike pipes, will block on open() until the other end is also - # opened, and that totally breaks QEMU... - mkfifo ${dst_infifo} eval "$migcmdline" \ -chardev socket,id=mon,path=${dst_qmp},server=on,wait=off \ -mon chardev=mon,mode=control -incoming unix:${dst_incoming} \ - < <(cat ${dst_infifo}) > ${dst_outfifo} & + < ${dst_infifo} > ${dst_outfifo} & incoming_pid=$! cat ${dst_outfifo} | tee ${dst_out} | filter_quiet_msgs &
@@ -245,7 +246,6 @@ do_migration () # keypress to dst so getchar completes and test continues echo > ${dst_infifo} - rm ${dst_infifo} # Wait for the incoming socket being removed, ready for next destination while [ -S ${dst_incoming} ] ; do sleep 0.1 ; done
Signature · 1 line
2.42.0
PATCH v7 3/35 migration: Add a migrate_skip command
In reply to Nicholas PigginTests that are run with MIGRATION=yes but skip due to some requirement not being met will show as a failure due to the harness requirement to see one successful migration. The workaround for this is to migrate in test's skip path. Add a new command that just tells the harness to not expect a migration.
--- common/selftest-migration.c | 14 ++++++++----- lib/migrate.c | 19 ++++++++++++++++- lib/migrate.h | 2 ++ powerpc/unittests.cfg | 6 ++++++ s390x/unittests.cfg | 5 +++++ scripts/arch-run.bash | 41 +++++++++++++++++++++++++++++-------- 6 files changed, 73 insertions(+), 14 deletions(-)
common/selftest-migration.c +9 -5
@@ -14,14 +14,18 @@int main (int argc,char **argv) { -int i =0 ; -report_prefix_push ("migration" ); -for (i =0 ; i <NR_MIGRATIONS ; i++) -migrate_quiet (); +if (argc >1 && !strcmp (argv[1 ],"skip" )) { +migrate_skip (); +report (true,"migration skipping" ); + }else { +int i; -report (true,"simple harness stress test" ); +for (i =0 ; i <NR_MIGRATIONS ; i++) +migrate_quiet (); +report (true,"simple harness stress" ); + }report_prefix_pop ();
lib/migrate.c +18 -1
@@ -39,7 +39,24 @@ void migrate_once(void)if (migrated)return ; - migrated = true; +migrate (); } + +/* +* When the test has been started in migration mode, but the test case is +* skipped and no migration point is reached, this can be used to tell the +* harness not to mark it as a failure to migrate. +*/ +void migrate_skip (void ) +{ +static bool did_migrate_skip; + +if (did_migrate_skip) +return ; + did_migrate_skip = true; + +puts ("Skipped VM migration (quiet)\n" ); + (void )getchar (); +}
lib/migrate.h +2 -0
@@ -9,3 +9,5 @@void migrate (void );void migrate_quiet (void );void migrate_once (void ); + +void migrate_skip (void );
powerpc/unittests.cfg +6 -0
@@ -43,6 +43,12 @@ groups = selftest migration # https://lore.kernel.org/qemu-devel/[email protected]/ accel = kvm +[selftest-migration-skip] +file = selftest-migration.elf +machine = pseries +groups = selftest migration +extra_params = -append "skip" + [spapr_hcall] file = spapr_hcall.elf
s390x/unittests.cfg +5 -0
@@ -31,6 +31,11 @@ groups = selftest migration # https://lore.kernel.org/qemu-devel/[email protected]/ accel = kvm +[selftest-migration-skip] +file = selftest-migration.elf +groups = selftest migration +extra_params = -append "skip" + [intercept] file = intercept.elf
scripts/arch-run.bash +33 -8
103 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH v7 4/35 (arm|s390): Use migrate_skip in test cases
In reply to Nicholas PigginHave tests use the new migrate_skip command in skip paths, rather than calling migrate_once to prevent harness reporting an error.
s390x/migration.c adds a new command that looks like it was missing previously.
--- arm/gic.c | 21 ++++++++++++--------- s390x/migration-cmm.c | 8 ++++---- s390x/migration-skey.c | 4 +++- s390x/migration.c | 1 + 4 files changed, 20 insertions(+), 14 deletions(-)
arm/gic.c +12 -9
@@ -782,13 +782,15 @@ static void test_its_migration(void)struct its_device *dev2, *dev7;cpumask_t mask; -if (its_setup1 ()) +if (its_setup1 ()) { +migrate_skip ();return ; + } dev2 =its_get_device (2 ); dev7 =its_get_device (7 ); -migrate_once (); +migrate ();stats_reset ();cpumask_clear (&mask);
@@ -819,8 +821,10 @@ static void test_migrate_unmapped_collection(void)int pe0 =0 ;u8 config; -if (its_setup1 ()) +if (its_setup1 ()) { +migrate_skip ();return ; + }if (!errata (ERRATA_UNMAPPED_COLLECTIONS )) { report_skip("Skipping test, as this test hangs without the fix. "
@@ -836,7 +840,7 @@ static void test_migrate_unmapped_collection(void)its_send_mapti (dev2,8192 ,0 , col);gicv3_lpi_set_config (8192 ,LPI_PROP_DEFAULT ); -migrate_once (); +migrate ();/* on the destination, map the collection */ its_send_mapc (col, true);
@@ -875,8 +879,10 @@ static void test_its_pending_migration(void)void *ptr;int i; -if (its_prerequisites (4 )) +if (its_prerequisites (4 )) { +migrate_skip ();return ; + } dev =its_create_device (2 /* dev id */ ,8 /* nb_ites */ );its_send_mapd (dev, true);
@@ -923,7 +929,7 @@ static void test_its_pending_migration(void)gicv3_lpi_rdist_enable (pe0);gicv3_lpi_rdist_enable (pe1); -migrate_once (); +migrate ();/* let's wait for the 256 LPIs to be handled */ mdelay (1000 );
@@ -970,17 +976,14 @@ int main(int argc, char **argv) }else if (!strcmp (argv[1 ],"its-migration" )) {report_prefix_push (argv[1 ]);test_its_migration (); -migrate_once ();report_prefix_pop (); }else if (!strcmp (argv[1 ],"its-pending-migration" )) {report_prefix_push (argv[1 ]);test_its_pending_migration (); -migrate_once ();report_prefix_pop (); }else if (!strcmp (argv[1 ],"its-migrate-unmapped-collection" )) {report_prefix_push (argv[1 ]);test_migrate_unmapped_collection (); -migrate_once ();report_prefix_pop (); }else if (strcmp (argv[1 ],"its-introspection" ) ==0 ) {report_prefix_push (argv[1 ]);
s390x/migration-cmm.c +4 -4
@@ -55,12 +55,12 @@ int main(void) {report_prefix_push ("migration-cmm" ); -if (!check_essa_available ()) +if (!check_essa_available ()) {report_skip ("ESSA is not available" ); -else +migrate_skip (); + }else {test_migration (); - -migrate_once (); + }report_prefix_pop ();return report_summary ();
s390x/migration-skey.c +3 -1
@@ -169,6 +169,7 @@ static void test_skey_migration_parallel(void)if (smp_query_num_cpus () ==1 ) {report_skip ("need at least 2 cpus for this test" ); +migrate_skip (); goto error; }
@@ -233,6 +234,7 @@ int main(int argc, char **argv)if (test_facility (169 )) {report_skip ("storage key removal facility is active" ); +migrate_skip (); goto error; }
@@ -247,11 +249,11 @@ int main(int argc, char **argv)break ;default :print_usage (); +migrate_skip ();break ; } error: -migrate_once ();report_prefix_pop ();return report_summary (); }
s390x/migration.c +1 -0
@@ -164,6 +164,7 @@ int main(void)if (smp_query_num_cpus () ==1 ) {report_skip ("need at least 2 cpus for this test" ); +migrate_skip (); goto done; }
Signature · 1 line
2.42.0
PATCH v7 5/35 arch-run: Add a "continuous" migration option for tests
In reply to Nicholas PigginThe cooperative migration protocol is very good to control precise pre and post conditions for a migration event. However in some cases its intrusiveness to the test program, can mask problems and make analysis more difficult.
For example to stress test migration vs concurrent complicated memory access, including TLB refill, ram dirtying, etc., then the tight spin at getchar() and resumption of the workload after migration is unhelpful.
This adds a continuous migration mode that directs the harness to perform migrations continually. This is added to the migration selftests, which also sees cooperative migration iterations reduced to avoid increasing test time too much.
--- common/selftest-migration.c | 16 +++++++++-- lib/migrate.c | 18 ++++++++++++ lib/migrate.h | 3 ++ scripts/arch-run.bash | 55 ++++++++++++++++++++++++++++++++----- 4 files changed, 82 insertions(+), 10 deletions(-)
common/selftest-migration.c +13 -3
@@ -9,12 +9,13 @@*/ #include <libcflat.h> #include <migrate.h> +#include <asm/time.h> -#define NR_MIGRATIONS 30 +#define NR_MIGRATIONS 15int main (int argc,char **argv) { -report_prefix_push ("migration" ); +report_prefix_push ("migration harness" );if (argc >1 && !strcmp (argv[1 ],"skip" )) {migrate_skip ();
@@ -24,7 +25,16 @@ int main(int argc, char **argv)for (i =0 ; i <NR_MIGRATIONS ; i++)migrate_quiet (); -report (true,"simple harness stress" ); +report (true,"cooperative migration" ); + +migrate_begin_continuous (); +mdelay (2000 ); +migrate_end_continuous (); +mdelay (1000 ); +migrate_begin_continuous (); +mdelay (2000 ); +migrate_end_continuous (); +report (true,"continuous migration" ); }report_prefix_pop ();
lib/migrate.c +18 -0
@@ -60,3 +60,21 @@ void migrate_skip(void)puts ("Skipped VM migration (quiet)\n" ); (void )getchar (); } + +void migrate_begin_continuous (void ) +{ +puts ("Begin continuous migration\n" ); + (void )getchar (); +} + +void migrate_end_continuous (void ) +{ +/* +* Migration can split this output between source and dest QEMU +* output files, print twice and match once to always cope with +* a split. +*/ +puts ("End continuous migration\n" ); +puts ("End continuous migration (quiet)\n" ); + (void )getchar (); +}
lib/migrate.h +3 -0
@@ -11,3 +11,6 @@ void migrate_quiet(void);void migrate_once (void );void migrate_skip (void ); + +void migrate_begin_continuous (void ); +void migrate_end_continuous (void );
scripts/arch-run.bash +48 -7
105 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH v7 6/35 gitlab-ci: Run migration selftest on s390x and powerpc
In reply to Nicholas PigginThe migration harness is complicated and easy to break so CI will be helpful.
--- .gitlab-ci.yml | 18 +++++++++++------- s390x/unittests.cfg | 8 ++++++++ 2 files changed, 19 insertions(+), 7 deletions(-)
.gitlab-ci.yml +11 -7
@@ -92,26 +92,28 @@ build-arm: build-ppc64be: extends: .outoftree_template script: - - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu + - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - mkdir build - cd build - ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh - selftest-setup spapr_hcall rtas-get-time-of-day rtas-get-time-of-day-base - rtas-set-time-of-day emulator + selftest-setup selftest-migration selftest-migration-skip spapr_hcall + rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day + emulator | tee results.txt - if grep -q FAIL results.txt ; then exit 1 ; fi build-ppc64le: extends: .intree_template script: - - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu + - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh - selftest-setup spapr_hcall rtas-get-time-of-day rtas-get-time-of-day-base - rtas-set-time-of-day emulator + selftest-setup selftest-migration selftest-migration-skip spapr_hcall + rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day + emulator | tee results.txt - if grep -q FAIL results.txt ; then exit 1 ; fi
@@ -135,7 +137,7 @@ build-riscv64: build-s390x: extends: .outoftree_template script: - - dnf install -y qemu-system-s390x gcc-s390x-linux-gnu + - dnf install -y qemu-system-s390x gcc-s390x-linux-gnu nmap-ncat - mkdir build - cd build - ../configure --arch=s390x --cross-prefix=s390x-linux-gnu-
@@ -161,6 +163,8 @@ build-s390x: sclp-1g sclp-3g selftest-setup + selftest-migration-kvm + selftest-migration-skip sieve smp stsi
s390x/unittests.cfg +8 -0
@@ -31,6 +31,14 @@ groups = selftest migration # https://lore.kernel.org/qemu-devel/[email protected]/ accel = kvm +[selftest-migration-kvm] +file = selftest-migration.elf +groups = nodefault +accel = kvm +# This is a special test for gitlab-ci that can must not use TCG until the +# TCG migration fix has made its way into CI environment's QEMU. +# https://lore.kernel.org/qemu-devel/[email protected]/ + [selftest-migration-skip] file = selftest-migration.elf groups = selftest migration
Signature · 1 line
2.42.0
Re: [kvm-unit-tests PATCH v7 06/35] gitlab-ci: Run migration selftest on s390x and powerpc
Quoted 18 lines · Nicholas Piggin
The migration harness is complicated and easy to break so CI will be helpful.
Signed-off-by Nicholas Piggin <[email protected]>--- .gitlab-ci.yml | 18 +++++++++++------- s390x/unittests.cfg | 8 ++++++++ 2 files changed, 19 insertions(+), 7 deletions(-).gitlab-ci.yml +0
-1@@ -92,26 +92,28 @@ build-arm: build-ppc64be: extends: .outoftree_template script: - - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu
.gitlab-ci.yml build-arm: · line 102
Quoted 10 lines
.gitlab-ci.yml +3
-2+ - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - mkdir build - cd build - ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh - selftest-setup spapr_hcall rtas-get-time-of-day rtas-get-time-of-day-base - rtas-set-time-of-day emulator + selftest-setup selftest-migration selftest-migration-skip spapr_hcall + rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day
I used to squash as much as possible into one line in the past, but nowadays I rather prefer one test per line (like it is done for s390x below), so that it is easier to identify the changes ... So if you like, I think you could also put each test on a separate line here now (since you're touching all lines with tests here anyway).
Quoted 43 lines
.gitlab-ci.yml +8
-4+ emulator | tee results.txt - if grep -q FAIL results.txt ; then exit 1 ; fi build-ppc64le: extends: .intree_template script: - - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu + - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh - selftest-setup spapr_hcall rtas-get-time-of-day rtas-get-time-of-day-base - rtas-set-time-of-day emulator + selftest-setup selftest-migration selftest-migration-skip spapr_hcall + rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day + emulator | tee results.txt - if grep -q FAIL results.txt ; then exit 1 ; fi@@ -135,7 +137,7 @@ build-riscv64: build-s390x: extends: .outoftree_template script: - - dnf install -y qemu-system-s390x gcc-s390x-linux-gnu + - dnf install -y qemu-system-s390x gcc-s390x-linux-gnu nmap-ncat - mkdir build - cd build - ../configure --arch=s390x --cross-prefix=s390x-linux-gnu-@@ -161,6 +163,8 @@ build-s390x: sclp-1g sclp-3g selftest-setup + selftest-migration-kvm + selftest-migration-skip sieve smp stsis390x/unittests.cfg +0
-0
s390x/unittests.cfg groups = selftest migration · line 38
Quoted 8 lines
s390x/unittests.cfg +5
-0@@ -31,6 +31,14 @@ groups = selftest migration # https://lore.kernel.org/qemu-devel/[email protected]/ accel = kvm +[selftest-migration-kvm] +file = selftest-migration.elf +groups = nodefault +accel = kvm +# This is a special test for gitlab-ci that can must not use TCG until the
"can" or "must"?
s390x/unittests.cfg groups = selftest migration · line 44
Quoted 6 lines
s390x/unittests.cfg +3
-0+# TCG migration fix has made its way into CI environment's QEMU. +# https://lore.kernel.org/qemu-devel/[email protected]/ + [selftest-migration-skip] file = selftest-migration.elf groups = selftest migration
Thomas
Re: [kvm-unit-tests PATCH v7 06/35] gitlab-ci: Run migration selftest on s390x and powerpc
Quoted 27 lines · Thomas Huth
Quoted 26 lines · Nicholas Piggin
The migration harness is complicated and easy to break so CI will be helpful.
Signed-off-by Nicholas Piggin <[email protected]>--- .gitlab-ci.yml | 18 +++++++++++------- s390x/unittests.cfg | 8 ++++++++ 2 files changed, 19 insertions(+), 7 deletions(-).gitlab-ci.yml +1
-3@@ -92,26 +92,28 @@ build-arm: build-ppc64be: extends: .outoftree_template script: - - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu + - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - mkdir build - cd build - ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh - selftest-setup spapr_hcall rtas-get-time-of-day rtas-get-time-of-day-base - rtas-set-time-of-day emulator
Quoted 8 lines
.gitlab-ci.yml build-arm: · line 102
Quoted 2 lines
.gitlab-ci.yml +2
-0+ selftest-setup selftest-migration selftest-migration-skip spapr_hcall + rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-dayI used to squash as much as possible into one line in the past, but nowadays I rather prefer one test per line (like it is done for s390x below), so that it is easier to identify the changes ...
So if you like, I think you could also put each test on a separate line here now (since you're touching all lines with tests here anyway).
Yeah it is nicer.
Quoted 47 lines
Quoted 47 lines
.gitlab-ci.yml +8
-4+ emulator | tee results.txt - if grep -q FAIL results.txt ; then exit 1 ; fi build-ppc64le: extends: .intree_template script: - - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu + - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh - selftest-setup spapr_hcall rtas-get-time-of-day rtas-get-time-of-day-base - rtas-set-time-of-day emulator + selftest-setup selftest-migration selftest-migration-skip spapr_hcall + rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day + emulator | tee results.txt - if grep -q FAIL results.txt ; then exit 1 ; fi@@ -135,7 +137,7 @@ build-riscv64: build-s390x: extends: .outoftree_template script: - - dnf install -y qemu-system-s390x gcc-s390x-linux-gnu + - dnf install -y qemu-system-s390x gcc-s390x-linux-gnu nmap-ncat - mkdir build - cd build - ../configure --arch=s390x --cross-prefix=s390x-linux-gnu-@@ -161,6 +163,8 @@ build-s390x: sclp-1g sclp-3g selftest-setup + selftest-migration-kvm + selftest-migration-skip sieve smp stsis390x/unittests.cfg +0
-0@@ -31,6 +31,14 @@ groups = selftest migration # https://lore.kernel.org/qemu-devel/[email protected]/ accel = kvm
Quoted 7 lines
s390x/unittests.cfg groups = selftest migration · line 38
Quoted 5 lines
s390x/unittests.cfg +5
-0+[selftest-migration-kvm] +file = selftest-migration.elf +groups = nodefault +accel = kvm +# This is a special test for gitlab-ci that can must not use TCG until the"can" or "must"?
I think it must be "must not".
Thanks,
Nick
PATCH v7 7/35 common: add memory dirtying vs migration test
In reply to Nicholas PigginThis test stores to a bunch of pages and verifies previous stores, while being continually migrated. Default runtime is 5 seconds.
Add this test to ppc64 and s390x builds. This can fail due to a QEMU TCG physical memory dirty bitmap bug, so it is not enabled in unittests for TCG yet.
The selftest-migration test time is reduced significantly because this test
--- common/memory-verify.c | 67 +++++++++++++++++++++++++++++++++++++ common/selftest-migration.c | 8 ++--- powerpc/Makefile.common | 1 + powerpc/memory-verify.c | 1 + powerpc/unittests.cfg | 7 ++++ s390x/Makefile | 1 + s390x/memory-verify.c | 1 + s390x/unittests.cfg | 6 ++++ 8 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 common/memory-verify.c create mode 120000 powerpc/memory-verify.c create mode 120000 s390x/memory-verify.c
common/memory-verify.c new file +67 -0
@@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Simple memory verification test, used to exercise dirty memory migration. +*/ +#include <libcflat.h> +#include <migrate.h> +#include <alloc.h> +#include <asm/page.h> +#include <asm/time.h> + +#define NR_PAGES 32 + +static unsigned time_sec =5 ; + +static void do_getopts (int argc,char **argv) +{ +int i; + +for (i =0 ; i < argc; ++i) { +if (strcmp (argv[i],"-t" ) ==0 ) { + i++; +if (i == argc) +break ; + time_sec =atol (argv[i]); + } + } + +printf ("running for %d secs\n" , time_sec); +} + +int main (int argc,char **argv) +{ +void *mem =malloc (NR_PAGES *PAGE_SIZE ); +bool success = true; +uint64_t ms; +long i; + +do_getopts (argc, argv); + +report_prefix_push ("memory" ); + +memset (mem,0 ,NR_PAGES *PAGE_SIZE ); + +migrate_begin_continuous (); + ms =get_clock_ms (); + i =0 ; +do { +int j; + +for (j =0 ; j <NR_PAGES *PAGE_SIZE ; j +=PAGE_SIZE ) { +if (*(volatile long *)(mem + j) != i) { + success = false; + goto out; + } + *(volatile long *)(mem + j) = i +1 ; + } + i++; + }while (get_clock_ms () - ms < time_sec *1000 ); +out: +migrate_end_continuous (); + +report (success,"memory verification stress test" ); + +report_prefix_pop (); + +return report_summary (); +}
common/selftest-migration.c +4 -4
@@ -11,7 +11,7 @@#include <migrate.h> #include <asm/time.h> -#define NR_MIGRATIONS 15 +#define NR_MIGRATIONS 5int main (int argc,char **argv) {
@@ -28,11 +28,11 @@ int main(int argc, char **argv)report (true,"cooperative migration" );migrate_begin_continuous (); -mdelay (2000 ); -migrate_end_continuous ();mdelay (1000 ); +migrate_end_continuous (); +mdelay (500 );migrate_begin_continuous (); -mdelay (2000 ); +mdelay (1000 );migrate_end_continuous ();report (true,"continuous migration" ); }
powerpc/Makefile.common +1 -0
@@ -7,6 +7,7 @@ tests-common = \ $(TEST_DIR)/selftest.elf \ $(TEST_DIR)/selftest-migration.elf \ + $(TEST_DIR)/memory-verify.elf \ $(TEST_DIR)/spapr_hcall.elf \ $(TEST_DIR)/rtas.elf \ $(TEST_DIR)/emulator.elf \
powerpc/memory-verify.c new file +1 -0
@@ -0,0 +1 @@ +../common/memory-verify.c
powerpc/unittests.cfg +7 -0
@@ -49,6 +49,13 @@ machine = pseries groups = selftest migration extra_params = -append "skip" +# This fails due to a QEMU TCG bug so KVM-only until QEMU is fixed upstream +[migration-memory] +file = memory-verify.elf +accel = kvm +machine = pseries +groups = migration + [spapr_hcall] file = spapr_hcall.elf
s390x/Makefile +1 -0
@@ -1,5 +1,6 @@ tests = $(TEST_DIR)/selftest.elf tests += $(TEST_DIR)/selftest-migration.elf +tests += $(TEST_DIR)/memory-verify.elf tests += $(TEST_DIR)/intercept.elf tests += $(TEST_DIR)/emulator.elf tests += $(TEST_DIR)/sieve.elf
s390x/memory-verify.c new file +1 -0
@@ -0,0 +1 @@ +../common/memory-verify.c
s390x/unittests.cfg +6 -0
@@ -44,6 +44,12 @@ file = selftest-migration.elf groups = selftest migration extra_params = -append "skip" +# This fails due to a QEMU TCG bug so KVM-only until QEMU is fixed upstream +[migration-memory] +file = memory-verify.elf +accel = kvm +groups = migration + [intercept] file = intercept.elf
Signature · 1 line
2.42.0
Re: [kvm-unit-tests PATCH v7 07/35] common: add memory dirtying vs migration test
Quoted 54 lines · Nicholas Piggin
This test stores to a bunch of pages and verifies previous stores, while being continually migrated. Default runtime is 5 seconds.
Add this test to ppc64 and s390x builds. This can fail due to a QEMU TCG physical memory dirty bitmap bug, so it is not enabled in unittests for TCG yet.
The selftest-migration test time is reduced significantly because this test
Signed-off-by Nicholas Piggin <[email protected]>--- common/memory-verify.c | 67 +++++++++++++++++++++++++++++++++++++ common/selftest-migration.c | 8 ++--- powerpc/Makefile.common | 1 + powerpc/memory-verify.c | 1 + powerpc/unittests.cfg | 7 ++++ s390x/Makefile | 1 + s390x/memory-verify.c | 1 + s390x/unittests.cfg | 6 ++++ 8 files changed, 88 insertions(+), 4 deletions(-)create mode 100644
common/memory-verify.c
create mode 120000powerpc/memory-verify.c
create mode 120000s390x/memory-verify.ccommon/memory-verify.c new file +23
-0@@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Simple memory verification test, used to exercise dirty memory migration. +*/ +#include <libcflat.h> +#include <migrate.h> +#include <alloc.h> +#include <asm/page.h> +#include <asm/time.h> + +#define NR_PAGES 32 + +static unsigned time_sec =5 ; + +static void do_getopts (int argc,char **argv) +{ +int i; + +for (i =0 ; i < argc; ++i) { +if (strcmp (argv[i],"-t" ) ==0 ) { + i++; +if (i == argc) +break ;
common/memory-verify.c line 33
Quoted 10 lines
common/memory-verify.c new file +10
-0+ time_sec =atol (argv[i]); + } + } + +printf ("running for %d secs\n" , time_sec); +} + +int main (int argc,char **argv) +{ +void *mem =malloc (NR_PAGES *PAGE_SIZE );
Use alloc_pages(5) instead ? Or add at least some white spaces around "*".
Apart from that this patch looks sane to me, so with that line fixed:
Re: [kvm-unit-tests PATCH v7 07/35] common: add memory dirtying vs migration test
Quoted 59 lines · Thomas Huth
Quoted 58 lines · Nicholas Piggin
This test stores to a bunch of pages and verifies previous stores, while being continually migrated. Default runtime is 5 seconds.
Add this test to ppc64 and s390x builds. This can fail due to a QEMU TCG physical memory dirty bitmap bug, so it is not enabled in unittests for TCG yet.
The selftest-migration test time is reduced significantly because this test
Signed-off-by Nicholas Piggin <[email protected]>--- common/memory-verify.c | 67 +++++++++++++++++++++++++++++++++++++ common/selftest-migration.c | 8 ++--- powerpc/Makefile.common | 1 + powerpc/memory-verify.c | 1 + powerpc/unittests.cfg | 7 ++++ s390x/Makefile | 1 + s390x/memory-verify.c | 1 + s390x/unittests.cfg | 6 ++++ 8 files changed, 88 insertions(+), 4 deletions(-)create mode 100644
common/memory-verify.c
create mode 120000powerpc/memory-verify.c
create mode 120000s390x/memory-verify.ccommon/memory-verify.c new file +27
-0@@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Simple memory verification test, used to exercise dirty memory migration. +*/ +#include <libcflat.h> +#include <migrate.h> +#include <alloc.h> +#include <asm/page.h> +#include <asm/time.h> + +#define NR_PAGES 32 + +static unsigned time_sec =5 ; + +static void do_getopts (int argc,char **argv) +{ +int i; + +for (i =0 ; i < argc; ++i) { +if (strcmp (argv[i],"-t" ) ==0 ) { + i++; +if (i == argc) +break ; + time_sec =atol (argv[i]); + } + } +
Quoted 8 lines
common/memory-verify.c line 33
Quoted 6 lines
common/memory-verify.c new file +6
-0+printf ("running for %d secs\n" , time_sec); +} + +int main (int argc,char **argv) +{ +void *mem =malloc (NR_PAGES *PAGE_SIZE );Use
alloc_pages(5)instead ? Or add at least some white spaces around "*".
Hmm, alloc_pages is physical? Maybe I should use memalign instead (and I'll fix the space). Even though it's not using VM, we might change that.
Quoted 2 lines
Apart from that this patch looks sane to me, so with that line fixed:
Reviewed-by Thomas Huth <[email protected]>
I'll keep your R-B with the memalign change if that's okay.
Thanks,
Nick
PATCH v7 8/35 powerpc: Fix KVM caps on POWER9 hosts
In reply to Nicholas PigginKVM does not like to run on POWER9 hosts without cap-ccf-assist=off.
--- powerpc/run | 2 ++ 1 file changed, 2 insertions(+)
powerpc/run +2 -0
@@ -24,6 +24,8 @@ M+=",accel=$ACCEL$ACCEL_PROPS" if [[ "$ACCEL" == "tcg" ]] ; then M+=",cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,cap-ccf-assist=off" +elif [[ "$ACCEL" == "kvm" ]] ; then + M+=",cap-ccf-assist=off" fi command="$qemu -nodefaults $M -bios $FIRMWARE"
Signature · 1 line
2.42.0
PATCH v7 9/35 powerpc: Fix stack backtrace termination
In reply to Nicholas PigginThe backtrace handler terminates when it sees a NULL caller address, but the powerpc stack setup does not keep such a NULL caller frame at the start of the stack.
This happens to work on pseries because the memory at 0 is mapped and it contains 0 at the location of the return address pointer if it were a stack frame. But this is fragile, and does not work with powernv where address 0 contains firmware instructions.
Use the existing dummy frame on stack as the NULL caller, and create a new frame on stack for the entry code.
--- powerpc/cstart64.S | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
powerpc/cstart64.S +15 -0
@@ -46,6 +46,21 @@ start: add r1, r1, r31 add r2, r2, r31 + /* Zero backpointers in initial stack frame so backtrace() stops */ + li r0,0 + std r0,0(r1) + std r0,16(r1) + + /* + * Create entry frame of 64-bytes, same as the initial frame. A callee + * may use the caller frame to store LR, and backtrace() termination + * looks for return address == NULL, so the initial stack frame can't + * be used to call C or else it could overwrite the zeroed LR save slot + * and break backtrace termination. This frame would be unnecessary if + * backtrace looked for a zeroed frame address. + */ + stdu r1,-64(r1) + /* save DTB pointer */ std r3, 56(r1)
Signature · 1 line
2.42.0
PATCH v7 10/35 powerpc: interrupt stack backtracing
In reply to Nicholas PigginAdd support for backtracing across interrupt stacks, and add interrupt frame backtrace for unhandled interrupts.
This requires a back-chain created from initial interrupt stack frame to the r1 value of the interrupted context. A label is added at the return location of the exception handler call, so the unwinder can recognize the initial interrupt frame.
The additional cstart entry-frame is no longer required because the unwinder now looks for frame == 0 as well as address == 0.
--- lib/powerpc/processor.c | 4 +++- lib/ppc64/asm/stack.h | 3 +++ lib/ppc64/stack.c | 53 +++++++++++++++++++++++++++++++++++++++++ powerpc/Makefile.ppc64 | 1 + powerpc/cstart64.S | 15 +++--------- 5 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 lib/ppc64/stack.c
lib/powerpc/processor.c +3 -1
@@ -51,7 +51,9 @@ void do_handle_exception(struct pt_regs *regs)return ; } -printf ("unhandled cpu exception %#lx at NIA:0x%016lx MSR:0x%016lx\n" , regs->trap, regs->nip, regs->msr); +printf ("Unhandled cpu exception %#lx at NIA:0x%016lx MSR:0x%016lx\n" , + regs->trap, regs->nip, regs->msr); +dump_frame_stack ((void *)regs->nip, (void *)regs->gpr[1 ]);abort (); }
lib/ppc64/asm/stack.h +3 -0
@@ -5,4 +5,7 @@#error Do not directly include <asm/stack.h>. Just use <stack.h>.#endif +#define HAVE_ARCH_BACKTRACE +#define HAVE_ARCH_BACKTRACE_FRAME +#endif
lib/ppc64/stack.c new file +53 -0
53 lines not on this page · raw message
powerpc/Makefile.ppc64 +1 -0
@@ -17,6 +17,7 @@ cstart.o = $(TEST_DIR)/cstart64.o reloc.o = $(TEST_DIR)/reloc64.o OBJDIRS += lib/ppc64 +cflatobjs += lib/ppc64/stack.o # ppc64 specific tests tests = $(TEST_DIR)/spapr_vpa.elf
powerpc/cstart64.S +3 -12
@@ -51,16 +51,6 @@ start: std r0,0(r1) std r0,16(r1) - /* - * Create entry frame of 64-bytes, same as the initial frame. A callee - * may use the caller frame to store LR, and backtrace() termination - * looks for return address == NULL, so the initial stack frame can't - * be used to call C or else it could overwrite the zeroed LR save slot - * and break backtrace termination. This frame would be unnecessary if - * backtrace looked for a zeroed frame address. - */ - stdu r1,-64(r1) - /* save DTB pointer */ std r3, 56(r1)
@@ -195,6 +185,7 @@ call_handler: .endr mfsprg1 r0 std r0,GPR1(r1) + std r0,0(r1) /* Backchain from interrupt stack to regular stack */ /* lr, xer, ccr */
@@ -213,12 +204,12 @@ call_handler: subi r31, r31, 0b - start_text ld r2, (p_toc_text - start_text)(r31) - /* FIXME: build stack frame */ - /* call generic handler */ addi r3,r1,STACK_FRAME_OVERHEAD bl do_handle_exception + .global do_handle_exception_return +do_handle_exception_return: /* restore context */
Signature · 1 line
2.42.0
PATCH v7 11/35 powerpc/sprs: Specify SPRs with data rather than code
In reply to Nicholas PigginA significant rework that builds an array of 'struct spr', where each element describes an SPR. This makes various metadata about the SPR like name and access type easier to carry and use.
Hypervisor privileged registers are described despite not being used at the moment for completeness, but also the code might one day be reused for a hypervisor-privileged test.
--- lib/powerpc/asm/reg.h | 2 + powerpc/sprs.c | 647 +++++++++++++++++++++++++++++------------- 2 files changed, 457 insertions(+), 192 deletions(-)
lib/powerpc/asm/reg.h +2 -0
@@ -5,6 +5,8 @@#define UL (x) _AC(x, UL) +#define SPR_SRR0 0x01a +#define SPR_SRR1 0x01b#define SPR_TB 0x10c#define SPR_SPRG0 0x110#define SPR_SPRG1 0x111
powerpc/sprs.c +455 -192
709 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH v7 12/35 powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing
In reply to Nicholas PigginStoring certain values in MMCR0 can cause PMU interrupts when msleep enables MSR[EE], and this crashes the test. Freeze the PMU counters and clear any PMU exception before calling msleep.
--- lib/powerpc/asm/reg.h | 4 ++++ powerpc/sprs.c | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)
lib/powerpc/asm/reg.h +4 -0
@@ -24,6 +24,10 @@#define PVR_VER_POWER10 UL(0x00800000)#define SPR_HSRR0 0x13a#define SPR_HSRR1 0x13b +#define SPR_MMCR0 0x31b +#define MMCR0_FC UL(0x80000000) +#define MMCR0_PMAE UL(0x04000000) +#define MMCR0_PMAO UL(0x00000080)/* Machine State Register definitions: */ #define MSR_EE_BIT 15/* External Interrupts Enable */
powerpc/sprs.c +11 -6
@@ -476,12 +476,7 @@ static void set_sprs(uint64_t val)continue ;if (sprs[i].type &SPR_HARNESS )continue ; -if (!strcmp (sprs[i].name,"MMCR0" )) { -/* XXX: could use a comment or better abstraction! */ -__mtspr (i, (val &0xfffffffffbab3fffULL ) |0xfa0b2070 ); - }else { -__mtspr (i, val); - } +__mtspr (i, val); } }
@@ -538,6 +533,16 @@ int main(int argc, char **argv)if (sprs[895 ].name) before[895 ] =mfspr (895 ); }else { +/* +* msleep will enable MSR[EE] and take a decrementer +* interrupt. Must account for changed registers and +* prevent taking unhandled interrupts. +*/ +/* Prevent PMU interrupt */ +mtspr (SPR_MMCR0 , (mfspr (SPR_MMCR0 ) |MMCR0_FC ) & + ~(MMCR0_PMAO |MMCR0_PMAE )); + before[SPR_MMCR0 ] =mfspr (SPR_MMCR0 ); + before[779 ] =mfspr (SPR_MMCR0 );msleep (2000 );/* Reload regs changed by dec interrupt */
Signature · 1 line
2.42.0
PATCH v7 13/35 doc: start documentation directory with unittests.cfg doc
In reply to Nicholas PigginConsolidate unittests.cfg documentation in one place.
--- arm/unittests.cfg | 26 ++----------- docs/unittests.txt | 89 +++++++++++++++++++++++++++++++++++++++++++ powerpc/unittests.cfg | 25 ++---------- riscv/unittests.cfg | 26 ++----------- s390x/unittests.cfg | 18 ++------- x86/unittests.cfg | 26 ++----------- 6 files changed, 107 insertions(+), 103 deletions(-) create mode 100644 docs/unittests.txt
arm/unittests.cfg +4 -22
@@ -1,28 +1,10 @@ ############################################################################## # unittest configuration # -# [unittest_name] -# file = <name>.flat # Name of the flat file to be used. -# smp = <num> # Number of processors the VM will use -# # during this test. Use $MAX_SMP to use -# # the maximum the host supports. Defaults -# # to one. -# extra_params = -append <params...> # Additional parameters used. -# arch = arm|arm64 # Select one if the test case is -# # specific to only one. -# groups = <group_name1> <group_name2> ... # Used to identify test cases -# # with run_tests -g ... -# # Specify group_name=nodefault -# # to have test not run by -# # default -# accel = kvm|tcg # Optionally specify if test must run with -# # kvm or tcg. If not specified, then kvm will -# # be used when available. -# timeout = <duration> # Optionally specify a timeout. -# check = <path>=<value> # check a file for a particular value before running -# # a test. The check line can contain multiple files -# # to check separated by a space but each check -# # parameter needs to be of the form <path>=<value> +# arm specifics: +# +# file = <name>.flat # arm uses .flat files +# arch = arm|arm64 ############################################################################## #
docs/unittests.txt new file +89 -0
89 lines not on this page · raw message
powerpc/unittests.cfg +3 -22
@@ -1,28 +1,9 @@ ############################################################################## # unittest configuration # -# [unittest_name] -# file = <name>.flat # Name of the flat file to be used. -# smp = <num> # Number of processors the VM will use -# # during this test. Use $MAX_SMP to use -# # the maximum the host supports. Defaults -# # to one. -# extra_params = -append <params...> # Additional parameters used. -# arch = ppc64 # Select one if the test case is -# # specific to only one. -# groups = <group_name1> <group_name2> ... # Used to identify test cases -# # with run_tests -g ... -# # Specify group_name=nodefault -# # to have test not run by -# # default -# accel = kvm|tcg # Optionally specify if test must run with -# # kvm or tcg. If not specified, then kvm will -# # be used when available. -# timeout = <duration> # Optionally specify a timeout. -# check = <path>=<value> # check a file for a particular value before running -# # a test. The check line can contain multiple files -# # to check separated by a space but each check -# # parameter needs to be of the form <path>=<value> +# powerpc specifics: +# +# file = <name>.elf # powerpc uses .elf files ############################################################################## #
riscv/unittests.cfg +4 -22
@@ -1,28 +1,10 @@ ############################################################################## # unittest configuration # -# [unittest_name] -# file = <name>.flat # Name of the flat file to be used. -# smp = <num> # Number of processors the VM will use -# # during this test. Use $MAX_SMP to use -# # the maximum the host supports. Defaults -# # to one. -# extra_params = -append <params...> # Additional parameters used. -# arch = riscv32|riscv64 # Select one if the test case is -# # specific to only one. -# groups = <group_name1> <group_name2> ... # Used to identify test cases -# # with run_tests -g ... -# # Specify group_name=nodefault -# # to have test not run by -# # default -# accel = kvm|tcg # Optionally specify if test must run with -# # kvm or tcg. If not specified, then kvm will -# # be used when available. -# timeout = <duration> # Optionally specify a timeout. -# check = <path>=<value> # check a file for a particular value before running -# # a test. The check line can contain multiple files -# # to check separated by a space but each check -# # parameter needs to be of the form <path>=<value> +# riscv specifics: +# +# file = <name>.flat # riscv uses .flat files +# arch = riscv32|risc64 ############################################################################## [selftest]
s390x/unittests.cfg +3 -15
@@ -1,21 +1,9 @@ ############################################################################## # unittest configuration # -# [unittest_name] -# file = <name>.elf # Name of the elf file to be used. -# extra_params = -append <params...> # Additional parameters used. -# groups = <group_name1> <group_name2> ... # Used to identify test cases -# # with run_tests -g ... -# # Specify group_name=nodefault -# # to have test not run by default -# accel = kvm|tcg # Optionally specify if test must run with -# # kvm or tcg. If not specified, then kvm will -# # be used when available. -# timeout = <duration> # Optionally specify a timeout. -# check = <path>=<value> # check a file for a particular value before running -# # a test. The check line can contain multiple files -# # to check separated by a space but each check -# # parameter needs to be of the form <path>=<value> +# s390x specifics: +# +# file = <name>.elf # s390x uses .elf files ############################################################################## [selftest-setup]
x86/unittests.cfg +4 -22
@@ -1,28 +1,10 @@ ############################################################################## # unittest configuration # -# [unittest_name] -# file = <name>.flat # Name of the flat file to be used. -# smp = <num> # Number of processors the VM will use -# # during this test. Use $MAX_SMP to use -# # the maximum the host supports. Defaults -# # to one. -# extra_params = -append <params...> # Additional parameters used. -# arch = i386|x86_64 # Select one if the test case is -# # specific to only one. -# groups = <group_name1> <group_name2> ... # Used to identify test cases -# # with run_tests -g ... -# # Specify group_name=nodefault -# # to have test not run by -# # default -# accel = kvm|tcg # Optionally specify if test must run with -# # kvm or tcg. If not specified, then kvm will -# # be used when available. -# timeout = <duration> # Optionally specify a timeout. -# check = <path>=<value> # check a file for a particular value before running -# # a test. The check line can contain multiple files -# # to check separated by a space but each check -# # parameter needs to be of the form <path>=<value> +# x86 specifics: +# +# file = <name>.flat # x86 uses .flat files +# arch = i386|x86_64 ############################################################################## [apic-split]
Signature · 1 line
2.42.0
PATCH v7 14/35 scripts: allow machine option to be specified in unittests.cfg
In reply to Nicholas PigginThis allows different machines with different requirements to be supported by run_tests.sh, similarly to how different accelerators are handled.
--- docs/unittests.txt | 6 ++++++ scripts/common.bash | 8 ++++++-- scripts/runtime.bash | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-)
docs/unittests.txt +6 -0
@@ -42,6 +42,12 @@ For <arch>/ directories that support multiple architectures, this restricts the test to the specified arch. By default, the test will run on any architecture. +machine +------- +For those architectures that support multiple machine types, this allows +machine-specific tests to be created. By default, the test will run on +any machine type. + smp --- smp = <number>
scripts/common.bash +6 -2
@@ -10,6 +10,7 @@ function for_each_unittest() local opts local groups local arch + local machine local check local accel local timeout
@@ -21,7 +22,7 @@ function for_each_unittest() if [[ "$line" =~ ^\[(.*)\]$ ]]; then rematch=${BASH_REMATCH[1]} if [ -n "${testname}" ]; then - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" fi testname=$rematch smp=1
@@ -29,6 +30,7 @@ function for_each_unittest() opts="" groups="" arch="" + machine="" check="" accel="" timeout=""
@@ -58,6 +60,8 @@ function for_each_unittest() groups=${BASH_REMATCH[1]} elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then arch=${BASH_REMATCH[1]} + elif [[ $line =~ ^machine\ *=\ *(.*)$ ]]; then + machine=${BASH_REMATCH[1]} elif [[ $line =~ ^check\ *=\ *(.*)$ ]]; then check=${BASH_REMATCH[1]} elif [[ $line =~ ^accel\ *=\ *(.*)$ ]]; then
@@ -67,7 +71,7 @@ function for_each_unittest() fi done if [ -n "${testname}" ]; then - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" fi exec {fd}<&- }
scripts/runtime.bash +12 -4
@@ -30,7 +30,7 @@ premature_failure() get_cmdline() { local kernel=$1 - echo "TESTNAME=$testname TIMEOUT=$timeout ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" + echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" } skip_nodefault()
@@ -78,9 +78,10 @@ function run() local kernel="$4" local opts="$5" local arch="$6" - local check="${CHECK:-$7}" - local accel="$8" - local timeout="${9:-$TIMEOUT}" # unittests.cfg overrides the default + local machine="$7" + local check="${CHECK:-$8}" + local accel="$9" + local timeout="${10:-$TIMEOUT}" # unittests.cfg overrides the default if [ "${CONFIG_EFI}" == "y" ]; then kernel=${kernel/%.flat/.efi}
@@ -114,6 +115,13 @@ function run() return 2 fi + if [ -n "$machine" ] && [ -n "$MACHINE" ] && [ "$machine" != "$MACHINE" ]; then + print_result "SKIP" $testname "" "$machine only" + return 2 + elif [ -n "$MACHINE" ]; then + machine="$MACHINE" + fi + if [ -n "$accel" ] && [ -n "$ACCEL" ] && [ "$accel" != "$ACCEL" ]; then print_result "SKIP" $testname "" "$accel only, but ACCEL=$ACCEL" return 2
Signature · 1 line
2.42.0
PATCH v7 15/35 scripts: Accommodate powerpc powernv machine differences
In reply to Nicholas PigginThe QEMU powerpc powernv machine has minor differences that must be accommodated for in output parsing:
- Summary parsing must search more lines of output for the summary line, to accommodate OPAL message on shutdown.
- Premature failure testing must tolerate case differences in kernel load error message.
--- powerpc/unittests.cfg | 1 + scripts/runtime.bash | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)
powerpc/unittests.cfg +1 -0
@@ -4,6 +4,7 @@ # powerpc specifics: # # file = <name>.elf # powerpc uses .elf files +# machine = pseries|powernv ############################################################################## #
scripts/runtime.bash +4 -2
@@ -9,7 +9,7 @@ FAIL() { echo -ne "\e[31mFAIL\e[0m"; } extract_summary() { local cr=$'\r' - tail -3 | grep '^SUMMARY: ' | sed 's/^SUMMARY: /(/;s/'"$cr"'\{0,1\}$/)/' + tail -5 | grep '^SUMMARY: ' | sed 's/^SUMMARY: /(/;s/'"$cr"'\{0,1\}$/)/' } # We assume that QEMU is going to work if it tried to load the kernel
@@ -18,7 +18,9 @@ premature_failure() local log="$(eval "$(get_cmdline _NO_FILE_4Uhere_)" 2>&1)" echo "$log" | grep "_NO_FILE_4Uhere_" | - grep -q -e "could not \(load\|open\) kernel" -e "error loading" -e "failed to load" && + grep -q -e "[Cc]ould not \(load\|open\) kernel" \ + -e "error loading" \ + -e "failed to load" && return 1 RUNTIME_log_stderr <<< "$log"
Signature · 1 line
2.42.0
PATCH v7 16/35 powerpc: Support powernv machine with QEMU TCG
In reply to Nicholas PigginAdd support for QEMU's powernv machine. This uses standard firmware (skiboot) rather than a minimal firmware shim.
--- lib/powerpc/asm/processor.h | 23 +++++++++++ lib/powerpc/asm/reg.h | 4 ++ lib/powerpc/hcall.c | 4 +- lib/powerpc/io.c | 27 ++++++++++++- lib/powerpc/io.h | 6 +++ lib/powerpc/processor.c | 37 ++++++++++++++++++ lib/powerpc/setup.c | 14 +++++-- lib/ppc64/asm/opal.h | 15 ++++++++ lib/ppc64/opal-calls.S | 50 ++++++++++++++++++++++++ lib/ppc64/opal.c | 76 +++++++++++++++++++++++++++++++++++++ powerpc/Makefile.ppc64 | 2 + powerpc/cstart64.S | 7 ++++ powerpc/run | 42 ++++++++++++++++---- powerpc/unittests.cfg | 10 ++++- 14 files changed, 301 insertions(+), 16 deletions(-) create mode 100644 lib/ppc64/asm/opal.h create mode 100644 lib/ppc64/opal-calls.S create mode 100644 lib/ppc64/opal.c
lib/powerpc/asm/processor.h +23 -0
@@ -10,6 +10,8 @@ void handle_exception(int trap, void (*func)(struct pt_regs *, void *), void *);void do_handle_exception (struct pt_regs *regs);#endif /* __ASSEMBLY__ */ +extern bool cpu_has_hv; +static inline uint64_t mfspr (int nr) {uint64_t ret;
@@ -38,4 +40,25 @@ static inline void mtmsr(uint64_t msr) asm volatile ("mtmsrd %[msr]" :: [msr] "r" (msr) : "memory"); } +/* +* This returns true on PowerNV / OPAL machines which run in hypervisor +* mode. False on pseries / PAPR machines that run in guest mode. +*/ +static inline bool machine_is_powernv (void ) +{ +return cpu_has_hv; +} + +/* +* This returns true on pseries / PAPR / KVM machines which run under a +* hypervisor or QEMU pseries machine. False for PowerNV / OPAL. +*/ +static inline bool machine_is_pseries (void ) +{ +return !machine_is_powernv (); +} + +void enable_mcheck (void ); +void disable_mcheck (void ); +#endif /* _ASMPOWERPC_PROCESSOR_H_ */
lib/powerpc/asm/reg.h +4 -0
@@ -30,7 +30,11 @@#define MMCR0_PMAO UL(0x00000080)/* Machine State Register definitions: */ +#define MSR_LE_BIT 0#define MSR_EE_BIT 15/* External Interrupts Enable */ +#define MSR_HV_BIT 60/* Hypervisor mode */ #define MSR_SF_BIT 63/* 64-bit mode */ +#define MSR_ME UL(0x1000) +#endif
lib/powerpc/hcall.c +2 -2
@@ -25,7 +25,7 @@ int hcall_have_broken_sc1(void)return r3 == (unsigned long )H_PRIVILEGE ; } -void putchar (int c) +void papr_putchar (int c) {unsigned long vty =0 ;/* 0 == default */ unsigned long nr_chars =1 ;
@@ -34,7 +34,7 @@ void putchar(int c)hcall (H_PUT_TERM_CHAR , vty, nr_chars, chars); } -int __getchar (void ) +int __papr_getchar (void ) { register unsigned long r3 asm("r3") = H_GET_TERM_CHAR; register unsigned long r4 asm("r4") = 0; /* 0 == default vty */
lib/powerpc/io.c +25 -2
@@ -9,13 +9,33 @@#include <asm/spinlock.h> #include <asm/rtas.h> #include <asm/setup.h> +#include <asm/processor.h> #include "io.h" static struct spinlock print_lock; +void putchar (int c) +{ +if (machine_is_powernv ()) +opal_putchar (c); +else +papr_putchar (c); +} + +int __getchar (void ) +{ +if (machine_is_powernv ()) +return __opal_getchar (); +else +return __papr_getchar (); +} +void io_init (void ) { -rtas_init (); +if (machine_is_powernv ()) +assert (!opal_init ()); +else +rtas_init (); }void puts (const char *s)
@@ -38,7 +58,10 @@ void exit(int code)// FIXME: change this print-exit/rtas-poweroff to chr_testdev_exit(), // maybe by plugging chr-testdev into a spapr-vty. printf ("\nEXIT: STATUS=%d\n" , ((code) <<1 ) |1 ); -rtas_power_off (); +if (machine_is_powernv ()) +opal_power_off (); +else +rtas_power_off ();halt (code);__builtin_unreachable (); }
lib/powerpc/io.h +6 -0
@@ -8,6 +8,12 @@#define _POWERPC_IO_H_extern void io_init (void ); +extern int opal_init (void ); +extern void opal_power_off (void );extern void putchar (int c); +extern void opal_putchar (int c); +extern void papr_putchar (int c); +extern int __opal_getchar (void ); +extern int __papr_getchar (void );#endif
lib/powerpc/processor.c +37 -0
@@ -84,6 +84,16 @@ void sleep_tb(uint64_t cycles) {uint64_t start, end, now; +if (!machine_is_pseries ()) { +/* +* P9/10 Could use 'stop' to sleep here which would be +* interesting. stop with ESL=0 should be simple enough, ESL=1 +* would require SRESET based wakeup which is more involved. +*/ +delay (cycles); +return ; + } + start = now =get_tb (); end = start + cycles;
@@ -120,3 +130,30 @@ void usleep(uint64_t us) {sleep_tb ((us * tb_hz) /1000000 ); } + +static void rfid_msr (uint64_t msr) +{ +uint64_t tmp; + + asmvolatile ( +"mtsrr1 %1 \n\ +bl 0f \n\ +0: \n\ +mflr %0 \n\ +addi %0,%0,1f-0b \n\ +mtsrr0 %0 \n\ +rfid \n\ +1: \n" + :"=r" (tmp) :"r" (msr) :"lr" ); +} + +void enable_mcheck (void ) +{ +/* This is a no-op on pseries */ +rfid_msr (mfmsr () |MSR_ME ); +} + +void disable_mcheck (void ) +{ +rfid_msr (mfmsr () & ~MSR_ME ); +}
lib/powerpc/setup.c +11 -3
@@ -19,6 +19,7 @@#include <asm/setup.h> #include <asm/page.h> #include <asm/ptrace.h> +#include <asm/processor.h> #include <asm/hcall.h> #include "io.h"
@@ -85,6 +86,8 @@ static void cpu_set(int fdtnode, u64 regval, void *info) } } +bool cpu_has_hv; +static void cpu_init (void ) {struct cpu_set_params params;
@@ -98,12 +101,13 @@ static void cpu_init(void) tb_hz = params.tb_hz;/* Interrupt Endianness */ - +if (machine_is_pseries ()) {#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -hcall (H_SET_MODE ,1 ,4 ,0 ,0 ); +hcall (H_SET_MODE ,1 ,4 ,0 ,0 );#else -hcall (H_SET_MODE ,0 ,4 ,0 ,0 ); +hcall (H_SET_MODE ,0 ,4 ,0 ,0 );#endif + } }static void mem_init (phys_addr_t freemem_start)
@@ -159,6 +163,10 @@ void setup(const void *fdt)u32 fdt_size;int ret; + cpu_has_hv = !!(mfmsr () & (1ULL <<MSR_HV_BIT )); + +enable_mcheck (); +/* * Before calling mem_init we need to move the fdt and initrd * to safe locations. We move them to construct the memory
lib/ppc64/asm/opal.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ASMPPC64_OPAL_H_ +#define _ASMPPC64_OPAL_H_ + +#define OPAL_SUCCESS 0 + +#define OPAL_CONSOLE_WRITE 1 +#define OPAL_CONSOLE_READ 2 +#define OPAL_CEC_POWER_DOWN 5 +#define OPAL_POLL_EVENTS 10 +#define OPAL_REINIT_CPUS 70 +# define OPAL_REINIT_CPUS_HILE_BE (1 << 0) +# define OPAL_REINIT_CPUS_HILE_LE (1 << 1) + +#endif
lib/ppc64/opal-calls.S new file +50 -0
50 lines not on this page · raw message
lib/ppc64/opal.c new file +76 -0
76 lines not on this page · raw message
powerpc/Makefile.ppc64 +2 -0
@@ -18,6 +18,8 @@ reloc.o = $(TEST_DIR)/reloc64.o OBJDIRS += lib/ppc64 cflatobjs += lib/ppc64/stack.o +cflatobjs += lib/ppc64/opal.o +cflatobjs += lib/ppc64/opal-calls.o # ppc64 specific tests tests = $(TEST_DIR)/spapr_vpa.elf
powerpc/cstart64.S +7 -0
@@ -97,6 +97,13 @@ start: sync isync + /* powernv machine does not check broken_sc1 */ + mfmsr r3 + li r4,1 + sldi r4,r4,MSR_HV_BIT + and. r3,r3,r4 + bne 1f + /* patch sc1 if needed */ bl hcall_have_broken_sc1 cmpwi r3, 0
powerpc/run +34 -8
63 lines not on this page · raw message
powerpc/unittests.cfg +9 -1
@@ -15,11 +15,12 @@ [selftest-setup] file = selftest.elf smp = 2 -extra_params = -m 256 -append 'setup smp=2 mem=256' +extra_params = -m 1g -append 'setup smp=2 mem=1024' groups = selftest [selftest-migration] file = selftest-migration.elf +machine = pseries groups = selftest migration # TODO: Remove accel=kvm once the following TCG migration fix has been merged: # https://lore.kernel.org/qemu-devel/[email protected]/
@@ -40,24 +41,29 @@ groups = migration [spapr_hcall] file = spapr_hcall.elf +machine = pseries [spapr_vpa] file = spapr_vpa.elf +machine = pseries [rtas-get-time-of-day] file = rtas.elf +machine = pseries timeout = 5 extra_params = -append "get-time-of-day date=$(date +%s)" groups = rtas [rtas-get-time-of-day-base] file = rtas.elf +machine = pseries timeout = 5 extra_params = -rtc base="2006-06-17" -append "get-time-of-day date=$(date --date="2006-06-17 UTC" +%s)" groups = rtas [rtas-set-time-of-day] file = rtas.elf +machine = pseries extra_params = -append "set-time-of-day" timeout = 5 groups = rtas
@@ -67,6 +73,7 @@ file = emulator.elf [h_cede_tm] file = tm.elf +machine = pseries accel = kvm smp = 2,threads=2 extra_params = -machine cap-htm=on -append "h_cede_tm"
@@ -77,5 +84,6 @@ file = sprs.elf [sprs-migration] file = sprs.elf +machine = pseries extra_params = -append '-w' groups = migration
Signature · 1 line
2.42.0
PATCH v7 17/35 powerpc: Fix emulator illegal instruction test for powernv
In reply to Nicholas PigginIllegal instructions cause 0xe40 (HEAI) interrupts rather than program interrupts.
--- lib/powerpc/asm/processor.h | 1 + lib/powerpc/setup.c | 13 +++++++++++++ powerpc/emulator.c | 16 ++++++++++++++++ 3 files changed, 30 insertions(+)
lib/powerpc/asm/processor.h +1 -0
@@ -11,6 +11,7 @@ void do_handle_exception(struct pt_regs *regs);#endif /* __ASSEMBLY__ */ extern bool cpu_has_hv; +extern bool cpu_has_heai;static inline uint64_t mfspr (int nr) {
lib/powerpc/setup.c +13 -0
@@ -87,6 +87,7 @@ static void cpu_set(int fdtnode, u64 regval, void *info) }bool cpu_has_hv; +bool cpu_has_heai;static void cpu_init (void ) {
@@ -108,6 +109,18 @@ static void cpu_init(void)hcall (H_SET_MODE ,0 ,4 ,0 ,0 );#endif } + +switch (mfspr (SPR_PVR ) &PVR_VERSION_MASK ) { +case PVR_VER_POWER10 : +case PVR_VER_POWER9 : +case PVR_VER_POWER8E : +case PVR_VER_POWER8NVL : +case PVR_VER_POWER8 : + cpu_has_heai = true; +break ; +default : +break ; + } }static void mem_init (phys_addr_t freemem_start)
powerpc/emulator.c +16 -0
@@ -31,6 +31,20 @@ static void program_check_handler(struct pt_regs *regs, void *opaque) regs->nip +=4 ; } +static void heai_handler (struct pt_regs *regs,void *opaque) +{ +int *data = opaque; + +if (verbose) { +printf ("Detected invalid instruction %#018lx: %08x\n" , + regs->nip, *(uint32_t *)regs->nip); + } + + *data =8 ;/* Illegal instruction */ + + regs->nip +=4 ; +} +static void alignment_handler (struct pt_regs *regs,void *opaque) {int *data = opaque;
@@ -363,6 +377,8 @@ int main(int argc, char **argv)int i;handle_exception (0x700 , program_check_handler, (void *)&is_invalid); +if (cpu_has_heai) +handle_exception (0xe40 , heai_handler, (void *)&is_invalid);handle_exception (0x600 , alignment_handler, (void *)&alignment);for (i =1 ; i < argc; i++) {
Signature · 1 line
2.42.0
PATCH v7 18/35 powerpc/sprs: Test hypervisor registers on powernv machine
In reply to Nicholas PigginThis enables HV privilege registers to be tested with the powernv machine.
--- powerpc/sprs.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-)
powerpc/sprs.c +25 -8
@@ -199,16 +199,16 @@ static const struct spr sprs_power_common[1024] = { [190] = { "HFSCR", 64, HV_RW, }, [256] = { "VRSAVE", 32, RW, }, [259] = { "SPRG3", 64, RO, }, -[284] = { "TBL", 32, HV_WO, }, -[285] = { "TBU", 32, HV_WO, }, -[286] = { "TBU40", 64, HV_WO, }, +[284] = { "TBL", 32, HV_WO, }, /* Things can go a bit wonky with */ +[285] = { "TBU", 32, HV_WO, }, /* Timebase changing. Should save */ +[286] = { "TBU40", 64, HV_WO, }, /* and restore it. */ [304] = { "HSPRG0", 64, HV_RW, }, [305] = { "HSPRG1", 64, HV_RW, }, [306] = { "HDSISR", 32, HV_RW, SPR_INT, }, [307] = { "HDAR", 64, HV_RW, SPR_INT, }, [308] = { "SPURR", 64, HV_RW | OS_RO, SPR_ASYNC, }, [309] = { "PURR", 64, HV_RW | OS_RO, SPR_ASYNC, }, -[313] = { "HRMOR", 64, HV_RW, }, +[313] = { "HRMOR", 64, HV_RW, SPR_HARNESS, }, /* Harness can't cope with HRMOR changing */ [314] = { "HSRR0", 64, HV_RW, SPR_INT, }, [315] = { "HSRR1", 64, HV_RW, SPR_INT, }, [318] = { "LPCR", 64, HV_RW, },
@@ -306,7 +306,7 @@ static const struct spr sprs_power9_10[1024] = { [921] = { "TSCR", 32, HV_RW, }, [922] = { "TTR", 64, HV_RW, }, [1006]= { "TRACE", 64, WO, }, -[1008]= { "HID", 64, HV_RW, }, +[1008]= { "HID", 64, HV_RW, SPR_HARNESS, }, /* HILE would be unhelpful to change */ };/* This covers POWER8 and POWER9 PMUs */
@@ -350,6 +350,22 @@ static const struct spr sprs_power10_pmu[1024] = {static struct spr sprs[1024 ]; +static bool spr_read_perms (int spr) +{ +if (cpu_has_hv) +return !!(sprs[spr].access &SPR_HV_READ ); +else +return !!(sprs[spr].access &SPR_OS_READ ); +} + +static bool spr_write_perms (int spr) +{ +if (cpu_has_hv) +return !!(sprs[spr].access &SPR_HV_WRITE ); +else +return !!(sprs[spr].access &SPR_OS_WRITE ); +} +static void setup_sprs (void ) {int i;
@@ -461,7 +477,7 @@ static void get_sprs(uint64_t *v)int i;for (i =0 ; i <1024 ; i++) { -if (!(sprs[i].access &SPR_OS_READ )) +if (!spr_read_perms (i))continue ; v[i] =__mfspr (i); }
@@ -472,8 +488,9 @@ static void set_sprs(uint64_t val)int i;for (i =0 ; i <1024 ; i++) { -if (!(sprs[i].access &SPR_OS_WRITE )) +if (!spr_write_perms (i))continue ; +if (sprs[i].type &SPR_HARNESS )continue ;__mtspr (i, val);
@@ -561,7 +578,7 @@ int main(int argc, char **argv)for (i =0 ; i <1024 ; i++) {bool pass = true; -if (!(sprs[i].access &SPR_OS_READ )) +if (!spr_read_perms (i))continue ;if (sprs[i].width ==32 ) {
Signature · 1 line
2.42.0
PATCH v7 19/35 powerpc: general interrupt tests
In reply to Nicholas PigginAdd basic testing of various kinds of interrupts, machine check, page fault, illegal, decrementer, trace, syscall, etc.
This has a known failure on QEMU TCG pseries machines where MSR[ME] can be incorrectly set to 0.
--- lib/powerpc/asm/processor.h | 4 + lib/powerpc/asm/reg.h | 17 ++ lib/powerpc/setup.c | 11 + lib/ppc64/asm/ptrace.h | 16 ++ powerpc/Makefile.common | 3 +- powerpc/interrupts.c | 414 ++++++++++++++++++++++++++++++++++++ powerpc/unittests.cfg | 3 + 7 files changed, 467 insertions(+), 1 deletion(-) create mode 100644 powerpc/interrupts.c
lib/powerpc/asm/processor.h +4 -0
@@ -11,7 +11,11 @@ void do_handle_exception(struct pt_regs *regs);#endif /* __ASSEMBLY__ */ extern bool cpu_has_hv; +extern bool cpu_has_power_mce; +extern bool cpu_has_siar;extern bool cpu_has_heai; +extern bool cpu_has_prefix; +extern bool cpu_has_sc_lev;static inline uint64_t mfspr (int nr) {
lib/powerpc/asm/reg.h +17 -0
@@ -5,8 +5,15 @@#define UL (x) _AC(x, UL) +#define SPR_DSISR 0x012 +#define SPR_DAR 0x013 +#define SPR_DEC 0x016#define SPR_SRR0 0x01a#define SPR_SRR1 0x01b +#define SRR1_PREFIX UL(0x20000000) +#define SPR_FSCR 0x099 +#define FSCR_PREFIX UL(0x2000) +#define SPR_HFSCR 0x0be#define SPR_TB 0x10c#define SPR_SPRG0 0x110#define SPR_SPRG1 0x111
@@ -22,12 +29,17 @@#define PVR_VER_POWER8 UL(0x004d0000)#define PVR_VER_POWER9 UL(0x004e0000)#define PVR_VER_POWER10 UL(0x00800000) +#define SPR_HDEC 0x136#define SPR_HSRR0 0x13a#define SPR_HSRR1 0x13b +#define SPR_LPCR 0x13e +#define LPCR_HDICE UL(0x1) +#define SPR_HEIR 0x153#define SPR_MMCR0 0x31b#define MMCR0_FC UL(0x80000000)#define MMCR0_PMAE UL(0x04000000)#define MMCR0_PMAO UL(0x00000080) +#define SPR_SIAR 0x31c/* Machine State Register definitions: */ #define MSR_LE_BIT 0
@@ -35,6 +47,11 @@#define MSR_HV_BIT 60/* Hypervisor mode */ #define MSR_SF_BIT 63/* 64-bit mode */ +#define MSR_DR UL(0x0010) +#define MSR_IR UL(0x0020) +#define MSR_BE UL(0x0200)/* Branch Trace Enable */ +#define MSR_SE UL(0x0400)/* Single Step Enable */ +#define MSR_EE UL(0x8000)#define MSR_ME UL(0x1000)#endif
lib/powerpc/setup.c +11 -0
@@ -87,7 +87,11 @@ static void cpu_set(int fdtnode, u64 regval, void *info) }bool cpu_has_hv; +bool cpu_has_power_mce;/* POWER CPU machine checks */ +bool cpu_has_siar;bool cpu_has_heai; +bool cpu_has_prefix; +bool cpu_has_sc_lev;/* sc interrupt has LEV field in SRR1 */ static void cpu_init (void ) {
@@ -112,15 +116,22 @@ static void cpu_init(void)switch (mfspr (SPR_PVR ) &PVR_VERSION_MASK ) {case PVR_VER_POWER10 : + cpu_has_prefix = true; + cpu_has_sc_lev = true;case PVR_VER_POWER9 :case PVR_VER_POWER8E :case PVR_VER_POWER8NVL :case PVR_VER_POWER8 : + cpu_has_power_mce = true; cpu_has_heai = true; + cpu_has_siar = true;break ;default :break ; } + +if (!cpu_has_hv)/* HEIR is HV register */ + cpu_has_heai = false; }static void mem_init (phys_addr_t freemem_start)
lib/ppc64/asm/ptrace.h +16 -0
@@ -5,6 +5,9 @@#define STACK_FRAME_OVERHEAD 112/* size of minimum stack frame */ #ifndef __ASSEMBLY__ + +#include <asm/reg.h> + struct pt_regs { unsigned long gpr[32]; unsigned long nip;
@@ -17,6 +20,19 @@ struct pt_regs {unsigned long _pad;/* stack must be 16-byte aligned */ }; +static inline bool regs_is_prefix (volatile struct pt_regs *regs) +{ +return regs->msr &SRR1_PREFIX ; +} + +static inline void regs_advance_insn (struct pt_regs *regs) +{ +if (regs_is_prefix (regs)) + regs->nip +=8 ; +else + regs->nip +=4 ; +} +#define STACK_INT_FRAME_SIZE (sizeof(struct pt_regs) + \ STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE)
powerpc/Makefile.common +2 -1
@@ -12,7 +12,8 @@ tests-common = \ $(TEST_DIR)/rtas.elf \ $(TEST_DIR)/emulator.elf \ $(TEST_DIR)/tm.elf \ - $(TEST_DIR)/sprs.elf + $(TEST_DIR)/sprs.elf \ + $(TEST_DIR)/interrupts.elf tests-all = $(tests-common) $(tests) all: directories $(TEST_DIR)/boot_rom.bin $(tests-all)
powerpc/interrupts.c new file +414 -0
414 lines not on this page · raw message
powerpc/unittests.cfg +3 -0
@@ -71,6 +71,9 @@ groups = rtas [emulator] file = emulator.elf +[interrupts] +file = interrupts.elf + [h_cede_tm] file = tm.elf machine = pseries
Signature · 1 line
2.42.0
PATCH v7 20/35 powerpc: Add rtas stop-self support
In reply to Nicholas PigginIn preparation for improved SMP support, add stop-self support to the harness. This is non-trivial because it requires an unlocked rtas
call: a CPU can't be holding a spin lock when it goes offline or it will deadlock other CPUs. rtas permits stop-self to be called without serialising all other rtas operations.
--- lib/powerpc/asm/rtas.h | 2 ++ lib/powerpc/rtas.c | 78 +++++++++++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 16 deletions(-)
lib/powerpc/asm/rtas.h +2 -0
@@ -23,8 +23,10 @@ struct rtas_args {extern void rtas_init (void );extern int rtas_token (const char *service,uint32_t *token);extern int rtas_call (int token,int nargs,int nret,int *outputs, ...); +extern int rtas_call_unlocked (struct rtas_args *args,int token,int nargs,int nret,int *outputs, ...);extern void rtas_power_off (void ); +extern void rtas_stop_self (void );#endif /* __ASSEMBLY__ */ #define RTAS_MSR_MASK 0xfffffffffffffffe
lib/powerpc/rtas.c +62 -16
108 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH v7 21/35 powerpc: Remove broken SMP exception stack setup
In reply to Nicholas PigginThe exception stack setup does not work correctly for SMP, because it is the boot processor that calls cpu_set() which sets SPRG2 to the exception stack, not the target CPU itself. So secondaries never got their SPRG2 set to a valid exception stack.
Remove the SMP code and just set an exception stack for the boot processor. Make the stack 64kB while we're here, to match the size of the regular stack.
--- lib/powerpc/setup.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
lib/powerpc/setup.c +8 -8
@@ -42,10 +42,6 @@ struct cpu_set_params {uint64_t tb_hz; }; -#define EXCEPTION_STACK_SIZE (32*1024)/* 32kB */ - -static char exception_stack[NR_CPUS ][EXCEPTION_STACK_SIZE ]; -static void cpu_set (int fdtnode,u64 regval,void *info) {static bool read_common_info = false;
@@ -56,10 +52,6 @@ static void cpu_set(int fdtnode, u64 regval, void *info) cpus[cpu] = regval; -/* set exception stack address for this CPU (in SPGR0) */ - asmvolatile ("mtsprg0 %[addr]" :: - [addr]"r" (exception_stack[cpu +1 ])); -if (!read_common_info) {const struct fdt_property *prop;u32 *data;
@@ -180,6 +172,10 @@ static void mem_init(phys_addr_t freemem_start) ? __icache_bytes : __dcache_bytes); } +#define EXCEPTION_STACK_SIZE SZ_64K + +static char boot_exception_stack[EXCEPTION_STACK_SIZE ]; +void setup (const void *fdt) {void *freemem = &stacktop;
@@ -189,6 +185,10 @@ void setup(const void *fdt) cpu_has_hv = !!(mfmsr () & (1ULL <<MSR_HV_BIT )); +/* set exception stack address for this CPU (in SPGR0) */ + asmvolatile ("mtsprg0 %[addr]" :: + [addr]"r" (boot_exception_stack)); +enable_mcheck ();/*
Signature · 1 line
2.42.0
PATCH v7 22/35 powerpc: add SMP and IPI support
In reply to Nicholas Pigginpowerpc SMP support is very primitive and does not set up a first-class runtime environment for secondary CPUs.
This reworks SMP support, and provides a complete C and harness environment for the secondaries, including interrupt handling, as well as IPI support.
--- lib/powerpc/asm/processor.h | 23 +++ lib/powerpc/asm/reg.h | 1 + lib/powerpc/asm/setup.h | 2 - lib/powerpc/asm/smp.h | 46 +++-- lib/powerpc/io.c | 15 +- lib/powerpc/processor.c | 7 +- lib/powerpc/setup.c | 90 +++++++--- lib/powerpc/smp.c | 282 +++++++++++++++++++++++++---- lib/ppc64/asm-offsets.c | 7 + lib/ppc64/asm/atomic.h | 6 + lib/ppc64/asm/barrier.h | 3 + lib/ppc64/asm/opal.h | 7 + powerpc/Makefile.common | 1 + powerpc/cstart64.S | 49 ++++- powerpc/selftest.c | 4 +- powerpc/smp.c | 348 ++++++++++++++++++++++++++++++++++++ powerpc/tm.c | 4 +- powerpc/unittests.cfg | 8 + 18 files changed, 818 insertions(+), 85 deletions(-) create mode 100644 lib/ppc64/asm/atomic.h create mode 100644 powerpc/smp.c
lib/powerpc/asm/processor.h +23 -0
@@ -16,6 +16,7 @@ extern bool cpu_has_siar;extern bool cpu_has_heai;extern bool cpu_has_prefix;extern bool cpu_has_sc_lev; +extern bool cpu_has_pause_short;static inline uint64_t mfspr (int nr) {
@@ -45,6 +46,28 @@ static inline void mtmsr(uint64_t msr) asmvolatile ("mtmsrd %[msr]" :: [msr]"r" (msr) :"memory" ); } +static inline void local_irq_enable (void ) +{ +unsigned long msr; + + asmvolatile ( +" mfmsr %0 \n \ +ori %0,%0,%1 \n \ +mtmsrd %0,1 " + :"=r" (msr) :"i" (MSR_EE ):"memory" ); +} + +static inline void local_irq_disable (void ) +{ +unsigned long msr; + + asmvolatile ( +" mfmsr %0 \n \ +andc %0,%0,%1 \n \ +mtmsrd %0,1 " + :"=r" (msr) :"r" (MSR_EE ):"memory" ); +} +/* * This returns true on PowerNV / OPAL machines which run in hypervisor * mode. False on pseries / PAPR machines that run in guest mode.
lib/powerpc/asm/reg.h +1 -0
@@ -19,6 +19,7 @@#define SPR_SPRG1 0x111#define SPR_SPRG2 0x112#define SPR_SPRG3 0x113 +#define SPR_TBU40 0x11e#define SPR_PVR 0x11f#define PVR_VERSION_MASK UL(0xffff0000)#define PVR_VER_970 UL(0x00390000)
lib/powerpc/asm/setup.h +0 -2
@@ -8,8 +8,6 @@#include <libcflat.h> #define NR_CPUS 8/* arbitrarily set for now */ -extern u32 cpus[NR_CPUS ]; -extern int nr_cpus;extern uint64_t tb_hz;
lib/powerpc/asm/smp.h +35 -11
56 lines not on this page · raw message
lib/powerpc/io.c +10 -5
@@ -10,6 +10,7 @@#include <asm/rtas.h> #include <asm/setup.h> #include <asm/processor.h> +#include <asm/atomic.h> #include "io.h" static struct spinlock print_lock;
@@ -55,13 +56,17 @@ extern void halt(int code);void exit (int code) { +static int exited =0 ; +// FIXME: change this print-exit/rtas-poweroff to chr_testdev_exit(), // maybe by plugging chr-testdev into a spapr-vty. -printf ("\nEXIT: STATUS=%d\n" , ((code) <<1 ) |1 ); -if (machine_is_powernv ()) -opal_power_off (); -else -rtas_power_off (); +if (atomic_fetch_inc (&exited) ==0 ) { +printf ("\nEXIT: STATUS=%d\n" , ((code) <<1 ) |1 ); +if (machine_is_powernv ()) +opal_power_off (); +else +rtas_power_off (); + }halt (code);__builtin_unreachable (); }
lib/powerpc/processor.c +5 -2
@@ -13,6 +13,7 @@#include <asm/barrier.h> #include <asm/hcall.h> #include <asm/handlers.h> +#include <asm/smp.h> static struct { void (*func)(struct pt_regs *, void *data);
@@ -44,6 +45,8 @@ void do_handle_exception(struct pt_regs *regs) {unsigned char v; + __current_cpu = (struct cpu *)mfspr (SPR_SPRG0 ); + v = regs->trap >>5 ;if (v <128 && handlers[v].func) {
@@ -51,8 +54,8 @@ void do_handle_exception(struct pt_regs *regs)return ; } -printf ("Unhandled cpu exception %#lx at NIA:0x%016lx MSR:0x%016lx\n" , - regs->trap, regs->nip, regs->msr); +printf ("Unhandled CPU%d exception %#lx at NIA:0x%016lx MSR:0x%016lx\n" , +smp_processor_id (), regs->trap, regs->nip, regs->msr);dump_frame_stack ((void *)regs->nip, (void *)regs->gpr[1 ]);abort (); }
lib/powerpc/setup.c +66 -24
159 lines not on this page · raw message
lib/powerpc/smp.c +246 -36
341 lines not on this page · raw message
lib/ppc64/asm-offsets.c +7 -0
@@ -6,6 +6,8 @@#include <libcflat.h> #include <kbuild.h> #include <asm/ptrace.h> +#include <asm/setup.h> +#include <asm/smp.h> int main (void ) {
@@ -50,5 +52,10 @@ int main(void)DEFINE (_XER,STACK_FRAME_OVERHEAD +offsetof(struct pt_regs , xer));DEFINE (_CCR,STACK_FRAME_OVERHEAD +offsetof(struct pt_regs , ccr));DEFINE (_TRAP,STACK_FRAME_OVERHEAD +offsetof(struct pt_regs , trap)); + +DEFINE (SIZEOF_STRUCT_CPU ,sizeof (struct cpu )); +DEFINE (EXCEPTION_STACK , offsetof(struct cpu , exception_stack)); +DEFINE (MAX_CPUS ,NR_CPUS ); +return 0 ; }
lib/ppc64/asm/atomic.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _POWERPC_ATOMIC_H_ +#define _POWERPC_ATOMIC_H_ + +#include "asm-generic/atomic.h" + +#endif /* _POWERPC_ATOMIC_H_ */
lib/ppc64/asm/barrier.h +3 -0
@@ -1,6 +1,9 @@#ifndef _ASMPPC64_BARRIER_H_#define _ASMPPC64_BARRIER_H_ +#define cpu_relax () asm volatile("or 1,1,1 ; or 2,2,2" ::: "memory") +#define pause_short () asm volatile(".long 0x7c40003c" ::: "memory") +#define mb () asm volatile("sync":::"memory")#define rmb () asm volatile("sync":::"memory")#define wmb () asm volatile("sync":::"memory")
lib/ppc64/asm/opal.h +7 -0
@@ -2,14 +2,21 @@#ifndef _ASMPPC64_OPAL_H_#define _ASMPPC64_OPAL_H_ +#include <stdint.h> +#define OPAL_SUCCESS 0#define OPAL_CONSOLE_WRITE 1#define OPAL_CONSOLE_READ 2#define OPAL_CEC_POWER_DOWN 5#define OPAL_POLL_EVENTS 10 +#define OPAL_START_CPU 41 +#define OPAL_QUERY_CPU_STATUS 42 +#define OPAL_RETURN_CPU 69#define OPAL_REINIT_CPUS 70# define OPAL_REINIT_CPUS_HILE_BE (1 << 0)# define OPAL_REINIT_CPUS_HILE_LE (1 << 1) +int64_t opal_call (int64_t token,int64_t arg1,int64_t arg2,int64_t arg3); +#endif
powerpc/Makefile.common +1 -0
@@ -12,6 +12,7 @@ tests-common = \ $(TEST_DIR)/rtas.elf \ $(TEST_DIR)/emulator.elf \ $(TEST_DIR)/tm.elf \ + $(TEST_DIR)/smp.elf \ $(TEST_DIR)/sprs.elf \ $(TEST_DIR)/interrupts.elf
powerpc/cstart64.S +47 -2
67 lines not on this page · raw message
powerpc/selftest.c +3 -1
@@ -8,6 +8,7 @@#include <libcflat.h> #include <util.h> #include <asm/setup.h> +#include <asm/smp.h> static void check_setup (int argc,char **argv) {
@@ -34,7 +35,8 @@ static void check_setup(int argc, char **argv) }else if (strcmp (argv[i],"smp" ) ==0 ) { -report (nr_cpus == (int )val,"nr_cpus = %d" , nr_cpus); +report (nr_cpus_present == (int )val, +"nr_cpus_present = %d" , nr_cpus_present); ++nr_tests; }
powerpc/smp.c new file +348 -0
348 lines not on this page · raw message
powerpc/tm.c +2 -2
@@ -89,7 +89,7 @@ static void test_h_cede_tm(int argc, char **argv)if (argc >2 )report_abort ("Unsupported argument: '%s'" , argv[2 ]); -if (!start_all_cpus (halt,0 )) +if (!start_all_cpus (halt))report_abort ("Failed to start secondary cpus" );if (!enable_tm ())
@@ -133,7 +133,7 @@ int main(int argc, char **argv)report_skip ("TM is not available" ); goto done; } -report (cpus_with_tm == nr_cpus, +report (cpus_with_tm == nr_cpus_present,"TM available in all 'ibm,pa-features' properties" ); all = argc ==1 || !strcmp (argv[1 ],"all" );
powerpc/unittests.cfg +8 -0
@@ -74,6 +74,14 @@ file = emulator.elf [interrupts] file = interrupts.elf +[smp] +file = smp.elf +smp = 2 + +[smp-smt] +file = smp.elf +smp = 8,threads=4 + [h_cede_tm] file = tm.elf machine = pseries
Signature · 1 line
2.42.0
PATCH v7 23/35 powerpc: Permit ACCEL=tcg,thread=single
In reply to Nicholas PigginModify run script to permit single vs mttcg threading, add a thread=single smp case to unittests.cfg.
--- powerpc/run | 4 ++-- powerpc/unittests.cfg | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
powerpc/run +2 -2
@@ -36,8 +36,8 @@ if ! $qemu -machine '?' 2>&1 | grep $MACHINE > /dev/null; then exit 2 fi +A="-accel $ACCEL$ACCEL_PROPS" M="-machine $MACHINE" -M+=",accel=$ACCEL$ACCEL_PROPS" B="" D=""
@@ -54,7 +54,7 @@ if [[ "$MACHINE" == "powernv"* ]] ; then D+="-device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10" fi -command="$qemu -nodefaults $M $B $D" +command="$qemu -nodefaults $A $M $B $D" command+=" -display none -serial stdio -kernel" command="$(migration_cmd) $(timeout_cmd) $command"
powerpc/unittests.cfg +6 -0
@@ -82,6 +82,12 @@ smp = 2 file = smp.elf smp = 8,threads=4 +# mttcg is the default most places, so add a thread=single test +[smp-thread-single] +file = smp.elf +smp = 8,threads=4 +accel = tcg,thread=single + [h_cede_tm] file = tm.elf machine = pseries
Signature · 1 line
2.42.0
PATCH v7 24/35 powerpc: Avoid using larx/stcx. in spinlocks when only one CPU is running
In reply to Nicholas PigginThe test harness uses spinlocks if they are implemented with larx/stcx. it can prevent some test scenarios such as testing migration of a reservation.
--- lib/powerpc/asm/smp.h | 1 + lib/powerpc/smp.c | 5 +++++ lib/powerpc/spinlock.c | 29 +++++++++++++++++++++++++++++ lib/ppc64/asm/spinlock.h | 7 ++++++- powerpc/Makefile.common | 1 + 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 lib/powerpc/spinlock.c
lib/powerpc/asm/smp.h +1 -0
@@ -15,6 +15,7 @@ struct cpu {extern int nr_cpus_present;extern int nr_cpus_online; +extern bool multithreaded;extern struct cpu cpus[]; registerstruct cpu *__current_cpu asm("r13" );
lib/powerpc/smp.c +5 -0
@@ -276,6 +276,8 @@ static void start_each_secondary(int fdtnode, u64 regval __unused, void *info)start_core (fdtnode, datap->entry); } +bool multithreaded = false; +/* * Start all stopped cpus on the guest at entry with register 3 set to r3 * We expect that we come in with only one thread currently started
@@ -290,6 +292,7 @@ bool start_all_cpus(secondary_entry_fn entry)assert (nr_cpus_online ==1 );assert (nr_started ==1 ); + multithreaded = true; ret =dt_for_each_cpu_node (start_each_secondary, &data);assert (ret ==0 );assert (nr_started == nr_cpus_present);
@@ -308,8 +311,10 @@ bool start_all_cpus(secondary_entry_fn entry)void stop_all_cpus (void ) { +assert (multithreaded);while (nr_cpus_online >1 )cpu_relax ();mb (); nr_started =1 ; + multithreaded = false; }
lib/powerpc/spinlock.c new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: LGPL-2.0 */ +#include <asm/spinlock.h> +#include <asm/smp.h> + +/* +* Skip the atomic when single-threaded, which helps avoid larx/stcx. in +* the harness when testing tricky larx/stcx. sequences (e.g., migration +* vs reservation). +*/ +void spin_lock (struct spinlock *lock) +{ +if (!multithreaded) { +assert (lock->v ==0 ); + lock->v =1 ; + }else { +while (__sync_lock_test_and_set (&lock->v,1 )) + ; + } +} + +void spin_unlock (struct spinlock *lock) +{ +assert (lock->v ==1 ); +if (!multithreaded) { + lock->v =0 ; + }else { +__sync_lock_release (&lock->v); + } +}
lib/ppc64/asm/spinlock.h +6 -1
@@ -1,6 +1,11 @@#ifndef _ASMPPC64_SPINLOCK_H_#define _ASMPPC64_SPINLOCK_H_ -#include <asm-generic/spinlock.h> +struct spinlock { +unsigned int v; +}; + +void spin_lock (struct spinlock *lock); +void spin_unlock (struct spinlock *lock);#endif /* _ASMPPC64_SPINLOCK_H_ */
powerpc/Makefile.common +1 -0
@@ -48,6 +48,7 @@ cflatobjs += lib/powerpc/rtas.o cflatobjs += lib/powerpc/processor.o cflatobjs += lib/powerpc/handlers.o cflatobjs += lib/powerpc/smp.o +cflatobjs += lib/powerpc/spinlock.o OBJDIRS += lib/powerpc
Signature · 1 line
2.42.0
PATCH v7 25/35 powerpc: Add atomics tests
In reply to Nicholas Piggin--- powerpc/Makefile.common | 1 + powerpc/atomics.c | 374 ++++++++++++++++++++++++++++++++++++++++ powerpc/unittests.cfg | 9 + 3 files changed, 384 insertions(+) create mode 100644 powerpc/atomics.c
powerpc/Makefile.common +1 -0
@@ -11,6 +11,7 @@ tests-common = \ $(TEST_DIR)/spapr_hcall.elf \ $(TEST_DIR)/rtas.elf \ $(TEST_DIR)/emulator.elf \ + $(TEST_DIR)/atomics.elf \ $(TEST_DIR)/tm.elf \ $(TEST_DIR)/smp.elf \ $(TEST_DIR)/sprs.elf \
powerpc/atomics.c new file +374 -0
374 lines not on this page · raw message
powerpc/unittests.cfg +9 -0
@@ -88,6 +88,15 @@ file = smp.elf smp = 8,threads=4 accel = tcg,thread=single +[atomics] +file = atomics.elf + +[atomics-migration] +file = atomics.elf +machine = pseries +extra_params = -append "'migration -m'" +groups = migration + [h_cede_tm] file = tm.elf machine = pseries
Signature · 1 line
2.42.0
PATCH v7 26/35 powerpc: Add timebase tests
In reply to Nicholas PigginThis has a known failure on QEMU TCG machines where the decrementer interrupt is not lowered when the DEC wraps from -ve to +ve.
--- lib/powerpc/asm/reg.h | 1 + powerpc/Makefile.common | 1 + powerpc/timebase.c | 329 ++++++++++++++++++++++++++++++++++++++++ powerpc/unittests.cfg | 8 + 4 files changed, 339 insertions(+) create mode 100644 powerpc/timebase.c
lib/powerpc/asm/reg.h +1 -0
@@ -35,6 +35,7 @@#define SPR_HSRR1 0x13b#define SPR_LPCR 0x13e#define LPCR_HDICE UL(0x1) +#define LPCR_LD UL(0x20000)#define SPR_HEIR 0x153#define SPR_MMCR0 0x31b#define MMCR0_FC UL(0x80000000)
powerpc/Makefile.common +1 -0
@@ -15,6 +15,7 @@ tests-common = \ $(TEST_DIR)/tm.elf \ $(TEST_DIR)/smp.elf \ $(TEST_DIR)/sprs.elf \ + $(TEST_DIR)/timebase.elf \ $(TEST_DIR)/interrupts.elf tests-all = $(tests-common) $(tests)
powerpc/timebase.c new file +329 -0
329 lines not on this page · raw message
powerpc/unittests.cfg +8 -0
@@ -97,6 +97,14 @@ machine = pseries extra_params = -append "'migration -m'" groups = migration +[timebase] +file = timebase.elf + +[timebase-icount] +file = timebase.elf +accel = tcg +extra_params = -icount shift=5 + [h_cede_tm] file = tm.elf machine = pseries
Signature · 1 line
2.42.0
PATCH v7 27/35 powerpc: Add MMU support
In reply to Nicholas PigginAdd support for radix MMU, 4kB and 64kB pages.
This also adds MMU interrupt test cases, and runs the interrupts test entirely with MMU enabled if it is available (aside from machine check tests).
--- configure | 39 +++-- lib/powerpc/asm/hcall.h | 6 + lib/powerpc/asm/processor.h | 1 + lib/powerpc/asm/reg.h | 3 + lib/powerpc/asm/smp.h | 2 + lib/powerpc/processor.c | 9 ++ lib/powerpc/setup.c | 4 + lib/ppc64/asm/mmu.h | 11 ++ lib/ppc64/asm/page.h | 66 ++++++++- lib/ppc64/asm/pgtable-hwdef.h | 66 +++++++++ lib/ppc64/asm/pgtable.h | 125 ++++++++++++++++ lib/ppc64/mmu.c | 272 ++++++++++++++++++++++++++++++++++ lib/ppc64/opal-calls.S | 4 +- powerpc/Makefile.common | 2 + powerpc/Makefile.ppc64 | 1 + powerpc/interrupts.c | 96 ++++++++++-- 16 files changed, 680 insertions(+), 27 deletions(-) create mode 100644 lib/ppc64/asm/mmu.h create mode 100644 lib/ppc64/asm/pgtable-hwdef.h create mode 100644 lib/ppc64/asm/pgtable.h create mode 100644 lib/ppc64/mmu.c
configure +26 -13
@@ -245,29 +245,35 @@ fi if [ -z "$page_size" ]; then if [ "$efi" = 'y' ] && [ "$arch" = "arm64" ]; then page_size="4096" - elif [ "$arch" = "arm64" ]; then + elif [ "$arch" = "arm64" ] || [ "$arch" = "ppc64" ]; then page_size="65536" elif [ "$arch" = "arm" ]; then page_size="4096" fi else - if [ "$arch" != "arm64" ]; then - echo "--page-size is not supported for $arch" - usage - fi - if [ "${page_size: -1}" = "K" ] || [ "${page_size: -1}" = "k" ]; then page_size=$(( ${page_size%?} * 1024 )) fi - if [ "$page_size" != "4096" ] && [ "$page_size" != "16384" ] && - [ "$page_size" != "65536" ]; then - echo "arm64 doesn't support page size of $page_size" + + if [ "$arch" = "arm64" ]; then + if [ "$page_size" != "4096" ] && [ "$page_size" != "16384" ] && + [ "$page_size" != "65536" ]; then + echo "arm64 doesn't support page size of $page_size" + usage + fi + if [ "$efi" = 'y' ] && [ "$page_size" != "4096" ]; then + echo "efi must use 4K pages" + exit 1 + fi + elif [ "$arch" = "ppc64" ]; then + if [ "$page_size" != "4096" ] && [ "$page_size" != "65536" ]; then + echo "ppc64 doesn't support page size of $page_size" + usage + fi + else + echo "--page-size is not supported for $arch" usage fi - if [ "$efi" = 'y' ] && [ "$page_size" != "4096" ]; then - echo "efi must use 4K pages" - exit 1 - fi fi [ -z "$processor" ] && processor="$arch"
@@ -472,6 +478,13 @@ cat <<EOF >> lib/config.h #define CONFIG_UART_EARLY_BASE ${arm_uart_early_addr} #define CONFIG_ERRATA_FORCE ${errata_force} + +EOF +fi + +if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ] || [ "$arch" = "ppc64" ]; then +cat <<EOF >> lib/config.h + #define CONFIG_PAGE_SIZE _AC(${page_size}, UL) EOF
lib/powerpc/asm/hcall.h +6 -0
@@ -24,6 +24,12 @@#define H_PUT_TERM_CHAR 0x58#define H_RANDOM 0x300#define H_SET_MODE 0x31C +#define H_REGISTER_PROCESS_TABLE 0x37C + +#define PTBL_NEW 0x18 +#define PTBL_UNREGISTER 0x10 +#define PTBL_RADIX 0x04 +#define PTBL_GTSE 0x01#define KVMPPC_HCALL_BASE 0xf000#define KVMPPC_H_RTAS (KVMPPC_HCALL_BASE + 0x0)
lib/powerpc/asm/processor.h +1 -0
@@ -14,6 +14,7 @@ extern bool cpu_has_hv;extern bool cpu_has_power_mce;extern bool cpu_has_siar;extern bool cpu_has_heai; +extern bool cpu_has_radix;extern bool cpu_has_prefix;extern bool cpu_has_sc_lev;extern bool cpu_has_pause_short;
lib/powerpc/asm/reg.h +3 -0
@@ -11,6 +11,7 @@#define SPR_SRR0 0x01a#define SPR_SRR1 0x01b#define SRR1_PREFIX UL(0x20000000) +#define SPR_PIDR 0x030#define SPR_FSCR 0x099#define FSCR_PREFIX UL(0x2000)#define SPR_HFSCR 0x0be
@@ -36,7 +37,9 @@#define SPR_LPCR 0x13e#define LPCR_HDICE UL(0x1)#define LPCR_LD UL(0x20000) +#define SPR_LPIDR 0x13f#define SPR_HEIR 0x153 +#define SPR_PTCR 0x1d0#define SPR_MMCR0 0x31b#define MMCR0_FC UL(0x80000000)#define MMCR0_PMAE UL(0x04000000)
lib/powerpc/asm/smp.h +2 -0
@@ -3,6 +3,7 @@#include <libcflat.h> #include <asm/processor.h> +#include <asm/page.h> typedef void (*secondary_entry_fn )(int cpu_id);
@@ -11,6 +12,7 @@ struct cpu {unsigned long stack;unsigned long exception_stack;secondary_entry_fn entry; +pgd_t *pgtable; } __attribute__((packed)); /* used by asm */extern int nr_cpus_present;
lib/powerpc/processor.c +9 -0
@@ -13,6 +13,7 @@#include <asm/barrier.h> #include <asm/hcall.h> #include <asm/handlers.h> +#include <asm/mmu.h> #include <asm/smp.h> static struct {
@@ -47,6 +48,14 @@ void do_handle_exception(struct pt_regs *regs) __current_cpu = (struct cpu *)mfspr (SPR_SPRG0 ); +/* +* We run with AIL=0, so interrupts taken with MMU disabled. +* Enable here. +*/ +assert (!(mfmsr () & (MSR_IR |MSR_DR ))); +if (mmu_enabled ()) +mtmsr (mfmsr () | (MSR_IR |MSR_DR )); + v = regs->trap >>5 ;if (v <128 && handlers[v].func) {
lib/powerpc/setup.c +4 -0
@@ -102,6 +102,7 @@ bool cpu_has_hv;bool cpu_has_power_mce;/* POWER CPU machine checks */ bool cpu_has_siar;bool cpu_has_heai; +bool cpu_has_radix;bool cpu_has_prefix;bool cpu_has_sc_lev;/* sc interrupt has LEV field in SRR1 */ bool cpu_has_pause_short;
@@ -124,6 +125,7 @@ static void cpu_init_params(void) cpu_has_sc_lev = true; cpu_has_pause_short = true;case PVR_VER_POWER9 : + cpu_has_radix = true;case PVR_VER_POWER8E :case PVR_VER_POWER8NVL :case PVR_VER_POWER8 :
@@ -198,6 +200,7 @@ void cpu_init(struct cpu *cpu, int cpu_id) cpu->stack +=SZ_64K -64 ; cpu->exception_stack = (unsigned long )memalign (SZ_4K ,SZ_64K ); cpu->exception_stack +=SZ_64K -64 ; + cpu->pgtable =NULL ; }void setup (const void *fdt)
@@ -216,6 +219,7 @@ void setup(const void *fdt) cpu->server_no =fdt_boot_cpuid_phys (fdt); cpu->exception_stack = (unsigned long )boot_exception_stack; cpu->exception_stack +=SZ_64K -64 ; + cpu->pgtable =NULL ;mtspr (SPR_SPRG0 , (unsigned long )cpu); __current_cpu = cpu;
lib/ppc64/asm/mmu.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef _ASMPOWERPC_MMU_H_ +#define _ASMPOWERPC_MMU_H_ + +#include <asm/pgtable.h> + +bool vm_available (void ); +bool mmu_enabled (void ); +void mmu_enable (pgd_t *pgtable); +void mmu_disable (void ); + +#endif
lib/ppc64/asm/page.h +65 -1
66 lines not on this page · raw message
lib/ppc64/asm/pgtable-hwdef.h new file +66 -0
66 lines not on this page · raw message
lib/ppc64/asm/pgtable.h new file +125 -0
125 lines not on this page · raw message
lib/ppc64/mmu.c new file +272 -0
272 lines not on this page · raw message
lib/ppc64/opal-calls.S +2 -2
@@ -25,8 +25,8 @@ opal_call: mfmsr r12 std r12,-16(r1) /* use redzone */ - /* switch to BE when we enter OPAL */ - li r11,(1 << MSR_LE_BIT) + /* switch to BE and real-mode when we enter OPAL */ + li r11,(1 << MSR_LE_BIT) | MSR_IR | MSR_DR ori r11,r11,(1 << MSR_EE_BIT) andc r12,r12,r11 mtspr SPR_HSRR1,r12
powerpc/Makefile.common +2 -0
@@ -41,6 +41,8 @@ cflatobjs += lib/util.o cflatobjs += lib/getchar.o cflatobjs += lib/alloc_phys.o cflatobjs += lib/alloc.o +cflatobjs += lib/alloc_page.o +cflatobjs += lib/vmalloc.o cflatobjs += lib/devicetree.o cflatobjs += lib/migrate.o cflatobjs += lib/powerpc/io.o
powerpc/Makefile.ppc64 +1 -0
@@ -18,6 +18,7 @@ reloc.o = $(TEST_DIR)/reloc64.o OBJDIRS += lib/ppc64 cflatobjs += lib/ppc64/stack.o +cflatobjs += lib/ppc64/mmu.o cflatobjs += lib/ppc64/opal.o cflatobjs += lib/ppc64/opal-calls.o
powerpc/interrupts.c +85 -11
160 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH v7 28/35 common/sieve: Use vmalloc.h for setup_mmu definition
In reply to Nicholas PigginThere is no good reason to put setup_vm in libcflat.h when it's defined in vmalloc.h.
--- common/sieve.c | 1 + lib/libcflat.h | 2 -- lib/s390x/io.c | 1 + lib/s390x/uv.h | 1 + lib/x86/vm.h | 1 + s390x/mvpg.c | 1 + s390x/selftest.c | 1 + x86/pmu.c | 1 + x86/pmu_lbr.c | 1 + x86/vmexit.c | 1 + x86/vmware_backdoors.c | 1 + 11 files changed, 10 insertions(+), 2 deletions(-)
common/sieve.c +1 -0
@@ -1,5 +1,6 @@#include "alloc.h" #include "libcflat.h" +#include "vmalloc.h" static int sieve (char * data,int size) {
lib/libcflat.h +0 -2
@@ -152,8 +152,6 @@ do { \void binstr (unsigned long x,char out[BINSTR_SZ ]);void print_binstr (unsigned long x); -extern void setup_vm (void ); -#endif /* !__ASSEMBLY__ */ #define SZ_256 (1 << 8)
lib/s390x/io.c +1 -0
@@ -10,6 +10,7 @@*/ #include <libcflat.h> #include <argv.h> +#include <vmalloc.h> #include <asm/spinlock.h> #include <asm/facility.h> #include <asm/sigp.h>
lib/s390x/uv.h +1 -0
@@ -4,6 +4,7 @@#include <sie.h> #include <asm/pgtable.h> +#include <vmalloc.h> bool uv_os_is_guest (void );bool uv_os_is_host (void );
lib/x86/vm.h +1 -0
@@ -2,6 +2,7 @@#define _X86_VM_H_#include "processor.h" +#include "vmalloc.h" #include "asm/page.h" #include "asm/io.h" #include "asm/bitops.h"
s390x/mvpg.c +1 -0
@@ -15,6 +15,7 @@#include <asm/page.h> #include <asm/facility.h> #include <asm/mem.h> +#include <vmalloc.h> #include <alloc_page.h> #include <bitops.h> #include <hardware.h>
s390x/selftest.c +1 -0
@@ -9,6 +9,7 @@#include <libcflat.h> #include <util.h> #include <alloc.h> +#include <vmalloc.h> #include <asm/interrupt.h> #include <asm/barrier.h> #include <asm/pgtable.h>
x86/pmu.c +1 -0
@@ -6,6 +6,7 @@#include "x86/apic.h" #include "x86/desc.h" #include "x86/isr.h" +#include "vmalloc.h" #include "alloc.h" #include "libcflat.h"
x86/pmu_lbr.c +1 -0
@@ -2,6 +2,7 @@#include "x86/processor.h" #include "x86/pmu.h" #include "x86/desc.h" +#include "vmalloc.h" #define N 1000000
x86/vmexit.c +1 -0
@@ -1,6 +1,7 @@#include "libcflat.h" #include "acpi.h" #include "smp.h" +#include "vmalloc.h" #include "pci.h" #include "x86/vm.h" #include "x86/desc.h"
x86/vmware_backdoors.c +1 -0
@@ -6,6 +6,7 @@#include "x86/desc.h" #include "x86/isr.h" #include "alloc.h" +#include "vmalloc.h" #include "setjmp.h" #include "usermode.h" #include "fault_test.h"
Signature · 1 line
2.42.0
PATCH v7 29/35 common/sieve: Support machines without MMU
In reply to Nicholas PigginNot all powerpc CPUs provide MMU support. Define vm_available() that is true by default but archs can override it. Use this to run VM tests.
--- common/sieve.c | 14 ++++++++------ lib/ppc64/asm/mmu.h | 1 - lib/ppc64/mmu.c | 2 +- lib/vmalloc.c | 7 +++++++ lib/vmalloc.h | 2 ++ 5 files changed, 18 insertions(+), 8 deletions(-)
common/sieve.c +8 -6
@@ -40,12 +40,14 @@ int main(void)printf ("starting sieve\n" );test_sieve ("static" , static_data,STATIC_SIZE ); -setup_vm (); -test_sieve ("mapped" , static_data,STATIC_SIZE ); -for (i =0 ; i <3 ; ++i) { - v =malloc (VSIZE ); -test_sieve ("virtual" , v,VSIZE ); -free (v); +if (vm_available ()) { +setup_vm (); +test_sieve ("mapped" , static_data,STATIC_SIZE ); +for (i =0 ; i <3 ; ++i) { + v =malloc (VSIZE ); +test_sieve ("virtual" , v,VSIZE ); +free (v); + } }return 0 ;
lib/ppc64/asm/mmu.h +0 -1
@@ -3,7 +3,6 @@#include <asm/pgtable.h> -bool vm_available (void );bool mmu_enabled (void );void mmu_enable (pgd_t *pgtable);void mmu_disable (void );
lib/ppc64/mmu.c +1 -1
@@ -23,7 +23,7 @@static pgd_t *identity_pgd; -bool vm_available (void ) +bool vm_available (void )/* weak override */ {return cpu_has_radix; }
lib/vmalloc.c +7 -0
@@ -206,10 +206,17 @@ void init_alloc_vpage(void *top)spin_unlock (&lock); } +bool __attribute__((__weak__))vm_available (void ) +{ +return true; +} +void __setup_vm (void *opaque) {phys_addr_t base, top; +assert_msg (vm_available (),"Virtual memory not available. Must check vm_available() before calling setup_vm()" ); +if (alloc_ops == &vmalloc_ops)return ;
lib/vmalloc.h +2 -0
@@ -17,6 +17,8 @@ extern void setup_vm(void);/* As above, plus passes an opaque value to setup_mmu(). */ extern void __setup_vm (void *opaque); +/* common/ tests must check availability before calling setup_vm() */ +extern bool vm_available (void );/* Set up paging */ extern void *setup_mmu (phys_addr_t top,void *opaque);/* Walk the page table and resolve the virtual address to a physical address */
Signature · 1 line
2.42.0
PATCH v7 30/35 powerpc: Add sieve.c common test
In reply to Nicholas PigginNow that sieve copes with lack of MMU support, it can be run by powerpc.
--- powerpc/Makefile.common | 1 + powerpc/sieve.c | 1 + powerpc/unittests.cfg | 3 +++ 3 files changed, 5 insertions(+) create mode 120000 powerpc/sieve.c
powerpc/Makefile.common +1 -0
@@ -8,6 +8,7 @@ tests-common = \ $(TEST_DIR)/selftest.elf \ $(TEST_DIR)/selftest-migration.elf \ $(TEST_DIR)/memory-verify.elf \ + $(TEST_DIR)/sieve.elf \ $(TEST_DIR)/spapr_hcall.elf \ $(TEST_DIR)/rtas.elf \ $(TEST_DIR)/emulator.elf \
powerpc/sieve.c new file +1 -0
@@ -0,0 +1 @@ +../common/sieve.c
powerpc/unittests.cfg +3 -0
@@ -121,3 +121,6 @@ file = sprs.elf machine = pseries extra_params = -append '-w' groups = migration + +[sieve] +file = sieve.elf
Signature · 1 line
2.42.0
PATCH v7 31/35 powerpc: add usermode support
In reply to Nicholas PigginThe biggest difficulty for user mode is MMU support. Otherwise it is a simple matter of setting and clearing MSR[PR] with rfid and sc respectively.
Some common harness operations will fail in usermode, so some workarounds are reqiured (e.g., puts() can't be used directly).
A usermode privileged instruction interrupt test is added.
--- lib/powerpc/asm/processor.h | 9 +++++++++ lib/powerpc/asm/reg.h | 1 + lib/powerpc/asm/smp.h | 1 + lib/powerpc/io.c | 7 +++++++ lib/powerpc/processor.c | 38 +++++++++++++++++++++++++++++++++++++ lib/powerpc/rtas.c | 3 +++ lib/powerpc/setup.c | 8 ++++++-- lib/powerpc/spinlock.c | 4 ++++ lib/ppc64/mmu.c | 2 ++ powerpc/interrupts.c | 28 +++++++++++++++++++++++++++ 10 files changed, 99 insertions(+), 2 deletions(-)
lib/powerpc/asm/processor.h +9 -0
@@ -19,6 +19,8 @@ extern bool cpu_has_prefix;extern bool cpu_has_sc_lev;extern bool cpu_has_pause_short; +bool in_usermode (void ); +static inline uint64_t mfspr (int nr) {uint64_t ret;
@@ -51,6 +53,8 @@ static inline void local_irq_enable(void) {unsigned long msr; +assert (!in_usermode ()); + asm volatile( " mfmsr %0 \n \ ori %0,%0,%1 \n \
@@ -62,6 +66,8 @@ static inline void local_irq_disable(void) {unsigned long msr; +assert (!in_usermode ()); + asm volatile( " mfmsr %0 \n \ andc %0,%0,%1 \n \
@@ -90,4 +96,7 @@ static inline bool machine_is_pseries(void)void enable_mcheck (void );void disable_mcheck (void ); +void enter_usermode (void ); +void exit_usermode (void ); +#endif /* _ASMPOWERPC_PROCESSOR_H_ */
lib/powerpc/asm/reg.h +1 -0
@@ -58,5 +58,6 @@#define MSR_SE UL(0x0400)/* Single Step Enable */ #define MSR_EE UL(0x8000)#define MSR_ME UL(0x1000) +#define MSR_PR UL(0x4000)#endif
lib/powerpc/asm/smp.h +1 -0
@@ -11,6 +11,7 @@ struct cpu {unsigned long server_no;unsigned long stack;unsigned long exception_stack; +bool in_user;secondary_entry_fn entry;pgd_t *pgtable; } __attribute__((packed)); /* used by asm */
lib/powerpc/io.c +7 -0
@@ -11,6 +11,7 @@#include <asm/setup.h> #include <asm/processor.h> #include <asm/atomic.h> +#include <asm/smp.h> #include "io.h" static struct spinlock print_lock;
@@ -41,10 +42,16 @@ void io_init(void)void puts (const char *s) { +bool user =in_usermode (); + +if (user) +exit_usermode ();spin_lock (&print_lock);while (*s)putchar (*s++);spin_unlock (&print_lock); +if (user) +enter_usermode (); }/*
lib/powerpc/processor.c +38 -0
@@ -47,6 +47,8 @@ void do_handle_exception(struct pt_regs *regs)unsigned char v; __current_cpu = (struct cpu *)mfspr (SPR_SPRG0 ); +if (in_usermode ()) +current_cpu ()->in_user = false;/* * We run with AIL=0, so interrupts taken with MMU disabled.
@@ -60,6 +62,8 @@ void do_handle_exception(struct pt_regs *regs)if (v <128 && handlers[v].func) { handlers[v].func (regs, handlers[v].data); +if (regs->msr &MSR_PR ) +current_cpu ()->in_user = true;return ; }
@@ -169,3 +173,37 @@ void disable_mcheck(void) {rfid_msr (mfmsr () & ~MSR_ME ); } + +bool in_usermode (void ) +{ +return current_cpu ()->in_user; +} + +static void usermode_sc_handler (struct pt_regs *regs,void *data) +{ + regs->msr &= ~(MSR_PR |MSR_EE ); +/* Interrupt return handler will keep in_user clear */ +} + +void enter_usermode (void ) +{ +assert_msg (!in_usermode (),"enter_usermode called with in_usermode" ); +/* mfmsr would fault in usermode anyway */ +assert_msg (!(mfmsr () &MSR_PR ),"enter_usermode called from user mode" ); +assert_msg (!(mfmsr () &MSR_EE ),"enter_usermode called with interrupts enabled" ); +assert_msg ((mfmsr () & (MSR_IR |MSR_DR )) == (MSR_IR |MSR_DR ), +"enter_usermode called with virtual memory disabled" ); + +handle_exception (0xc00 , usermode_sc_handler,NULL ); +rfid_msr (mfmsr () | (MSR_PR |MSR_IR |MSR_DR |MSR_EE )); +current_cpu ()->in_user = true; +} + +void exit_usermode (void ) +{ +assert_msg (in_usermode (),"enter_usermode called with !in_usermode" ); + asmvolatile ("sc 0" :::"memory" ); +handle_exception (0xc00 ,NULL ,NULL ); +assert (!in_usermode ()); +assert (!(mfmsr () &MSR_PR )); +}
lib/powerpc/rtas.c +3 -0
@@ -9,6 +9,7 @@#include <libfdt/libfdt.h> #include <devicetree.h> #include <asm/spinlock.h> +#include <asm/smp.h> #include <asm/hcall.h> #include <asm/io.h> #include <asm/rtas.h>
@@ -137,6 +138,8 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)va_list list;int ret; +assert_msg (!in_usermode (),"May not make RTAS call from user mode\n" ); +spin_lock (&rtas_lock);va_start (list, outputs);
lib/powerpc/setup.c +6 -2
@@ -201,8 +201,11 @@ void cpu_init(struct cpu *cpu, int cpu_id) cpu->exception_stack = (unsigned long )memalign (SZ_4K ,SZ_64K ); cpu->exception_stack +=SZ_64K -64 ; cpu->pgtable =NULL ; + cpu->in_user = false; } +bool is_hvmode; +void setup (const void *fdt) {void *freemem = &stacktop;
@@ -211,8 +214,6 @@ void setup(const void *fdt)u32 fdt_size;int ret; - cpu_has_hv = !!(mfmsr () & (1ULL <<MSR_HV_BIT )); -memset (cpus,0xff ,sizeof (cpus)); cpu = &cpus[0 ];
@@ -220,10 +221,13 @@ void setup(const void *fdt) cpu->exception_stack = (unsigned long )boot_exception_stack; cpu->exception_stack +=SZ_64K -64 ; cpu->pgtable =NULL ; + cpu->in_user = false;mtspr (SPR_SPRG0 , (unsigned long )cpu); __current_cpu = cpu; + cpu_has_hv = !!(mfmsr () & (1ULL <<MSR_HV_BIT )); +enable_mcheck ();/*
lib/powerpc/spinlock.c +4 -0
@@ -9,6 +9,8 @@*/ void spin_lock (struct spinlock *lock) { +assert (!in_usermode ()); +if (!multithreaded) {assert (lock->v ==0 ); lock->v =1 ;
@@ -20,7 +22,9 @@ void spin_lock(struct spinlock *lock)void spin_unlock (struct spinlock *lock) { +assert (!in_usermode ());assert (lock->v ==1 ); +if (!multithreaded) { lock->v =0 ; }else {
lib/ppc64/mmu.c +2 -0
@@ -42,6 +42,7 @@ void mmu_enable(pgd_t *pgtable) cpu->pgtable = pgtable; +assert (!in_usermode ());mtmsr (mfmsr () | (MSR_IR |MSR_DR )); }
@@ -51,6 +52,7 @@ void mmu_disable(void) cpu->pgtable =NULL ; +assert (!in_usermode ());mtmsr (mfmsr () & ~(MSR_IR |MSR_DR )); }
powerpc/interrupts.c +28 -0
@@ -326,6 +326,33 @@ static void test_illegal(void)report_prefix_pop (); } +static void dec_ignore_handler (struct pt_regs *regs,void *data) +{ +mtspr (SPR_DEC ,0x7fffffff ); +} + +static void test_privileged (void ) +{ +unsigned long msr; + +if (!mmu_enabled ()) +return ; + +report_prefix_push ("privileged instruction" ); + +handle_exception (0x700 , &program_handler,NULL ); +handle_exception (0x900 , &dec_ignore_handler,NULL ); +enter_usermode (); + asmvolatile ("mfmsr %0" :"=r" (msr) ::"memory" ); +exit_usermode (); +report (got_interrupt,"interrupt on privileged instruction" ); + got_interrupt = false; +handle_exception (0x900 ,NULL ,NULL ); +handle_exception (0x700 ,NULL ,NULL ); + +report_prefix_pop (); +} +static void sc_handler (struct pt_regs *regs,void *data) { got_interrupt = true;
@@ -478,6 +505,7 @@ int main(int argc, char **argv)test_mce ();test_mmu ();test_illegal (); +test_privileged ();test_dec ();test_sc ();test_trace ();
Signature · 1 line
2.42.0
PATCH v7 32/35 powerpc: add pmu tests
In reply to Nicholas PigginAdd some initial PMU testing.
- PMC5/6 tests
- PMAE / PMI test
- BHRB basic tests
--- lib/powerpc/asm/processor.h | 2 + lib/powerpc/asm/reg.h | 9 + lib/powerpc/asm/setup.h | 1 + lib/powerpc/setup.c | 23 +++ powerpc/Makefile.common | 3 +- powerpc/pmu.c | 336 ++++++++++++++++++++++++++++++++++++ powerpc/unittests.cfg | 3 + 7 files changed, 376 insertions(+), 1 deletion(-) create mode 100644 powerpc/pmu.c
lib/powerpc/asm/processor.h +2 -0
@@ -14,6 +14,8 @@ extern bool cpu_has_hv;extern bool cpu_has_power_mce;extern bool cpu_has_siar;extern bool cpu_has_heai; +extern bool cpu_has_bhrb; +extern bool cpu_has_p10_bhrb;extern bool cpu_has_radix;extern bool cpu_has_prefix;extern bool cpu_has_sc_lev;
lib/powerpc/asm/reg.h +9 -0
@@ -40,10 +40,19 @@#define SPR_LPIDR 0x13f#define SPR_HEIR 0x153#define SPR_PTCR 0x1d0 +#define SPR_MMCRA 0x312 +#define MMCRA_BHRBRD UL(0x0000002000000000) +#define MMCRA_IFM_MASK UL(0x00000000c0000000) +#define SPR_PMC5 0x317 +#define SPR_PMC6 0x318#define SPR_MMCR0 0x31b#define MMCR0_FC UL(0x80000000) +#define MMCR0_FCP UL(0x20000000)#define MMCR0_PMAE UL(0x04000000) +#define MMCR0_BHRBA UL(0x00200000) +#define MMCR0_FCPC UL(0x00001000)#define MMCR0_PMAO UL(0x00000080) +#define MMCR0_FC56 UL(0x00000010)#define SPR_SIAR 0x31c/* Machine State Register definitions: */
lib/powerpc/asm/setup.h +1 -0
@@ -10,6 +10,7 @@#define NR_CPUS 8/* arbitrarily set for now */ extern uint64_t tb_hz; +extern uint64_t cpu_hz;#define NR_MEM_REGIONS 8#define MR_F_PRIMARY (1U << 0)
lib/powerpc/setup.c +23 -0
@@ -32,6 +32,7 @@ u32 initrd_size;u32 cpu_to_hwid[NR_CPUS ] = { [0 ...NR_CPUS -1 ] = (~0U ) };int nr_cpus_present;uint64_t tb_hz; +uint64_t cpu_hz;struct mem_region mem_regions[NR_MEM_REGIONS ];phys_addr_t __physical_start, __physical_end;
@@ -41,6 +42,7 @@ struct cpu_set_params {unsigned icache_bytes;unsigned dcache_bytes;uint64_t tb_hz; +uint64_t cpu_hz; };static void cpu_set (int fdtnode,u64 regval,void *info)
@@ -94,6 +96,22 @@ static void cpu_set(int fdtnode, u64 regval, void *info) data = (u32 *)prop->data; params->tb_hz =fdt32_to_cpu (*data); + prop =fdt_get_property (dt_fdt (), fdtnode, +"ibm,extended-clock-frequency" ,NULL ); +if (prop) { + data = (u32 *)prop->data; + params->cpu_hz =fdt32_to_cpu (*data); + params->cpu_hz <<=32 ; + data = (u32 *)prop->data +1 ; + params->cpu_hz |=fdt32_to_cpu (*data); + }else { + prop =fdt_get_property (dt_fdt (), fdtnode, +"clock-frequency" ,NULL ); +assert (prop !=NULL ); + data = (u32 *)prop->data; + params->cpu_hz =fdt32_to_cpu (*data); + } + read_common_info = true; } }
@@ -102,6 +120,8 @@ bool cpu_has_hv;bool cpu_has_power_mce;/* POWER CPU machine checks */ bool cpu_has_siar;bool cpu_has_heai; +bool cpu_has_bhrb; +bool cpu_has_p10_bhrb;bool cpu_has_radix;bool cpu_has_prefix;bool cpu_has_sc_lev;/* sc interrupt has LEV field in SRR1 */
@@ -118,12 +138,14 @@ static void cpu_init_params(void) __icache_bytes = params.icache_bytes; __dcache_bytes = params.dcache_bytes; tb_hz = params.tb_hz; + cpu_hz = params.cpu_hz;switch (mfspr (SPR_PVR ) &PVR_VERSION_MASK ) {case PVR_VER_POWER10 : cpu_has_prefix = true; cpu_has_sc_lev = true; cpu_has_pause_short = true; + cpu_has_p10_bhrb = true;case PVR_VER_POWER9 : cpu_has_radix = true;case PVR_VER_POWER8E :
@@ -132,6 +154,7 @@ static void cpu_init_params(void) cpu_has_power_mce = true; cpu_has_heai = true; cpu_has_siar = true; + cpu_has_bhrb = true;break ;default :break ;
powerpc/Makefile.common +2 -1
@@ -17,7 +17,8 @@ tests-common = \ $(TEST_DIR)/smp.elf \ $(TEST_DIR)/sprs.elf \ $(TEST_DIR)/timebase.elf \ - $(TEST_DIR)/interrupts.elf + $(TEST_DIR)/interrupts.elf \ + $(TEST_DIR)/pmu.elf tests-all = $(tests-common) $(tests) all: directories $(TEST_DIR)/boot_rom.bin $(tests-all)
powerpc/pmu.c new file +336 -0
336 lines not on this page · raw message
powerpc/unittests.cfg +3 -0
@@ -74,6 +74,9 @@ file = emulator.elf [interrupts] file = interrupts.elf +[pmu] +file = pmu.elf + [smp] file = smp.elf smp = 2
Signature · 1 line
2.42.0
PATCH v7 33/35 configure: Make arch_libdir a first-class entity
In reply to Nicholas Pigginarch_libdir was brought in to improve the heuristic determination of the lib/ directory based on arch and testdir names, but it did not entirely clean that mess up.
Remove the arch_libdir->arch->testdir heuristic and just require everybody sets arch_libdir correctly. Fail if the lib/arch or lib/arch/asm directories can not be found.
--- Makefile | 2 +- configure | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-)
Makefile +1 -1
@@ -10,7 +10,7 @@ include config.mak VPATH = $(SRCDIR) libdirs-get = $(shell [ -d "lib/$(1)" ] && echo "lib/$(1) lib/$(1)/asm") -ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) $(call libdirs-get,$(TEST_DIR)) +ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) OBJDIRS := $(ARCH_LIBDIRS) DESTDIR := $(PREFIX)/share/kvm-unit-tests/
configure +13 -5
@@ -216,7 +216,6 @@ fi arch_name=$arch [ "$arch" = "aarch64" ] && arch="arm64" [ "$arch_name" = "arm64" ] && arch_name="aarch64" -arch_libdir=$arch if [ "$arch" = "riscv" ]; then echo "riscv32 or riscv64 must be specified"
@@ -286,8 +285,10 @@ fi if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then testdir=x86 + arch_libdir=x86 elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then testdir=arm + arch_libdir=$arch if [ "$target" = "qemu" ]; then arm_uart_early_addr=0x09000000 elif [ "$target" = "kvmtool" ]; then
@@ -336,6 +337,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then fi elif [ "$arch" = "ppc64" ]; then testdir=powerpc + arch_libdir=ppc64 firmware="$testdir/boot_rom.bin" if [ "$endian" != "little" ] && [ "$endian" != "big" ]; then echo "You must provide endianness (big or little)!"
@@ -346,6 +348,7 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then arch_libdir=riscv elif [ "$arch" = "s390x" ]; then testdir=s390x + arch_libdir=s390x else echo "arch $arch is not supported!" arch=
@@ -355,6 +358,10 @@ if [ ! -d "$srcdir/$testdir" ]; then echo "$srcdir/$testdir does not exist!" exit 1 fi +if [ ! -d "$srcdir/lib/$arch_libdir" ]; then + echo "$srcdir/lib/$arch_libdir does not exist!" + exit 1 +fi if [ "$efi" = "y" ] && [ -f "$srcdir/$testdir/efi/run" ]; then ln -fs "$srcdir/$testdir/efi/run" $testdir-run
@@ -417,10 +424,11 @@ fi # link lib/asm for the architecture rm -f lib/asm asm="asm-generic" -if [ -d "$srcdir/lib/$arch/asm" ]; then - asm="$srcdir/lib/$arch/asm" -elif [ -d "$srcdir/lib/$testdir/asm" ]; then - asm="$srcdir/lib/$testdir/asm" +if [ -d "$srcdir/lib/$arch_libdir/asm" ]; then + asm="$srcdir/lib/$arch_libdir/asm" +else + echo "$srcdir/lib/$arch_libdir/asm does not exist" + exit 1 fi mkdir -p lib ln -sf "$asm" lib/asm
Signature · 1 line
2.42.0
PATCH v7 34/35 powerpc: Remove remnants of ppc64 directory and build structure
In reply to Nicholas PigginThis moves merges ppc64 directories and files into powerpc, and merges the 3 makefiles into one.
The configure --arch=powerpc option is aliased to ppc64 for good measure.
---
MAINTAINERS | 1 -
configure | 3 +-
lib/{ppc64 => powerpc}/asm-offsets.c | 0
lib/{ppc64 => powerpc}/asm/asm-offsets.h | 0
lib/{ppc64 => powerpc}/asm/atomic.h | 0
lib/{ppc64 => powerpc}/asm/barrier.h | 4 +-
lib/{ppc64 => powerpc}/asm/bitops.h | 4 +-
lib/{ppc64 => powerpc}/asm/io.h | 4 +-
lib/{ppc64 => powerpc}/asm/mmu.h | 0
lib/{ppc64 => powerpc}/asm/opal.h | 4 +-
lib/{ppc64 => powerpc}/asm/page.h | 6 +-
lib/{ppc64 => powerpc}/asm/pgtable-hwdef.h | 6 +-
lib/{ppc64 => powerpc}/asm/pgtable.h | 2 +-
lib/{ppc64 => powerpc}/asm/ptrace.h | 6 +-
lib/{ppc64 => powerpc}/asm/spinlock.h | 6 +-
lib/powerpc/asm/stack.h | 3 +
lib/{ppc64 => powerpc}/asm/vpa.h | 0
lib/{ppc64 => powerpc}/mmu.c | 0
lib/{ppc64 => powerpc}/opal-calls.S | 0
lib/{ppc64 => powerpc}/opal.c | 0
lib/{ppc64 => powerpc}/stack.c | 0
lib/ppc64/.gitignore | 1 -
lib/ppc64/asm/handlers.h | 1 -
lib/ppc64/asm/hcall.h | 1 -
lib/ppc64/asm/memory_areas.h | 6 --
lib/ppc64/asm/ppc_asm.h | 1 -
lib/ppc64/asm/processor.h | 1 -
lib/ppc64/asm/reg.h | 1 -
lib/ppc64/asm/rtas.h | 1 -
lib/ppc64/asm/setup.h | 1 -
lib/ppc64/asm/smp.h | 1 -
lib/ppc64/asm/stack.h | 11 --
powerpc/Makefile | 111 ++++++++++++++++++++-
powerpc/Makefile.common | 95 ------------------
powerpc/Makefile.ppc64 | 31 ------
35 files changed, 136 insertions(+), 176 deletions(-)
rename lib/{ppc64 => powerpc}/asm-offsets.c (100%)
rename lib/{ppc64 => powerpc}/asm/asm-offsets.h (100%)
rename lib/{ppc64 => powerpc}/asm/atomic.h (100%)
rename lib/{ppc64 => powerpc}/asm/barrier.h (83%)
rename lib/{ppc64 => powerpc}/asm/bitops.h (69%)
rename lib/{ppc64 => powerpc}/asm/io.h (50%)
rename lib/{ppc64 => powerpc}/asm/mmu.h (100%)
rename lib/{ppc64 => powerpc}/asm/opal.h (90%)
rename lib/{ppc64 => powerpc}/asm/page.h (94%)
rename lib/{ppc64 => powerpc}/asm/pgtable-hwdef.h (93%)
rename lib/{ppc64 => powerpc}/asm/pgtable.h (99%)
rename lib/{ppc64 => powerpc}/asm/ptrace.h (89%)
rename lib/{ppc64 => powerpc}/asm/spinlock.h (54%)
rename lib/{ppc64 => powerpc}/asm/vpa.h (100%)
rename lib/{ppc64 => powerpc}/mmu.c (100%)
rename lib/{ppc64 => powerpc}/opal-calls.S (100%)
rename lib/{ppc64 => powerpc}/opal.c (100%)
rename lib/{ppc64 => powerpc}/stack.c (100%)
delete mode 100644 lib/ppc64/.gitignore
delete mode 100644 lib/ppc64/asm/handlers.h
delete mode 100644 lib/ppc64/asm/hcall.h
delete mode 100644 lib/ppc64/asm/memory_areas.h
delete mode 100644 lib/ppc64/asm/ppc_asm.h
delete mode 100644 lib/ppc64/asm/processor.h
delete mode 100644 lib/ppc64/asm/reg.h
delete mode 100644 lib/ppc64/asm/rtas.h
delete mode 100644 lib/ppc64/asm/setup.h
delete mode 100644 lib/ppc64/asm/smp.h
delete mode 100644 lib/ppc64/asm/stack.h
delete mode 100644 powerpc/Makefile.common
delete mode 100644 powerpc/Makefile.ppc64MAINTAINERS +0 -1
@@ -92,7 +92,6 @@ S: Maintained L: [email protected] F: powerpc/ F: lib/powerpc/ -F: lib/ppc64/ RISCV M: Andrew Jones <[email protected]>
configure +2 -1
@@ -215,6 +215,7 @@ fi arch_name=$arch [ "$arch" = "aarch64" ] && arch="arm64" +[ "$arch" = "powerpc" ] && arch="ppc64" [ "$arch_name" = "arm64" ] && arch_name="aarch64" if [ "$arch" = "riscv" ]; then
@@ -337,7 +338,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then fi elif [ "$arch" = "ppc64" ]; then testdir=powerpc - arch_libdir=ppc64 + arch_libdir=powerpc firmware="$testdir/boot_rom.bin" if [ "$endian" != "little" ] && [ "$endian" != "big" ]; then echo "You must provide endianness (big or little)!"
lib/powerpc/asm-offsets.c renamed from lib/ppc64/asm-offsets.c +0 -0
lib/powerpc/asm/asm-offsets.h renamed from lib/ppc64/asm/asm-offsets.h +0 -0
lib/powerpc/asm/atomic.h renamed from lib/ppc64/asm/atomic.h +0 -0
lib/powerpc/asm/barrier.h renamed from lib/ppc64/asm/barrier.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef _ASMPPC64_BARRIER_H_ -#define _ASMPPC64_BARRIER_H_ +#ifndef _ASMPOWERPC_BARRIER_H_ +#define _ASMPOWERPC_BARRIER_H_#define cpu_relax () asm volatile("or 1,1,1 ; or 2,2,2" ::: "memory")#define pause_short () asm volatile(".long 0x7c40003c" ::: "memory")
lib/powerpc/asm/bitops.h renamed from lib/ppc64/asm/bitops.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef _ASMPPC64_BITOPS_H_ -#define _ASMPPC64_BITOPS_H_ +#ifndef _ASMPOWERPC_BITOPS_H_ +#define _ASMPOWERPC_BITOPS_H_#ifndef _BITOPS_H_#error only <bitops.h> can be included directly
lib/powerpc/asm/io.h renamed from lib/ppc64/asm/io.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef _ASMPPC64_IO_H_ -#define _ASMPPC64_IO_H_ +#ifndef _ASMPOWERPC_IO_H_ +#define _ASMPOWERPC_IO_H_#define __iomem
lib/powerpc/asm/mmu.h renamed from lib/ppc64/asm/mmu.h +0 -0
lib/powerpc/asm/opal.h renamed from lib/ppc64/asm/opal.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _ASMPPC64_OPAL_H_ -#define _ASMPPC64_OPAL_H_ +#ifndef _ASMPOWERPC_OPAL_H_ +#define _ASMPOWERPC_OPAL_H_#include <stdint.h>
lib/powerpc/asm/page.h renamed from lib/ppc64/asm/page.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _ASMPPC64_PAGE_H_ -#define _ASMPPC64_PAGE_H_ +#ifndef _ASMPOWERPC_PAGE_H_ +#define _ASMPOWERPC_PAGE_H_/* * Adapted from * lib/arm64/asm/page.h and Linux kernel defines.
@@ -62,4 +62,4 @@ extern unsigned long __phys_to_virt(phys_addr_t addr);extern void *__ioremap (phys_addr_t phys_addr,size_t size);#endif /* !__ASSEMBLY__ */ -#endif /* _ASMPPC64_PAGE_H_ */ +#endif /* _ASMPOWERPC_PAGE_H_ */
lib/powerpc/asm/pgtable-hwdef.h renamed from lib/ppc64/asm/pgtable-hwdef.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _ASMPPC64_PGTABLE_HWDEF_H_ -#define _ASMPPC64_PGTABLE_HWDEF_H_ +#ifndef _ASMPOWERPC_PGTABLE_HWDEF_H_ +#define _ASMPOWERPC_PGTABLE_HWDEF_H_/* * Copyright (C) 2024, IBM Inc, Nicholas Piggin <[email protected]> *
@@ -63,4 +63,4 @@#define PHYS_MASK_SHIFT (48)#define PHYS_MASK ((UL(1) << PHYS_MASK_SHIFT) - 1) -#endif /* _ASMPPC64_PGTABLE_HWDEF_H_ */ +#endif /* _ASMPOWERPC_PGTABLE_HWDEF_H_ */
lib/powerpc/asm/pgtable.h renamed from lib/ppc64/asm/pgtable.h +1 -1
@@ -122,4 +122,4 @@ static inline pte_t *pte_alloc(pmd_t *pmd, unsigned long addr) return pte_offset(pmd, addr); } -#endif /* _ASMPPC64_PGTABLE_H_ */ +#endif /* _ASMPOWERPC_PGTABLE_H_ */
lib/powerpc/asm/ptrace.h renamed from lib/ppc64/asm/ptrace.h +3 -3
@@ -1,5 +1,5 @@ -#ifndef _ASMPPC64_PTRACE_H_ -#define _ASMPPC64_PTRACE_H_ +#ifndef _ASMPOWERPC_PTRACE_H_ +#define _ASMPOWERPC_PTRACE_H_#define KERNEL_REDZONE_SIZE 288#define STACK_FRAME_OVERHEAD 112/* size of minimum stack frame */
@@ -38,4 +38,4 @@ static inline void regs_advance_insn(struct pt_regs *regs)#endif /* __ASSEMBLY__ */ -#endif /* _ASMPPC64_PTRACE_H_ */ +#endif /* _ASMPOWERPC_PTRACE_H_ */
lib/powerpc/asm/spinlock.h renamed from lib/ppc64/asm/spinlock.h +3 -3
@@ -1,5 +1,5 @@ -#ifndef _ASMPPC64_SPINLOCK_H_ -#define _ASMPPC64_SPINLOCK_H_ +#ifndef _ASMPOWERPC_SPINLOCK_H_ +#define _ASMPOWERPC_SPINLOCK_H_ struct spinlock { unsigned int v;
@@ -8,4 +8,4 @@ struct spinlock {void spin_lock (struct spinlock *lock);void spin_unlock (struct spinlock *lock); -#endif /* _ASMPPC64_SPINLOCK_H_ */ +#endif /* _ASMPOWERPC_SPINLOCK_H_ */
lib/powerpc/asm/stack.h +3 -0
@@ -5,4 +5,7 @@#error Do not directly include <asm/stack.h>. Just use <stack.h>.#endif +#define HAVE_ARCH_BACKTRACE +#define HAVE_ARCH_BACKTRACE_FRAME +#endif
lib/powerpc/asm/vpa.h renamed from lib/ppc64/asm/vpa.h +0 -0
lib/powerpc/mmu.c renamed from lib/ppc64/mmu.c +0 -0
lib/powerpc/opal-calls.S renamed from lib/ppc64/opal-calls.S +0 -0
lib/powerpc/opal.c renamed from lib/ppc64/opal.c +0 -0
lib/powerpc/stack.c renamed from lib/ppc64/stack.c +0 -0
lib/ppc64/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -asm-offsets.[hs]
lib/ppc64/asm/handlers.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/handlers.h"
lib/ppc64/asm/hcall.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/hcall.h"
lib/ppc64/asm/memory_areas.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef _ASMPPC64_MEMORY_AREAS_H_ -#define _ASMPPC64_MEMORY_AREAS_H_ - -#include <asm-generic/memory_areas.h> - -#endif
lib/ppc64/asm/ppc_asm.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/ppc_asm.h"
lib/ppc64/asm/processor.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/processor.h"
lib/ppc64/asm/reg.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/reg.h"
lib/ppc64/asm/rtas.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/rtas.h"
lib/ppc64/asm/setup.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/setup.h"
lib/ppc64/asm/smp.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../powerpc/asm/smp.h"
lib/ppc64/asm/stack.h deleted +0 -11
@@ -1,11 +0,0 @@ -#ifndef _ASMPPC64_STACK_H_ -#define _ASMPPC64_STACK_H_ - -#ifndef _STACK_H_ -#error Do not directly include <asm/stack.h>. Just use <stack.h>. -#endif - -#define HAVE_ARCH_BACKTRACE -#define HAVE_ARCH_BACKTRACE_FRAME - -#endif
powerpc/Makefile +110 -1
111 lines not on this page · raw message
powerpc/Makefile.common deleted +0 -95
95 lines not on this page · raw message
powerpc/Makefile.ppc64 deleted +0 -31
@@ -1,31 +0,0 @@ -# -# ppc64 makefile -# -# Authors: Andrew Jones <[email protected]> -# -bits = 64 - -ifeq ($(ENDIAN),little) - arch_CFLAGS = -mlittle-endian - arch_LDFLAGS = -EL -else - arch_CFLAGS = -mbig-endian - arch_LDFLAGS = -EB -endif - -cstart.o = $(TEST_DIR)/cstart64.o -reloc.o = $(TEST_DIR)/reloc64.o - -OBJDIRS += lib/ppc64 -cflatobjs += lib/ppc64/stack.o -cflatobjs += lib/ppc64/mmu.o -cflatobjs += lib/ppc64/opal.o -cflatobjs += lib/ppc64/opal-calls.o - -# ppc64 specific tests -tests = $(TEST_DIR)/spapr_vpa.elf - -include $(SRCDIR)/$(TEST_DIR)/Makefile.common - -arch_clean: powerpc_clean - $(RM) lib/ppc64/.*.d
Signature · 1 line
2.42.0
PATCH v7 35/35 powerpc: gitlab CI update
In reply to Nicholas PigginThis adds testing for the powernv machine, and adds a gitlab-ci test group instead of specifying all tests in .gitlab-ci.yml.
--- .gitlab-ci.yml | 20 ++++++++------------ powerpc/unittests.cfg | 14 ++++++++------ 2 files changed, 16 insertions(+), 18 deletions(-)
.gitlab-ci.yml +8 -12
@@ -97,12 +97,10 @@ build-ppc64be: - cd build - ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu- - make -j2 - - ACCEL=tcg ./run_tests.sh - selftest-setup selftest-migration selftest-migration-skip spapr_hcall - rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day - emulator - | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci | tee results.txt + - grep -q PASS results.txt && ! grep -q FAIL results.txt + - ACCEL=tcg MAX_SMP=8 MACHINE=powernv ./run_tests.sh -g gitlab-ci | tee results.txt + - grep -q PASS results.txt && ! grep -q FAIL results.txt build-ppc64le: extends: .intree_template
@@ -110,12 +108,10 @@ build-ppc64le: - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat - ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu- - make -j2 - - ACCEL=tcg ./run_tests.sh - selftest-setup selftest-migration selftest-migration-skip spapr_hcall - rtas-get-time-of-day rtas-get-time-of-day-base rtas-set-time-of-day - emulator - | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci | tee results.txt + - grep -q PASS results.txt && ! grep -q FAIL results.txt + - ACCEL=tcg MAX_SMP=8 MACHINE=powernv ./run_tests.sh -g gitlab-ci | tee results.txt + - grep -q PASS results.txt && ! grep -q FAIL results.txt # build-riscv32: # Fedora doesn't package a riscv32 compiler for QEMU. Oh, well.
powerpc/unittests.cfg +8 -6
@@ -16,12 +16,12 @@ file = selftest.elf smp = 2 extra_params = -m 1g -append 'setup smp=2 mem=1024' -groups = selftest +groups = selftest gitlab-ci [selftest-migration] file = selftest-migration.elf machine = pseries -groups = selftest migration +groups = selftest migration gitlab-ci # TODO: Remove accel=kvm once the following TCG migration fix has been merged: # https://lore.kernel.org/qemu-devel/[email protected]/ accel = kvm
@@ -29,7 +29,7 @@ accel = kvm [selftest-migration-skip] file = selftest-migration.elf machine = pseries -groups = selftest migration +groups = selftest migration gitlab-ci extra_params = -append "skip" # This fails due to a QEMU TCG bug so KVM-only until QEMU is fixed upstream
@@ -42,6 +42,7 @@ groups = migration [spapr_hcall] file = spapr_hcall.elf machine = pseries +groups = gitlab-ci [spapr_vpa] file = spapr_vpa.elf
@@ -52,24 +53,25 @@ file = rtas.elf machine = pseries timeout = 5 extra_params = -append "get-time-of-day date=$(date +%s)" -groups = rtas +groups = rtas gitlab-ci [rtas-get-time-of-day-base] file = rtas.elf machine = pseries timeout = 5 extra_params = -rtc base="2006-06-17" -append "get-time-of-day date=$(date --date="2006-06-17 UTC" +%s)" -groups = rtas +groups = rtas gitlab-ci [rtas-set-time-of-day] file = rtas.elf machine = pseries extra_params = -append "set-time-of-day" timeout = 5 -groups = rtas +groups = rtas gitlab-ci [emulator] file = emulator.elf +groups = gitlab-ci [interrupts] file = interrupts.elf
Signature · 1 line
2.42.0