s390x: Add migration test for guest TOD clock
v3 cover s390x: Add migration test for guest TOD clock
v2->v3:
---
- check the clock is really set after setting (thanks Claudio)
- remove unneeded memory clobber (thanks Claudio)
- add comment to explain what we're testing (thanks Christian)
v1->v2:
---
- remove unneeded include
- advance clock by 10 minutes instead of 1 minute (thanks Claudio)
- express get_clock_us() using stck() (thanks Claudio)
The guest TOD clock should not go backwards on migration. Add a test to verify that.
To reduce code duplication, move some of the time-related defined from the sck test to the library.
Nico Boehr (2):
lib/s390x: move TOD clock related functions to library
s390x: add migration TOD clock test
lib/s390x/asm/time.h | 50 ++++++++++++++++++++++++++++++++++++++- s390x/Makefile | 1 + s390x/migration-sck.c | 54 +++++++++++++++++++++++++++++++++++++++++++ s390x/sck.c | 32 ------------------------- s390x/unittests.cfg | 4 ++++ 5 files changed, 108 insertions(+), 33 deletions(-) create mode 100644 s390x/migration-sck.c
Signature · 1 line
2.36.1
PATCH v3 1/2 lib/s390x: move TOD clock related functions to library
The TOD-clock related functions can be useful for other tests beside the sck test, hence move them to the library.
While at it, add a wrapper for stckf, express get_clock_us() with stck() and remove an unneeded memory clobber.
--- lib/s390x/asm/time.h | 50 +++++++++++++++++++++++++++++++++++++++++++- s390x/sck.c | 32 ---------------------------- 2 files changed, 49 insertions(+), 33 deletions(-)
lib/s390x/asm/time.h +49 -1
@@ -18,11 +18,59 @@#define CPU_TIMER_SHIFT_US S390_CLOCK_SHIFT_US +static inline int sck (uint64_t *time) +{ +int cc; + + asmvolatile ( +" sck %[time]\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc) + : [time]"Q" (*time) + :"cc" + ); + +return cc; +} + +static inline int stck (uint64_t *time) +{ +int cc; + + asmvolatile ( +" stck %[time]\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc), [time]"=Q" (*time) + : + :"cc" + ); + +return cc; +} + +static inline int stckf (uint64_t *time) +{ +int cc; + + asmvolatile ( +" stckf %[time]\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc), [time]"=Q" (*time) + : + :"cc" + ); + +return cc; +} +static inline uint64_t get_clock_us (void ) {uint64_t clk; - asmvolatile (" stck %0 " : :"Q" (clk) :"memory" ); +stck (&clk);return clk >>STCK_SHIFT_US ; }
s390x/sck.c +0 -32
@@ -12,38 +12,6 @@#include <asm/interrupt.h> #include <asm/time.h> -static inline int sck (uint64_t *time) -{ -int cc; - - asmvolatile ( -" sck %[time]\n" -" ipm %[cc]\n" -" srl %[cc],28\n" - : [cc]"=d" (cc) - : [time]"Q" (*time) - :"cc" - ); - -return cc; -} - -static inline int stck (uint64_t *time) -{ -int cc; - - asmvolatile ( -" stck %[time]\n" -" ipm %[cc]\n" -" srl %[cc],28\n" - : [cc]"=d" (cc), [time]"=Q" (*time) - : - :"cc" ,"memory" - ); - -return cc; -} -static void test_priv (void ) { uint64_t time_to_set_privileged = 0xfacef00dcafe0000,
Signature · 1 line
2.36.1
Re: [kvm-unit-tests PATCH v3 1/2] lib/s390x: move TOD clock related functions to library
Quoted 7 lines · On Tue, 11 Oct 2022 19:00:23 +0200 Nico Boehr <[email protected]> wrote:
The TOD-clock related functions can be useful for other tests beside the sck test, hence move them to the library.
While at it, add a wrapper for stckf, express
get_clock_us()withstck()and remove an unneeded memory clobber.Signed-off-by Nico Boehr <[email protected]>
Quoted 113 lines
--- lib/s390x/asm/time.h | 50 +++++++++++++++++++++++++++++++++++++++++++- s390x/sck.c | 32 ---------------------------- 2 files changed, 49 insertions(+), 33 deletions(-)lib/s390x/asm/time.h +49
-1@@ -18,11 +18,59 @@#define CPU_TIMER_SHIFT_US S390_CLOCK_SHIFT_US +static inline int sck (uint64_t *time) +{ +int cc; + + asmvolatile ( +" sck %[time]\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc) + : [time]"Q" (*time) + :"cc" + ); + +return cc; +} + +static inline int stck (uint64_t *time) +{ +int cc; + + asmvolatile ( +" stck %[time]\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc), [time]"=Q" (*time) + : + :"cc" + ); + +return cc; +} + +static inline int stckf (uint64_t *time) +{ +int cc; + + asmvolatile ( +" stckf %[time]\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc), [time]"=Q" (*time) + : + :"cc" + ); + +return cc; +} +static inline uint64_t get_clock_us (void ) {uint64_t clk; - asmvolatile (" stck %0 " : :"Q" (clk) :"memory" ); +stck (&clk);return clk >>STCK_SHIFT_US ; }s390x/sck.c +0
-32@@ -12,38 +12,6 @@#include <asm/interrupt.h> #include <asm/time.h> -static inline int sck (uint64_t *time) -{ -int cc; - - asmvolatile ( -" sck %[time]\n" -" ipm %[cc]\n" -" srl %[cc],28\n" - : [cc]"=d" (cc) - : [time]"Q" (*time) - :"cc" - ); - -return cc; -} - -static inline int stck (uint64_t *time) -{ -int cc; - - asmvolatile ( -" stck %[time]\n" -" ipm %[cc]\n" -" srl %[cc],28\n" - : [cc]"=d" (cc), [time]"=Q" (*time) - : - :"cc" ,"memory" - ); - -return cc; -} -static void test_priv (void ) { uint64_t time_to_set_privileged = 0xfacef00dcafe0000,
PATCH v3 2/2 s390x: add migration TOD clock test
In reply to Nico BoehrOn migration, we expect the guest clock value to be preserved. Add a test to verify this:
- advance the guest TOD by much more than we need to migrate
- migrate the guest
- get the guest TOD
After migration, assert the guest TOD value is at least the value we set before migration. This is the minimal check for architectural compliance; implementations may decide to do something more sophisticated.
--- s390x/Makefile | 1 + s390x/migration-sck.c | 54 +++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++++ 3 files changed, 59 insertions(+) create mode 100644 s390x/migration-sck.c
s390x/Makefile +1 -0
@@ -36,6 +36,7 @@ tests += $(TEST_DIR)/migration-cmm.elf tests += $(TEST_DIR)/migration-skey.elf tests += $(TEST_DIR)/panic-loop-extint.elf tests += $(TEST_DIR)/panic-loop-pgm.elf +tests += $(TEST_DIR)/migration-sck.elf pv-tests += $(TEST_DIR)/pv-diags.elf
s390x/migration-sck.c new file +54 -0
54 lines not on this page · raw message
s390x/unittests.cfg +4 -0
@@ -197,3 +197,7 @@ file = panic-loop-pgm.elf groups = panic accel = kvm timeout = 5 + +[migration-sck] +file = migration-sck.elf +groups = migration
Signature · 1 line
2.36.1
Re: [kvm-unit-tests PATCH v3 2/2] s390x: add migration TOD clock test
Quoted 6 lines · On Tue, 11 Oct 2022 19:00:24 +0200 Nico Boehr <[email protected]> wrote:
On migration, we expect the guest clock value to be preserved. Add a test to verify this:
- advance the guest TOD by much more than we need to migrate
- migrate the guest
- get the guest TOD
Quoted 6 lines
After migration, assert the guest TOD value is at least the value we set before migration. This is the minimal check for architectural compliance; implementations may decide to do something more sophisticated.
Signed-off-by Nico Boehr <[email protected]>
Quoted 91 lines
--- s390x/Makefile | 1 + s390x/migration-sck.c | 54 +++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++++ 3 files changed, 59 insertions(+) create mode 100644 s390x/migration-sck.cs390x/Makefile +1
-0@@ -36,6 +36,7 @@ tests += $(TEST_DIR)/migration-cmm.elf tests += $(TEST_DIR)/migration-skey.elf tests += $(TEST_DIR)/panic-loop-extint.elf tests += $(TEST_DIR)/panic-loop-pgm.elf +tests += $(TEST_DIR)/migration-sck.elf pv-tests += $(TEST_DIR)/pv-diags.elfs390x/migration-sck.c new file +54
-0@@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* SET CLOCK migration tests +* +* Copyright IBM Corp. 2022 +* +* Authors: +* Nico Boehr <[email protected]> +*/ + +#include <libcflat.h> +#include <asm/time.h> + +static void test_sck_migration (void ) +{ +uint64_t now_before_set =0 , now_after_set =0 , now_after_migration, time_to_set, time_to_advance; +int cc; + +stckf (&now_before_set); + +/* Advance the clock by a lot more than we might ever need to migrate (600s) */ + time_to_advance = (600ULL *1000000 ) <<STCK_SHIFT_US ; + time_to_set = now_before_set + time_to_advance; + + cc =sck (&time_to_set); +report (!cc,"setting clock succeeded" ); + +/* Check the clock is running after being set */ + cc =stckf (&now_after_set); +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 (); + + cc =stckf (&now_after_migration); +report (!cc,"clock still set" ); + +/* +* The architectural requirement for the TOD clock is that it doesn't move backwards after +* migration. Implementations can just migrate the guest TOD value or do something more +* sophisticated (e.g. slowly adjust to the host TOD). +*/ +report (now_after_migration >= time_to_set,"TOD clock value did not jump backwards" ); +} + +int main (void ) +{ +report_prefix_push ("migration-sck" ); + +test_sck_migration (); +report_prefix_pop (); +return report_summary (); +}s390x/unittests.cfg +4
-0@@ -197,3 +197,7 @@ file = panic-loop-pgm.elf groups = panic accel = kvm timeout = 5 + +[migration-sck] +file = migration-sck.elf +groups = migration
Quoted 12 lines · On Tue, 11 Oct 2022 19:00:22 +0200 Nico Boehr <[email protected]> wrote:
v2->v3:
---
- check the clock is really set after setting (thanks Claudio)
- remove unneeded memory clobber (thanks Claudio)
- add comment to explain what we're testing (thanks Christian)
v1->v2:
---
- remove unneeded include
- advance clock by 10 minutes instead of 1 minute (thanks Claudio)
- expressget_clock_us()usingstck()(thanks Claudio)
Quoted 6 lines
The guest TOD clock should not go backwards on migration. Add a test to verify that.
To reduce code duplication, move some of the time-related defined from the sck test to the library.
thanks, picked
Quoted 12 lines
Nico Boehr (2):
lib/s390x: move TOD clock related functions to library
s390x: add migration TOD clock testlib/s390x/asm/time.h | 50 ++++++++++++++++++++++++++++++++++++++- s390x/Makefile | 1 + s390x/migration-sck.c | 54 +++++++++++++++++++++++++++++++++++++++++++ s390x/sck.c | 32 ------------------------- s390x/unittests.cfg | 4 ++++ 5 files changed, 108 insertions(+), 33 deletions(-) create mode 100644 s390x/migration-sck.c