From: Thomas Huth <thuth@redhat.com>
To: Janosch Frank <frankja@linux.ibm.com>, kvm@vger.kernel.org
Cc: borntraeger@de.ibm.com, linux-s390@vger.kernel.org,
david@redhat.com, cohuck@redhat.com
Subject: Re: [kvm-unit-tests PATCH 3/4] s390x: smp: Test all CRs on initial reset
Date: Tue, 14 Jan 2020 18:01:32 +0100 [thread overview]
Message-ID: <bec10775-3713-4604-1b49-27d49682db43@redhat.com> (raw)
In-Reply-To: <20200114153054.77082-4-frankja@linux.ibm.com>
On 14/01/2020 16.30, Janosch Frank wrote:
> All CRs are set to 0 and CRs 0 and 14 are set to pre-defined values,
> so we also need to test 1-13 and 15 for 0.
>
> And while we're at it, let's also set some values to cr 1, 7 and 13, so
> we can actually be sure that they will be zeroed.
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
> s390x/smp.c | 21 ++++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/s390x/smp.c b/s390x/smp.c
> index 767d167..11ab425 100644
> --- a/s390x/smp.c
> +++ b/s390x/smp.c
> @@ -175,16 +175,31 @@ static void test_emcall(void)
> report_prefix_pop();
> }
>
> +static void test_func_initial(void)
> +{
> + lctlg(1, 0x42000UL);
> + lctlg(7, 0x43000UL);
> + lctlg(13, 0x44000UL);
> + testflag = 1;
> + mb();
> + cpu_loop();
> +}
> +
> static void test_reset_initial(void)
> {
> struct cpu_status *status = alloc_pages(0);
> + uint8_t *nullp = alloc_pages(0);
Why not simply:
uint64_t nullp[12];
?
> struct psw psw;
>
> + memset(nullp, 0, PAGE_SIZE);
> psw.mask = extract_psw_mask();
> - psw.addr = (unsigned long)test_func;
> + psw.addr = (unsigned long)test_func_initial;
>
> report_prefix_push("reset initial");
> + testflag = 0;
> + mb();
> smp_cpu_start(1, psw);
> + wait_for_flag();
>
> sigp_retry(1, SIGP_INITIAL_CPU_RESET, 0, NULL);
> sigp(1, SIGP_STORE_STATUS_AT_ADDRESS, (uintptr_t)status, NULL);
> @@ -195,6 +210,8 @@ static void test_reset_initial(void)
> report(!status->fpc, "fpc");
> report(!status->cputm, "cpu timer");
> report(!status->todpr, "todpr");
> + report(!memcmp(&status->crs[1], nullp, sizeof(status->crs[1]) * 12), "cr1-13 == 0");
> + report(status->crs[15] == 0, "cr15 == 0");
> report_prefix_pop();
>
> report_prefix_push("initialized");
> @@ -204,6 +221,7 @@ static void test_reset_initial(void)
>
> report(smp_cpu_stopped(1), "cpu stopped");
> free_pages(status, PAGE_SIZE);
> + free_pages(nullp, PAGE_SIZE);
> report_prefix_pop();
> }
>
> @@ -219,6 +237,7 @@ static void test_reset(void)
>
> sigp_retry(1, SIGP_CPU_RESET, 0, NULL);
> report(smp_cpu_stopped(1), "cpu stopped");
> + smp_cpu_destroy(1);
Shouldn't that rather be part of patch 2/4 ? I'd maybe also move this to
the main() function instead since you've setup the cpu there...? Also is
it still ok to use smp_cpu_start() in test_reset_initial() after you've
destroyed the CPU here in test_reset()?
> report_prefix_pop();
> }
Thomas
next prev parent reply other threads:[~2020-01-14 17:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 15:30 [kvm-unit-tests PATCH 0/4] s390x: smp: Improve smp code and reset checks Janosch Frank
2020-01-14 15:30 ` [kvm-unit-tests PATCH 1/4] s390x: smp: Cleanup smp.c Janosch Frank
2020-01-14 15:39 ` Thomas Huth
2020-01-14 17:32 ` Cornelia Huck
2020-01-14 15:30 ` [kvm-unit-tests PATCH 2/4] s390x: smp: Only use smp_cpu_setup once Janosch Frank
2020-01-14 16:45 ` Thomas Huth
2020-01-15 7:50 ` Janosch Frank
2020-01-14 17:44 ` Cornelia Huck
2020-01-15 9:00 ` Janosch Frank
2020-01-14 15:30 ` [kvm-unit-tests PATCH 3/4] s390x: smp: Test all CRs on initial reset Janosch Frank
2020-01-14 17:01 ` Thomas Huth [this message]
2020-01-14 17:51 ` Cornelia Huck
2020-01-14 18:42 ` Christian Borntraeger
2020-01-15 6:17 ` Thomas Huth
2020-01-15 7:57 ` Janosch Frank
2020-01-15 8:11 ` Thomas Huth
2020-01-14 15:30 ` [kvm-unit-tests PATCH 4/4] s390x: smp: Dirty fpc before initial reset test Janosch Frank
2020-01-14 17:22 ` Thomas Huth
2020-01-14 17:53 ` Cornelia Huck
2020-01-15 10:47 ` [kvm-unit-tests PATCH 0/4] s390x: smp: Improve smp code and reset checks David Hildenbrand
2020-01-15 13:03 ` Janosch Frank
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bec10775-3713-4604-1b49-27d49682db43@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).