From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 604E4C10F13 for ; Tue, 16 Apr 2019 11:57:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2505F20674 for ; Tue, 16 Apr 2019 11:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727355AbfDPL5S (ORCPT ); Tue, 16 Apr 2019 07:57:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33372 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726408AbfDPL5R (ORCPT ); Tue, 16 Apr 2019 07:57:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 33D623001565; Tue, 16 Apr 2019 11:57:17 +0000 (UTC) Received: from [10.36.116.117] (ovpn-116-117.ams2.redhat.com [10.36.116.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 555E460C68; Tue, 16 Apr 2019 11:57:16 +0000 (UTC) Subject: Re: [kvm-unit-tests v2 PATCH] s390x: Add a test for the diagnose 0x308 hypercall To: Thomas Huth , kvm@vger.kernel.org Cc: Janosch Frank References: <20190415121242.28848-1-thuth@redhat.com> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: Date: Tue, 16 Apr 2019 13:57:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190415121242.28848-1-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 16 Apr 2019 11:57:17 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 15.04.19 14:12, Thomas Huth wrote: > The original idea for this test is to have an easy way to check for a > problem that has been fixed in QEMU recently: QEMU simply aborted if this > diagnose call was called with an unsupported subcode (e.g. 2). The problem > has been fixed in QEMU commit 37dbd1f4d4805edcd18d94eb202bb3461b3cd52d > ("Return specification exception for unimplemented diag 308 subcodes"), > and this test now should make sure that we do not regress here again. > While we're at it, also check whether LOAD NORMAL via subcode 1 works > correctly, whether the diagnose call is blocked correctly in problem state > and whether subcodes 5 and 6 are generating specification exceptions for > illegal parameters as expected. > > Signed-off-by: Thomas Huth > --- > v2: Use "epsw" in test_subcode1() to get the right upper bits of the PSW > > s390x/Makefile | 1 + > s390x/diag308.c | 130 ++++++++++++++++++++++++++++++++++++++++++++ > s390x/unittests.cfg | 3 + > 3 files changed, 134 insertions(+) > create mode 100644 s390x/diag308.c > > diff --git a/s390x/Makefile b/s390x/Makefile > index af40fd4..1f21ddb 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -5,6 +5,7 @@ tests += $(TEST_DIR)/sieve.elf > tests += $(TEST_DIR)/sthyi.elf > tests += $(TEST_DIR)/skey.elf > tests += $(TEST_DIR)/diag10.elf > +tests += $(TEST_DIR)/diag308.elf > tests += $(TEST_DIR)/pfmf.elf > tests += $(TEST_DIR)/cmm.elf > tests += $(TEST_DIR)/vector.elf > diff --git a/s390x/diag308.c b/s390x/diag308.c > new file mode 100644 > index 0000000..70a3b1e > --- /dev/null > +++ b/s390x/diag308.c > @@ -0,0 +1,130 @@ > +/* > + * Diagnose 0x308 hypercall tests > + * > + * Copyright (c) 2019 Thomas Huth, Red Hat Inc. > + * > + * This code is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2, or (at > + * your option) any later version. > + */ > + > +#include > +#include > +#include > + > +/* The diagnose calls should be blocked in problem state */ > +static void test_priv(void) > +{ > + expect_pgm_int(); > + enter_pstate(); > + asm volatile ("diag %0,%1,0x308" :: "a"(0), "a"(3)); > + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); > +} > + > +/* > + * Check that diag308 with subcode 1 loads the PSW at address 0, i.e. > + * that we can put a pointer into address 4 which then gets executed. > + */ > +static void test_subcode1(void) > +{ > + uint64_t saved_psw = *(uint64_t *)0; > + long subcode = 1; > + long ret, tmp; > + > + asm volatile ( > + " epsw %0,%1\n" > + " st %0,0\n" > + " larl %0,0f\n" > + " oilh %0,0x8000\n" > + " st %0,4\n" > + " diag 0,%2,0x308\n" > + " lghi %0,0\n" > + " j 1f\n" > + "0: lghi %0,1\n" > + "1:" > + : "=&a"(ret), "=&a"(tmp) : "a"(subcode) : "memory"); > + > + *(uint64_t *)0 = saved_psw; > + > + report("load normal reset done", ret == 1); > +} > + > +/* Expect a specification exception when using an uneven register */ > +static void test_uneven_reg(unsigned int subcode) > +{ > + register unsigned long sc asm("6") = subcode; > + register unsigned long r3 asm("9") = 0x2000; > + > + report_prefix_push("uneven register"); > + expect_pgm_int(); > + asm volatile ("diag %0,%1,0x308" :: "a"(r3), "a"(sc)); > + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); > + report_prefix_pop(); > +} > + > +/* Expect a specification exception when using an unaligned address */ > +static void test_unaligned_address(unsigned int subcode) > +{ > + register unsigned long sc asm("6") = subcode; > + register unsigned long addr asm("8") = 54321; > + > + report_prefix_push("unaligned address"); > + expect_pgm_int(); > + asm volatile ("diag %0,%1,0x308" :: "a"(addr), "a"(sc)); > + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); > + report_prefix_pop(); > +} > + > +static void test_subcode5(void) > +{ > + test_uneven_reg(5); > + test_unaligned_address(5); > +} > + > +static void test_subcode6(void) > +{ > + test_uneven_reg(6); > + test_unaligned_address(6); > +} > + > +/* Unsupported subcodes should generate a specification exception */ > +static void test_unsupported_subcode(void) > +{ > + int subcodes[] = { 2, 0x101, 0xffff, 0x10001, -1 }; > + int idx; > + > + for (idx = 0; idx < ARRAY_SIZE(subcodes); idx++) { > + report_prefix_pushf("0x%04x", subcodes[idx]); > + expect_pgm_int(); > + asm volatile ("diag %0,%1,0x308" :: "a"(0), "a"(subcodes[idx])); > + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); > + report_prefix_pop(); > + } > +} > + > +static struct { > + const char *name; > + void (*func)(void); > +} tests[] = { > + { "privileged", test_priv }, > + { "subcode 1", test_subcode1 }, > + { "subcode 5", test_subcode5 }, > + { "subcode 6", test_subcode6 }, > + { "unsupported", test_unsupported_subcode }, > + { NULL, NULL } > +}; > + > +int main(int argc, char**argv) > +{ > + int i; > + > + report_prefix_push("diag308"); > + for (i = 0; tests[i].name; i++) { > + report_prefix_push(tests[i].name); > + tests[i].func(); > + report_prefix_pop(); > + } > + report_prefix_pop(); > + > + return report_summary(); > +} > diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg > index e53c365..546b1f2 100644 > --- a/s390x/unittests.cfg > +++ b/s390x/unittests.cfg > @@ -44,6 +44,9 @@ file = skey.elf > [diag10] > file = diag10.elf > > +[diag308] > +file = diag308.elf > + > [pfmf] > file = pfmf.elf > > You might want to use "g" instead of "a", as we are not dealing with address registers (base/index). Apart from that, nothing major jumped at me. -- Thanks, David / dhildenb