Re: [kvm-unit-tests PATCH v6 7/8] s390x: add a test for SIE without MSO/MSL

Janosch Frank
2023-09-05T16:05:07Z

On 9/4/23 10:22, Nico Boehr wrote:
> Since we now have the ability to run guests without MSO/MSL, add a test
> to make sure this doesn't break.
>
> Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
[...]
> diff --git a/s390x/snippets/c/sie-dat.c b/s390x/snippets/c/sie-dat.c
> new file mode 100644
> index 000000000000..f29887643df9
> --- /dev/null
> +++ b/s390x/snippets/c/sie-dat.c
> @@ -0,0 +1,54 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Snippet used by the sie-dat.c test to verify paging without MSO/MSL
> + *
> + * Copyright (c) 2023 IBM Corp
> + *
> + * Authors:
> + * Nico Boehr <nrb@linux.ibm.com>
> + */
> +#include <stddef.h>
> +#include <inttypes.h>
> +#include <string.h>
> +#include <asm-generic/page.h>

Please include libcflat.h and remove the standard library includes.

> +#include "sie-dat.h"
> +
[...]
> diff --git a/s390x/snippets/c/sie-dat.h b/s390x/snippets/c/sie-dat.h
> new file mode 100644
> index 000000000000..a3a1c38861fa
> --- /dev/null
> +++ b/s390x/snippets/c/sie-dat.h
> @@ -0,0 +1,5 @@
> +/* keep in sync with TEST_PAGE_COUNT in s390x/snippets/c/sie-dat.c */
> +#define GUEST_TEST_PAGE_COUNT 10
> +
> +/* keep in sync with TOTAL_PAGE_COUNT in s390x/snippets/c/sie-dat.c */
> +#define GUEST_TOTAL_PAGE_COUNT 256

You should remove the comments now that we can include this header in
the test.

> diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
> index 68e119e4fcaa..184658ff7d8d 100644
> --- a/s390x/unittests.cfg
> +++ b/s390x/unittests.cfg
> @@ -247,3 +247,6 @@ file = topology.elf
> [topology-2]
> file = topology.elf
> extra_params = -cpu max,ctop=on -smp sockets=31,cores=8,maxcpus=248 -append '-sockets 31 -cores 8'
> +
> +[sie-dat]
> +file = sie-dat.elf