On 02.04.20 17:44, Christian Borntraeger wrote:
> Two minimal tests:
> - our own CPU should be running when we check ourselves
> - a CPU should at least have some times with a not running
> indication. To speed things up we stop CPU1
>
> Also rename smp_cpu_running to smp_sense_running_status.
>
> Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
> ---
> lib/s390x/smp.c | 2 +-
> lib/s390x/smp.h | 2 +-
> s390x/smp.c | 15 +++++++++++++++
> 3 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c
> index 5ed8b7b..492cb05 100644
> --- a/lib/s390x/smp.c
> +++ b/lib/s390x/smp.c
> @@ -58,7 +58,7 @@ bool smp_cpu_stopped(uint16_t addr)
> return !!(status & (SIGP_STATUS_CHECK_STOP|SIGP_STATUS_STOPPED));
> }
>
> -bool smp_cpu_running(uint16_t addr)
> +bool smp_sense_running_status(uint16_t addr)
> {
> if (sigp(addr, SIGP_SENSE_RUNNING, 0, NULL) != SIGP_CC_STATUS_STORED)
> return true;
> diff --git a/lib/s390x/smp.h b/lib/s390x/smp.h
> index a8b98c0..639ec92 100644
> --- a/lib/s390x/smp.h
> +++ b/lib/s390x/smp.h
> @@ -40,7 +40,7 @@ struct cpu_status {
> int smp_query_num_cpus(void);
> struct cpu *smp_cpu_from_addr(uint16_t addr);
> bool smp_cpu_stopped(uint16_t addr);
> -bool smp_cpu_running(uint16_t addr);
> +bool smp_sense_running_status(uint16_t addr);
> int smp_cpu_restart(uint16_t addr);
> int smp_cpu_start(uint16_t addr, struct psw psw);
> int smp_cpu_stop(uint16_t addr);
> diff --git a/s390x/smp.c b/s390x/smp.c
> index 79cdc1f..4450aff 100644
> --- a/s390x/smp.c
> +++ b/s390x/smp.c
> @@ -210,6 +210,20 @@ static void test_emcall(void)
> report_prefix_pop();
> }
>
> +static void test_sense_running(void)
> +{
> + report_prefix_push("sense_running");
> + /* we are running */
> + report(smp_sense_running_status(0), "CPU0 sense claims running");
> + /* make sure CPU is stopped to speed up the not running case */
> + smp_cpu_stop(1);
> + /* Make sure to have at least one time with a not running indication */
> + while(smp_sense_running_status(1));
> + report(true, "CPU1 sense claims not running");
> + report_prefix_pop();
> +}
> +
> +
Did not apply cleanly, (due to comment in front of the next function).
Dropped one of the two empty lines.
Queued to
https://github.com/davidhildenbrand/qemu.git s390-tcg-next
for now. Happy to add acks/rb's ;)
Tested with TCG.
Thanks!
--
Thanks,
David / dhildenb
