| Message ID | 20221130142249.3558647-4-nrb@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | lib: add function to request migration | expand |
On Wed, 30 Nov 2022 15:22:48 +0100 Nico Boehr <nrb@linux.ibm.com> wrote: > migrate_once() can simplify the control flow in migration-skey and > migration-cmm. > > Signed-off-by: Nico Boehr <nrb@linux.ibm.com> looks good in general, but maybe it can be made a little less intrusive (see below) > --- > s390x/Makefile | 1 + > s390x/migration-cmm.c | 27 +++++++++------------------ > s390x/migration-sck.c | 4 ++-- > s390x/migration-skey.c | 23 +++++++++-------------- > s390x/migration.c | 7 ++----- > 5 files changed, 23 insertions(+), 39 deletions(-) > > diff --git a/s390x/Makefile b/s390x/Makefile > index bf1504f9d58c..52a9d821974e 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -85,6 +85,7 @@ cflatobjs += lib/alloc_page.o > cflatobjs += lib/vmalloc.o > cflatobjs += lib/alloc_phys.o > cflatobjs += lib/getchar.o > +cflatobjs += lib/migrate.o > cflatobjs += lib/s390x/io.o > cflatobjs += lib/s390x/stack.o > cflatobjs += lib/s390x/sclp.o > diff --git a/s390x/migration-cmm.c b/s390x/migration-cmm.c > index aa7910ca76bf..64adc6ed9e14 100644 > --- a/s390x/migration-cmm.c > +++ b/s390x/migration-cmm.c > @@ -9,6 +9,7 @@ > */ > > #include <libcflat.h> > +#include <migrate.h> > #include <asm/interrupt.h> > #include <asm/page.h> > #include <asm/cmm.h> > @@ -31,6 +32,11 @@ static void test_migration(void) > BIT(ESSA_USAGE_VOLATILE) | BIT(ESSA_USAGE_POT_VOLATILE) /* ESSA_SET_POT_VOLATILE */ > }; > > + if (!check_essa_available()) { > + report_skip("ESSA is not available"); > + return; > + } not here ^ > + > assert(NUM_PAGES % 4 == 0); > for (i = 0; i < NUM_PAGES; i += 4) { > essa(ESSA_SET_STABLE, (unsigned long)pagebuf[i]); > @@ -39,8 +45,7 @@ static void test_migration(void) > essa(ESSA_SET_POT_VOLATILE, (unsigned long)pagebuf[i + 3]); > } > > - puts("Please migrate me, then press return\n"); > - (void)getchar(); > + migrate_once(); > > for (i = 0; i < NUM_PAGES; i++) { > actual_state = essa(ESSA_GET_STATE, (unsigned long)pagebuf[i]); > @@ -53,25 +58,11 @@ static void test_migration(void) > > int main(void) > { > - bool has_essa = check_essa_available(); > - > report_prefix_push("migration-cmm"); > - if (!has_essa) { keep this ^ > - report_skip("ESSA is not available"); keep this ^ else test_migration(); > - > - /* > - * If we just exit and don't ask migrate_cmd to migrate us, it > - * will just hang forever. Hence, also ask for migration when we > - * skip this test alltogether. > - */ > - puts("Please migrate me, then press return\n"); > - (void)getchar(); > - > - goto done; > - } > > test_migration(); > -done: remove all the above ^^ > + migrate_once(); > + > report_prefix_pop(); > return report_summary(); > } > diff --git a/s390x/migration-sck.c b/s390x/migration-sck.c > index 2d9a195ab4c4..2a9c87071643 100644 > --- a/s390x/migration-sck.c > +++ b/s390x/migration-sck.c > @@ -9,6 +9,7 @@ > */ > > #include <libcflat.h> > +#include <migrate.h> > #include <asm/time.h> > > static void test_sck_migration(void) > @@ -30,8 +31,7 @@ static void test_sck_migration(void) > report(!cc, "clock running after set"); > report(now_after_set >= time_to_set, "TOD clock value is larger than what has been set"); > > - puts("Please migrate me, then press return\n"); > - (void)getchar(); > + migrate_once(); > > cc = stckf(&now_after_migration); > report(!cc, "clock still set"); > diff --git a/s390x/migration-skey.c b/s390x/migration-skey.c > index b7bd82581abe..a655d30e8312 100644 > --- a/s390x/migration-skey.c > +++ b/s390x/migration-skey.c > @@ -9,6 +9,7 @@ > */ > > #include <libcflat.h> > +#include <migrate.h> > #include <asm/facility.h> > #include <asm/page.h> > #include <asm/mem.h> > @@ -23,6 +24,11 @@ static void test_migration(void) > union skey expected_key, actual_key; > int i, key_to_set, key_mismatches = 0; > > + if (test_facility(169)) { > + report_skip("storage key removal facility is active"); > + return; > + } same here > + > for (i = 0; i < NUM_PAGES; i++) { > /* > * Storage keys are 7 bit, lowest bit is always returned as zero > @@ -35,8 +41,7 @@ static void test_migration(void) > set_storage_key(pagebuf[i], key_to_set, 1); > } > > - puts("Please migrate me, then press return\n"); > - (void)getchar(); > + migrate_once(); > > for (i = 0; i < NUM_PAGES; i++) { > actual_key.val = get_storage_key(pagebuf[i]); > @@ -64,19 +69,9 @@ static void test_migration(void) > int main(void) > { > report_prefix_push("migration-skey"); > - if (test_facility(169)) { > - report_skip("storage key removal facility is active"); keep the if ^ > > - /* > - * If we just exit and don't ask migrate_cmd to migrate us, it > - * will just hang forever. Hence, also ask for migration when we > - * skip this test altogether. > - */ > - puts("Please migrate me, then press return\n"); > - (void)getchar(); remove that ^ > - } else { > - test_migration(); keep the else ^ > - } > + test_migration(); not needed anymore ^ > + migrate_once(); > > report_prefix_pop(); > return report_summary(); > diff --git a/s390x/migration.c b/s390x/migration.c > index a45296374cd8..fe6ea8369edb 100644 > --- a/s390x/migration.c > +++ b/s390x/migration.c > @@ -8,6 +8,7 @@ > * Nico Boehr <nrb@linux.ibm.com> > */ > #include <libcflat.h> > +#include <migrate.h> > #include <asm/arch_def.h> > #include <asm/vector.h> > #include <asm/barrier.h> > @@ -178,11 +179,7 @@ int main(void) > mb(); > flag_thread_complete = 0; > > - /* ask migrate_cmd to migrate (it listens for 'migrate') */ > - puts("Please migrate me, then press return\n"); > - > - /* wait for migration to finish, we will read a newline */ > - (void)getchar(); > + migrate_once(); > > flag_migration_complete = 1; >
diff --git a/s390x/Makefile b/s390x/Makefile index bf1504f9d58c..52a9d821974e 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -85,6 +85,7 @@ cflatobjs += lib/alloc_page.o cflatobjs += lib/vmalloc.o cflatobjs += lib/alloc_phys.o cflatobjs += lib/getchar.o +cflatobjs += lib/migrate.o cflatobjs += lib/s390x/io.o cflatobjs += lib/s390x/stack.o cflatobjs += lib/s390x/sclp.o diff --git a/s390x/migration-cmm.c b/s390x/migration-cmm.c index aa7910ca76bf..64adc6ed9e14 100644 --- a/s390x/migration-cmm.c +++ b/s390x/migration-cmm.c @@ -9,6 +9,7 @@ */ #include <libcflat.h> +#include <migrate.h> #include <asm/interrupt.h> #include <asm/page.h> #include <asm/cmm.h> @@ -31,6 +32,11 @@ static void test_migration(void) BIT(ESSA_USAGE_VOLATILE) | BIT(ESSA_USAGE_POT_VOLATILE) /* ESSA_SET_POT_VOLATILE */ }; + if (!check_essa_available()) { + report_skip("ESSA is not available"); + return; + } + assert(NUM_PAGES % 4 == 0); for (i = 0; i < NUM_PAGES; i += 4) { essa(ESSA_SET_STABLE, (unsigned long)pagebuf[i]); @@ -39,8 +45,7 @@ static void test_migration(void) essa(ESSA_SET_POT_VOLATILE, (unsigned long)pagebuf[i + 3]); } - puts("Please migrate me, then press return\n"); - (void)getchar(); + migrate_once(); for (i = 0; i < NUM_PAGES; i++) { actual_state = essa(ESSA_GET_STATE, (unsigned long)pagebuf[i]); @@ -53,25 +58,11 @@ static void test_migration(void) int main(void) { - bool has_essa = check_essa_available(); - report_prefix_push("migration-cmm"); - if (!has_essa) { - report_skip("ESSA is not available"); - - /* - * If we just exit and don't ask migrate_cmd to migrate us, it - * will just hang forever. Hence, also ask for migration when we - * skip this test alltogether. - */ - puts("Please migrate me, then press return\n"); - (void)getchar(); - - goto done; - } test_migration(); -done: + migrate_once(); + report_prefix_pop(); return report_summary(); } diff --git a/s390x/migration-sck.c b/s390x/migration-sck.c index 2d9a195ab4c4..2a9c87071643 100644 --- a/s390x/migration-sck.c +++ b/s390x/migration-sck.c @@ -9,6 +9,7 @@ */ #include <libcflat.h> +#include <migrate.h> #include <asm/time.h> static void test_sck_migration(void) @@ -30,8 +31,7 @@ static void test_sck_migration(void) report(!cc, "clock running after set"); report(now_after_set >= time_to_set, "TOD clock value is larger than what has been set"); - puts("Please migrate me, then press return\n"); - (void)getchar(); + migrate_once(); cc = stckf(&now_after_migration); report(!cc, "clock still set"); diff --git a/s390x/migration-skey.c b/s390x/migration-skey.c index b7bd82581abe..a655d30e8312 100644 --- a/s390x/migration-skey.c +++ b/s390x/migration-skey.c @@ -9,6 +9,7 @@ */ #include <libcflat.h> +#include <migrate.h> #include <asm/facility.h> #include <asm/page.h> #include <asm/mem.h> @@ -23,6 +24,11 @@ static void test_migration(void) union skey expected_key, actual_key; int i, key_to_set, key_mismatches = 0; + if (test_facility(169)) { + report_skip("storage key removal facility is active"); + return; + } + for (i = 0; i < NUM_PAGES; i++) { /* * Storage keys are 7 bit, lowest bit is always returned as zero @@ -35,8 +41,7 @@ static void test_migration(void) set_storage_key(pagebuf[i], key_to_set, 1); } - puts("Please migrate me, then press return\n"); - (void)getchar(); + migrate_once(); for (i = 0; i < NUM_PAGES; i++) { actual_key.val = get_storage_key(pagebuf[i]); @@ -64,19 +69,9 @@ static void test_migration(void) int main(void) { report_prefix_push("migration-skey"); - if (test_facility(169)) { - report_skip("storage key removal facility is active"); - /* - * If we just exit and don't ask migrate_cmd to migrate us, it - * will just hang forever. Hence, also ask for migration when we - * skip this test altogether. - */ - puts("Please migrate me, then press return\n"); - (void)getchar(); - } else { - test_migration(); - } + test_migration(); + migrate_once(); report_prefix_pop(); return report_summary(); diff --git a/s390x/migration.c b/s390x/migration.c index a45296374cd8..fe6ea8369edb 100644 --- a/s390x/migration.c +++ b/s390x/migration.c @@ -8,6 +8,7 @@ * Nico Boehr <nrb@linux.ibm.com> */ #include <libcflat.h> +#include <migrate.h> #include <asm/arch_def.h> #include <asm/vector.h> #include <asm/barrier.h> @@ -178,11 +179,7 @@ int main(void) mb(); flag_thread_complete = 0; - /* ask migrate_cmd to migrate (it listens for 'migrate') */ - puts("Please migrate me, then press return\n"); - - /* wait for migration to finish, we will read a newline */ - (void)getchar(); + migrate_once(); flag_migration_complete = 1;
migrate_once() can simplify the control flow in migration-skey and migration-cmm. Signed-off-by: Nico Boehr <nrb@linux.ibm.com> --- s390x/Makefile | 1 + s390x/migration-cmm.c | 27 +++++++++------------------ s390x/migration-sck.c | 4 ++-- s390x/migration-skey.c | 23 +++++++++-------------- s390x/migration.c | 7 ++----- 5 files changed, 23 insertions(+), 39 deletions(-)