From patchwork Thu Jan 30 13:11:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11357941 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D67D13A4 for ; Thu, 30 Jan 2020 13:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7ABAD2082E for ; Thu, 30 Jan 2020 13:11:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KtLZKfgh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727165AbgA3NLc (ORCPT ); Thu, 30 Jan 2020 08:11:32 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26804 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726980AbgA3NLc (ORCPT ); Thu, 30 Jan 2020 08:11:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580389891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/yBCkgn6MjP+rp3S4FWnEQM+jVlF/8K3ad/cp5egTrw=; b=KtLZKfghbxeu9yEf2W8EW1qp+4KxsYF66/ALAbGYF+56zeOqFZ/KlkyJexdby5ma/5wn6+ qR7xBGjs38+csg+/qgL5cSp5XqW1hvao5eCrtWT4BxExwYbrF77E1F5oUV07kJ1VEHJqoY Z3RR/1M4NxJ4CIFvzzUBiU7bt7kGf2A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-4kMBjVA2O5CHeH1LEnes0w-1; Thu, 30 Jan 2020 08:11:28 -0500 X-MC-Unique: 4kMBjVA2O5CHeH1LEnes0w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65692800D4E; Thu, 30 Jan 2020 13:11:27 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-219.ams2.redhat.com [10.36.117.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41E9677927; Thu, 30 Jan 2020 13:11:25 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Huth , david@redhat.com, Janosch Frank , Claudio Imbrenda Subject: [kvm-unit-tests PULL 1/6] s390x: export sclp_setup_int Date: Thu, 30 Jan 2020 14:11:11 +0100 Message-Id: <20200130131116.12386-2-david@redhat.com> In-Reply-To: <20200130131116.12386-1-david@redhat.com> References: <20200130131116.12386-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Claudio Imbrenda Export sclp_setup_int() so that it can be used in tests. Needed for an upcoming unit test. Signed-off-by: Claudio Imbrenda Reviewed-by: Thomas Huth Reviewed-by: Janosch Frank Message-Id: <20200120184256.188698-2-imbrenda@linux.ibm.com> Signed-off-by: David Hildenbrand --- lib/s390x/sclp.c | 2 +- lib/s390x/sclp.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c index 7798f04..123b639 100644 --- a/lib/s390x/sclp.c +++ b/lib/s390x/sclp.c @@ -45,7 +45,7 @@ static void mem_init(phys_addr_t mem_end) page_alloc_ops_enable(); } -static void sclp_setup_int(void) +void sclp_setup_int(void) { uint64_t mask; diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h index 6d40fb7..675f07e 100644 --- a/lib/s390x/sclp.h +++ b/lib/s390x/sclp.h @@ -265,6 +265,7 @@ typedef struct ReadEventData { } __attribute__((packed)) ReadEventData; extern char _sccb[]; +void sclp_setup_int(void); void sclp_handle_ext(void); void sclp_wait_busy(void); void sclp_mark_busy(void); From patchwork Thu Jan 30 13:11:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11357945 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7118A13A4 for ; Thu, 30 Jan 2020 13:11:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FCE82083E for ; Thu, 30 Jan 2020 13:11:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XPAn60Wy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727252AbgA3NLg (ORCPT ); Thu, 30 Jan 2020 08:11:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49266 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727260AbgA3NLf (ORCPT ); Thu, 30 Jan 2020 08:11:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580389895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XxF5rh0fjlJQF8gPvNefazXBystQtff0RuoMaUzH8Sw=; b=XPAn60Wy9T804vldyzYa0nCOj3ANZpLtbKFQ2rarpyOTUQ58MP5TTppkSS4g2XcrHmRhFd M1Kmx2zYW/cbekQM2gL/NZH8x1oe0Wic2M1Uw+iCDfhY06alJVucWqGZ3WnrgvAHtmGEd9 iVhALH7PJDqHOwJ8xkKUB5XR/txMNSI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-nagE0HYuNZWz0fTgDFmFkA-1; Thu, 30 Jan 2020 08:11:33 -0500 X-MC-Unique: nagE0HYuNZWz0fTgDFmFkA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B29DC800D48; Thu, 30 Jan 2020 13:11:31 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-219.ams2.redhat.com [10.36.117.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D5837793C; Thu, 30 Jan 2020 13:11:27 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Huth , david@redhat.com, Janosch Frank , Claudio Imbrenda Subject: [kvm-unit-tests PULL 2/6] s390x: sclp: add service call instruction wrapper Date: Thu, 30 Jan 2020 14:11:12 +0100 Message-Id: <20200130131116.12386-3-david@redhat.com> In-Reply-To: <20200130131116.12386-1-david@redhat.com> References: <20200130131116.12386-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Claudio Imbrenda Add a wrapper for the service call instruction, and use it for SCLP interactions instead of using inline assembly everywhere. Signed-off-by: Claudio Imbrenda Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Reviewed-by: Janosch Frank Message-Id: <20200120184256.188698-3-imbrenda@linux.ibm.com> Signed-off-by: David Hildenbrand --- lib/s390x/asm/arch_def.h | 13 +++++++++++++ lib/s390x/sclp.c | 7 +------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index cf6e1ca..1a5e3c6 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -271,4 +271,17 @@ static inline int stsi(void *addr, int fc, int sel1, int sel2) return cc; } +static inline int servc(uint32_t command, unsigned long sccb) +{ + int cc; + + asm volatile( + " .insn rre,0xb2200000,%1,%2\n" /* servc %1,%2 */ + " ipm %0\n" + " srl %0,28" + : "=&d" (cc) : "d" (command), "a" (sccb) + : "cc", "memory"); + return cc; +} + #endif diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c index 123b639..4054d0e 100644 --- a/lib/s390x/sclp.c +++ b/lib/s390x/sclp.c @@ -116,12 +116,7 @@ int sclp_service_call(unsigned int command, void *sccb) int cc; sclp_setup_int(); - asm volatile( - " .insn rre,0xb2200000,%1,%2\n" /* servc %1,%2 */ - " ipm %0\n" - " srl %0,28" - : "=&d" (cc) : "d" (command), "a" (__pa(sccb)) - : "cc", "memory"); + cc = servc(command, __pa(sccb)); sclp_wait_busy(); if (cc == 3) return -1; From patchwork Thu Jan 30 13:11:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11357947 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2433913A4 for ; Thu, 30 Jan 2020 13:11:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB3B22083E for ; Thu, 30 Jan 2020 13:11:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="S2MtYznR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727347AbgA3NLk (ORCPT ); Thu, 30 Jan 2020 08:11:40 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26704 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727268AbgA3NLk (ORCPT ); Thu, 30 Jan 2020 08:11:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580389898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wFef1Z8pe/3QrGP9GABVxJ+r/1++7M4pEyg9A1p4qt8=; b=S2MtYznR805LSbx7PLX5WSWOY54YY+Bjpv+rL8ccVYRoVLYaVbMWQEw28pZIcwvQqN5gpg JmeWYlTBue+18Nf63pt4hPRMQftgyEahuP9Z52/KdI6l50tsFpLfw85LTsl7Hq7AiPaLb6 HEZypi0UB/IdMZO6H5PdSu9kTJ8UYtM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-280-uonWhtG5PJCGNXJDqL0UNQ-1; Thu, 30 Jan 2020 08:11:36 -0500 X-MC-Unique: uonWhtG5PJCGNXJDqL0UNQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CDABE477; Thu, 30 Jan 2020 13:11:35 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-219.ams2.redhat.com [10.36.117.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id B17B077947; Thu, 30 Jan 2020 13:11:32 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Huth , david@redhat.com, Janosch Frank , Claudio Imbrenda Subject: [kvm-unit-tests PULL 3/6] s390x: lib: fix stfl wrapper asm Date: Thu, 30 Jan 2020 14:11:13 +0100 Message-Id: <20200130131116.12386-4-david@redhat.com> In-Reply-To: <20200130131116.12386-1-david@redhat.com> References: <20200130131116.12386-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Claudio Imbrenda the stfl wrapper in lib/s390x/asm/facility.h was lacking the "memory" clobber in the inline asm. Reviewed-by: Janosch Frank Reviewed-by: Thomas Huth Reviewed-by: David Hildenbrand Signed-off-by: Claudio Imbrenda Message-Id: <20200120184256.188698-4-imbrenda@linux.ibm.com> Signed-off-by: David Hildenbrand --- lib/s390x/asm/facility.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h index 5103dd4..e34dc2c 100644 --- a/lib/s390x/asm/facility.h +++ b/lib/s390x/asm/facility.h @@ -24,7 +24,7 @@ static inline bool test_facility(int nr) static inline void stfl(void) { - asm volatile(" stfl 0(0)\n"); + asm volatile(" stfl 0(0)\n" : : : "memory"); } static inline void stfle(uint8_t *fac, unsigned int len) From patchwork Thu Jan 30 13:11:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11357949 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0222B139A for ; Thu, 30 Jan 2020 13:11:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3EC22083E for ; Thu, 30 Jan 2020 13:11:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AegGwjQo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727355AbgA3NLs (ORCPT ); Thu, 30 Jan 2020 08:11:48 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:29039 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727351AbgA3NLs (ORCPT ); Thu, 30 Jan 2020 08:11:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580389907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zqtE94spb3QdD6uV4vKdidFvzEvD2Ju3yWRW2zPpAFI=; b=AegGwjQoI1Qez3UBLDRhiBSZPO/ZRF+UI+h2MAoHx9YPyBQxVffjmagJweCtbNUYHGSH69 8hidHOBige7re8Km0m2RMw1xeGkqe0rK6mJfl8FeUkx4OngANgNlgRWNlGvMKxkaNcAx9t ya731sLEchJYdPIrtINZ3DxE1/AIJhU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-12-Iwbj_BeINmyicPtymb7OuA-1; Thu, 30 Jan 2020 08:11:44 -0500 X-MC-Unique: Iwbj_BeINmyicPtymb7OuA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43D30107ACCD; Thu, 30 Jan 2020 13:11:43 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-219.ams2.redhat.com [10.36.117.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id C919C77927; Thu, 30 Jan 2020 13:11:36 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Huth , david@redhat.com, Janosch Frank , Claudio Imbrenda Subject: [kvm-unit-tests PULL 4/6] s390x: lib: add SPX and STPX instruction wrapper Date: Thu, 30 Jan 2020 14:11:14 +0100 Message-Id: <20200130131116.12386-5-david@redhat.com> In-Reply-To: <20200130131116.12386-1-david@redhat.com> References: <20200130131116.12386-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Claudio Imbrenda Add a wrapper for the SET PREFIX and STORE PREFIX instructions, and use it instead of using inline assembly. Signed-off-by: Claudio Imbrenda Reviewed-by: Thomas Huth Reviewed-by: Janosch Frank Message-Id: <20200120184256.188698-5-imbrenda@linux.ibm.com> Signed-off-by: David Hildenbrand --- lib/s390x/asm/arch_def.h | 13 +++++++++++++ s390x/intercept.c | 24 +++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 1a5e3c6..15a4d49 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -284,4 +284,17 @@ static inline int servc(uint32_t command, unsigned long sccb) return cc; } +static inline void set_prefix(uint32_t new_prefix) +{ + asm volatile(" spx %0" : : "Q" (new_prefix) : "memory"); +} + +static inline uint32_t get_prefix(void) +{ + uint32_t current_prefix; + + asm volatile(" stpx %0" : "=Q" (current_prefix)); + return current_prefix; +} + #endif diff --git a/s390x/intercept.c b/s390x/intercept.c index 3696e33..5f46b82 100644 --- a/s390x/intercept.c +++ b/s390x/intercept.c @@ -13,6 +13,7 @@ #include #include #include +#include static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); @@ -26,13 +27,10 @@ static void test_stpx(void) uint32_t new_prefix = (uint32_t)(intptr_t)pagebuf; /* Can we successfully change the prefix? */ - asm volatile ( - " stpx %0\n" - " spx %2\n" - " stpx %1\n" - " spx %0\n" - : "+Q"(old_prefix), "+Q"(tst_prefix) - : "Q"(new_prefix)); + old_prefix = get_prefix(); + set_prefix(new_prefix); + tst_prefix = get_prefix(); + set_prefix(old_prefix); report(old_prefix == 0 && tst_prefix == new_prefix, "store prefix"); expect_pgm_int(); @@ -63,14 +61,10 @@ static void test_spx(void) * some facility bits there ... at least some of them should be * set in our buffer afterwards. */ - asm volatile ( - " stpx %0\n" - " spx %1\n" - " stfl 0\n" - " spx %0\n" - : "+Q"(old_prefix) - : "Q"(new_prefix) - : "memory"); + old_prefix = get_prefix(); + set_prefix(new_prefix); + stfl(); + set_prefix(old_prefix); report(pagebuf[GEN_LC_STFL] != 0, "stfl to new prefix"); expect_pgm_int(); From patchwork Thu Jan 30 13:11:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11357951 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64059139A for ; Thu, 30 Jan 2020 13:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 419FC20CC7 for ; Thu, 30 Jan 2020 13:11:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HiEPX3uz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727363AbgA3NLv (ORCPT ); Thu, 30 Jan 2020 08:11:51 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:38858 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727356AbgA3NLv (ORCPT ); Thu, 30 Jan 2020 08:11:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580389910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zE0H4OKjNeVQ3tX4Xi7+inJ18C4QnIQe0wpraJt3MZ4=; b=HiEPX3uzWdl7iJbJLprPb9G3lijV9HvdC1vAdxboV5mc+ETlgaQw5eOcE96ceawxtDytpF D9Z3lreGQZWVjkiUHGybjk3ufz8ZgZkJ4CHlJb6G9n8acPf7fHUsDOkrckhNXJ6TTMKtHa Iif40iSq5pNMcSedwLfz7IB+RX7uctA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-413-O9i6Q2a1NvyHzXcQOvW27g-1; Thu, 30 Jan 2020 08:11:47 -0500 X-MC-Unique: O9i6Q2a1NvyHzXcQOvW27g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 71309800D6C; Thu, 30 Jan 2020 13:11:46 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-219.ams2.redhat.com [10.36.117.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2FBD77927; Thu, 30 Jan 2020 13:11:43 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Huth , david@redhat.com, Janosch Frank , Claudio Imbrenda Subject: [kvm-unit-tests PULL 5/6] s390x: lib: fix program interrupt handler if sclp_busy was set Date: Thu, 30 Jan 2020 14:11:15 +0100 Message-Id: <20200130131116.12386-6-david@redhat.com> In-Reply-To: <20200130131116.12386-1-david@redhat.com> References: <20200130131116.12386-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Claudio Imbrenda Fix the program interrupt handler for the case where sclp_busy is set. The interrupt handler will attempt to write an error message on the console using the SCLP, and will wait for sclp_busy to become false before doing so. If an exception happenes between setting the flag and the SCLP call, or if the call itself raises an exception, we need to clear the flag so we can successfully print the error message. Acked-by: Thomas Huth Reviewed-by: David Hildenbrand Signed-off-by: Claudio Imbrenda Message-Id: <20200120184256.188698-6-imbrenda@linux.ibm.com> Signed-off-by: David Hildenbrand --- lib/s390x/interrupt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index 05f30be..ccb376a 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -106,10 +106,13 @@ static void fixup_pgm_int(void) void handle_pgm_int(void) { - if (!pgm_int_expected) + if (!pgm_int_expected) { + /* Force sclp_busy to false, otherwise we will loop forever */ + sclp_handle_ext(); report_abort("Unexpected program interrupt: %d at %#lx, ilen %d\n", lc->pgm_int_code, lc->pgm_old_psw.addr, lc->pgm_int_id); + } pgm_int_expected = false; fixup_pgm_int(); From patchwork Thu Jan 30 13:11:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11357953 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F3C7139A for ; Thu, 30 Jan 2020 13:11:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDC6B2083E for ; Thu, 30 Jan 2020 13:11:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X9HupmHt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727358AbgA3NL4 (ORCPT ); Thu, 30 Jan 2020 08:11:56 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21207 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727247AbgA3NLz (ORCPT ); Thu, 30 Jan 2020 08:11:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580389913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7iQQFT+qJHHOuRaogKDsStL+M+fzum2Xs6BYqSDmKwY=; b=X9HupmHtAmsqFNVJ14Bm3rINV2iW7uDI4cqqK+8CoICWmIimOOAtCgvk+O4aard4BzfF22 naJWHzN03ODlA0vOmom+k9cTrTu3V4HE3UtiSYJvBPp1eTQLy+PPPLocGAyT6pTlx904Eu l+FW0RpFZcWKF6Vc0OK7sQgrTVoKHNE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-202-EuhV-gRvNf6bI0px3dQV1A-1; Thu, 30 Jan 2020 08:11:50 -0500 X-MC-Unique: EuhV-gRvNf6bI0px3dQV1A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22AFF10054E3; Thu, 30 Jan 2020 13:11:49 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-219.ams2.redhat.com [10.36.117.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC6A17793C; Thu, 30 Jan 2020 13:11:46 +0000 (UTC) From: David Hildenbrand To: kvm@vger.kernel.org Cc: Paolo Bonzini , Thomas Huth , david@redhat.com, Janosch Frank , Claudio Imbrenda Subject: [kvm-unit-tests PULL 6/6] s390x: SCLP unit test Date: Thu, 30 Jan 2020 14:11:16 +0100 Message-Id: <20200130131116.12386-7-david@redhat.com> In-Reply-To: <20200130131116.12386-1-david@redhat.com> References: <20200130131116.12386-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Claudio Imbrenda SCLP unit test. Testing the following: * Correctly ignoring instruction bits that should be ignored * Privileged instruction check * Check for addressing exceptions * Specification exceptions: - SCCB size less than 8 - SCCB unaligned - SCCB overlaps prefix or lowcore - SCCB address higher than 2GB * Return codes for - Invalid command - SCCB too short (but at least 8) - SCCB page boundary violation Signed-off-by: Claudio Imbrenda Reviewed-by: Thomas Huth Acked-by: Janosch Frank Message-Id: <20200120184256.188698-7-imbrenda@linux.ibm.com> Signed-off-by: David Hildenbrand --- s390x/Makefile | 1 + s390x/sclp.c | 479 ++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 8 + 3 files changed, 488 insertions(+) create mode 100644 s390x/sclp.c diff --git a/s390x/Makefile b/s390x/Makefile index 3744372..ddb4b48 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -16,6 +16,7 @@ tests += $(TEST_DIR)/diag288.elf tests += $(TEST_DIR)/stsi.elf tests += $(TEST_DIR)/skrf.elf tests += $(TEST_DIR)/smp.elf +tests += $(TEST_DIR)/sclp.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary diff --git a/s390x/sclp.c b/s390x/sclp.c new file mode 100644 index 0000000..7d92bf3 --- /dev/null +++ b/s390x/sclp.c @@ -0,0 +1,479 @@ +/* + * Service Call tests + * + * Copyright (c) 2020 IBM Corp + * + * Authors: + * Claudio Imbrenda + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2. + */ + +#include +#include +#include +#include +#include + +#define PGM_NONE 1 +#define PGM_BIT_SPEC (1ULL << PGM_INT_CODE_SPECIFICATION) +#define PGM_BIT_ADDR (1ULL << PGM_INT_CODE_ADDRESSING) +#define PGM_BIT_PRIV (1ULL << PGM_INT_CODE_PRIVILEGED_OPERATION) +#define MKPTR(x) ((void *)(uint64_t)(x)) + +#define LC_SIZE (2 * PAGE_SIZE) + +static uint8_t pagebuf[LC_SIZE] __attribute__((aligned(LC_SIZE))); /* scratch pages used for some tests */ +static uint8_t prefix_buf[LC_SIZE] __attribute__((aligned(LC_SIZE))); /* temporary lowcore for test_sccb_prefix */ +/* SCCB template to be used */ +static union { + uint8_t raw[PAGE_SIZE]; + SCCBHeader header; + WriteEventData data; +} sccb_template; +static uint32_t valid_code; /* valid command code for READ SCP INFO */ +static struct lowcore *lc; + +/** + * Perform one service call, handling exceptions and interrupts. + */ +static int sclp_service_call_test(unsigned int command, void *sccb) +{ + int cc; + + sclp_mark_busy(); + sclp_setup_int(); + cc = servc(command, __pa(sccb)); + if (lc->pgm_int_code) { + sclp_handle_ext(); + return 0; + } + if (!cc) + sclp_wait_busy(); + return cc; +} + +/** + * Perform one test at the given address, optionally using the SCCB template, + * checking for the expected program interrupts and return codes. + * + * The parameter buf_len indicates the number of bytes of the template that + * should be copied to the test address, and should be 0 when the test + * address is invalid, in which case nothing is copied. + * + * The template is used to simplify tests where the same buffer content is + * used many times in a row, at different addresses. + * + * Returns true in case of success or false in case of failure + */ +static bool test_one_sccb(uint32_t cmd, uint8_t *addr, uint16_t buf_len, uint64_t exp_pgm, uint16_t exp_rc) +{ + SCCBHeader *h = (SCCBHeader *)addr; + int res, pgm; + + /* Copy the template to the test address if needed */ + if (buf_len) + memcpy(addr, sccb_template.raw, buf_len); + if (exp_pgm != PGM_NONE) + expect_pgm_int(); + /* perform the actual call */ + res = sclp_service_call_test(cmd, h); + if (res) { + report_info("SCLP not ready (command %#x, address %p, cc %d)", cmd, addr, res); + return false; + } + pgm = clear_pgm_int(); + /* Check if the program exception was one of the expected ones */ + if (!((1ULL << pgm) & exp_pgm)) { + report_info("First failure at addr %p, buf_len %d, cmd %#x, pgm code %d", + addr, buf_len, cmd, pgm); + return false; + } + /* Check if the response code is the one expected */ + if (exp_rc && exp_rc != h->response_code) { + report_info("First failure at addr %p, buf_len %d, cmd %#x, resp code %#x", + addr, buf_len, cmd, h->response_code); + return false; + } + return true; +} + +/** + * Wrapper for test_one_sccb to be used when the template should not be + * copied and the memory address should not be touched. + */ +static bool test_one_ro(uint32_t cmd, uint8_t *addr, uint64_t exp_pgm, uint16_t exp_rc) +{ + return test_one_sccb(cmd, addr, 0, exp_pgm, exp_rc); +} + +/** + * Wrapper for test_one_sccb to set up a simple SCCB template. + * + * The parameter sccb_len indicates the value that will be saved in the SCCB + * length field of the SCCB, buf_len indicates the number of bytes of + * template that need to be copied to the actual test address. In many cases + * it's enough to clear/copy the first 8 bytes of the buffer, while the SCCB + * itself can be larger. + * + * Returns true in case of success or false in case of failure + */ +static bool test_one_simple(uint32_t cmd, uint8_t *addr, uint16_t sccb_len, + uint16_t buf_len, uint64_t exp_pgm, uint16_t exp_rc) +{ + memset(sccb_template.raw, 0, sizeof(sccb_template.raw)); + sccb_template.header.length = sccb_len; + return test_one_sccb(cmd, addr, buf_len, exp_pgm, exp_rc); +} + +/** + * Test SCCB lengths < 8. + */ +static void test_sccb_too_short(void) +{ + int len; + + for (len = 0; len < 8; len++) + if (!test_one_simple(valid_code, pagebuf, len, 8, PGM_BIT_SPEC, 0)) + break; + + report(len == 8, "SCCB too short"); +} + +/** + * Test SCCBs that are not 64-bit aligned. + */ +static void test_sccb_unaligned(void) +{ + int offset; + + for (offset = 1; offset < 8; offset++) + if (!test_one_simple(valid_code, offset + pagebuf, 8, 8, PGM_BIT_SPEC, 0)) + break; + report(offset == 8, "SCCB unaligned"); +} + +/** + * Test SCCBs whose address is in the lowcore or prefix area. + */ +static void test_sccb_prefix(void) +{ + uint8_t scratch[LC_SIZE]; + uint32_t prefix, new_prefix; + int offset; + + /* + * copy the current lowcore to the future new location, otherwise we + * will not have a valid lowcore after setting the new prefix. + */ + memcpy(prefix_buf, 0, LC_SIZE); + /* save the current prefix (it's probably going to be 0) */ + prefix = get_prefix(); + /* + * save the current content of absolute pages 0 and 1, so we can + * restore them after we trash them later on + */ + memcpy(scratch, (void *)(intptr_t)prefix, LC_SIZE); + /* set the new prefix to prefix_buf */ + new_prefix = (uint32_t)(intptr_t)prefix_buf; + set_prefix(new_prefix); + + /* + * testing with SCCB addresses in the lowcore; since we can't + * actually trash the lowcore (unsurprisingly, things break if we + * do), this will be a read-only test. + */ + for (offset = 0; offset < LC_SIZE; offset += 8) + if (!test_one_ro(valid_code, MKPTR(offset), PGM_BIT_SPEC, 0)) + break; + report(offset == LC_SIZE, "SCCB low pages"); + + /* + * the SCLP should not even touch the memory, but we will write the + * SCCBs all over the two pages starting at absolute address 0, thus + * trashing them; we will need to restore them later. + */ + for (offset = 0; offset < LC_SIZE; offset += 8) + if (!test_one_simple(valid_code, MKPTR(new_prefix + offset), 8, 8, PGM_BIT_SPEC, 0)) + break; + report(offset == LC_SIZE, "SCCB prefix pages"); + + /* restore the previous contents of absolute pages 0 and 1 */ + memcpy(prefix_buf, 0, LC_SIZE); + /* restore the prefix to the original value */ + set_prefix(prefix); +} + +/** + * Test SCCBs that are above 2GB. If outside of memory, an addressing + * exception is also allowed. + */ +static void test_sccb_high(void) +{ + SCCBHeader *h = (SCCBHeader *)pagebuf; + uintptr_t a[33 * 4 * 2 + 2]; /* for the list of addresses to test */ + + uint64_t maxram; + int i, pgm, len = 0; + + h->length = 8; + /* addresses with 1 bit set in the first 33 bits */ + for (i = 0; i < 33; i++) + a[len++] = 1UL << (i + 31); + /* addresses with 2 consecutive bits set in the first 33 bits */ + for (i = 0; i < 33; i++) + a[len++] = 3UL << (i + 31); + /* addresses with all bits set in bits 0..N */ + for (i = 0; i < 33; i++) + a[len++] = 0xffffffff80000000UL << i; + /* addresses with all bits set in bits N..33 */ + a[len++] = 0x80000000; + for (i = 1; i < 33; i++, len++) + a[len] = a[len - 1] | (1UL << (i + 31)); + /* all the addresses above, but adding the offset of a valid buffer */ + for (i = 0; i < len; i++) + a[len + i] = a[i] + (intptr_t)h; + len += i; + /* two more hand-crafted addresses */ + a[len++] = 0xdeadbeef00000000; + a[len++] = 0xdeaddeadbeef0000; + + maxram = get_ram_size(); + for (i = 0; i < len; i++) { + pgm = PGM_BIT_SPEC | (a[i] >= maxram ? PGM_BIT_ADDR : 0); + if (!test_one_ro(valid_code, (void *)a[i], pgm, 0)) + break; + } + report(i == len, "SCCB high addresses"); +} + +/** + * Test invalid commands, both invalid command detail codes and valid + * ones with invalid command class code. + */ +static void test_inval(void) +{ + const uint16_t res = SCLP_RC_INVALID_SCLP_COMMAND; + uint32_t cmd; + int i; + + report_prefix_push("Invalid command"); + for (i = 0; i < 65536; i++) { + cmd = 0xdead0000 | i; + if (!test_one_simple(cmd, pagebuf, PAGE_SIZE, PAGE_SIZE, PGM_NONE, res)) + break; + } + report(i == 65536, "Command detail code"); + + for (i = 0; i < 256; i++) { + cmd = (valid_code & ~0xff) | i; + if (cmd == valid_code) + continue; + if (!test_one_simple(cmd, pagebuf, PAGE_SIZE, PAGE_SIZE, PGM_NONE, res)) + break; + } + report(i == 256, "Command class code"); + report_prefix_pop(); +} + + +/** + * Test short SCCBs (but larger than 8). + */ +static void test_short(void) +{ + const uint16_t res = SCLP_RC_INSUFFICIENT_SCCB_LENGTH; + int len; + + for (len = 8; len < 144; len++) + if (!test_one_simple(valid_code, pagebuf, len, len, PGM_NONE, res)) + break; + report(len == 144, "Insufficient SCCB length (Read SCP info)"); + + for (len = 8; len < 40; len++) + if (!test_one_simple(SCLP_READ_CPU_INFO, pagebuf, len, len, PGM_NONE, res)) + break; + report(len == 40, "Insufficient SCCB length (Read CPU info)"); +} + +/** + * Test SCCB page boundary violations. + */ +static void test_boundary(void) +{ + const uint32_t cmd = SCLP_CMD_WRITE_EVENT_DATA; + const uint16_t res = SCLP_RC_SCCB_BOUNDARY_VIOLATION; + WriteEventData *sccb = &sccb_template.data; + int len, offset; + + memset(sccb_template.raw, 0, sizeof(sccb_template.raw)); + sccb->h.function_code = SCLP_FC_NORMAL_WRITE; + for (len = 32; len <= 4096; len++) { + offset = len & 7 ? len & ~7 : len - 8; + for (offset = 4096 - offset; offset < 4096; offset += 8) { + sccb->h.length = len; + if (!test_one_sccb(cmd, offset + pagebuf, len, PGM_NONE, res)) + goto out; + } + } +out: + report(len > 4096 && offset == 4096, "SCCB page boundary violation"); +} + +/** + * Test excessively long SCCBs. + */ +static void test_toolong(void) +{ + const uint32_t cmd = SCLP_CMD_WRITE_EVENT_DATA; + const uint16_t res = SCLP_RC_SCCB_BOUNDARY_VIOLATION; + WriteEventData *sccb = &sccb_template.data; + int len; + + memset(sccb_template.raw, 0, sizeof(sccb_template.raw)); + sccb->h.function_code = SCLP_FC_NORMAL_WRITE; + for (len = 4097; len < 8192; len++) { + sccb->h.length = len; + if (!test_one_sccb(cmd, pagebuf, PAGE_SIZE, PGM_NONE, res)) + break; + } + report(len == 8192, "SCCB bigger than 4k"); +} + +/** + * Test privileged operation. + */ +static void test_priv(void) +{ + SCCBHeader *h = (SCCBHeader *)pagebuf; + + report_prefix_push("Privileged operation"); + h->length = 8; + expect_pgm_int(); + enter_pstate(); + servc(valid_code, __pa(h)); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + report_prefix_pop(); +} + +/** + * Test addressing exceptions. We need to test SCCB addresses between the + * end of available memory and 2GB, because after 2GB a specification + * exception is also allowed. + * Only applicable if the VM has less than 2GB of memory + */ +static void test_addressing(void) +{ + unsigned long i, maxram = get_ram_size(); + + /* the VM has more than 2GB of memory */ + if (maxram >= 0x80000000) { + report_skip("Invalid SCCB address"); + return; + } + /* test all possible valid addresses immediately after the end of memory + * up to 64KB after the end of memory + */ + for (i = 0; i < 0x10000 && i + maxram < 0x80000000; i += 8) + if (!test_one_ro(valid_code, MKPTR(i + maxram), PGM_BIT_ADDR, 0)) + goto out; + /* test more addresses until we reach 1MB after end of memory; + * increment by a prime number (times 8) in order to test all + * possible valid offsets inside pages + */ + for (; i < 0x100000 && i + maxram < 0x80000000 ; i += 808) + if (!test_one_ro(valid_code, MKPTR(i + maxram), PGM_BIT_ADDR, 0)) + goto out; + /* test the remaining addresses until we reach address 2GB; + * increment by a prime number (times 8) in order to test all + * possible valid offsets inside pages + */ + for (; i + maxram < 0x80000000; i += 800024) + if (!test_one_ro(valid_code, MKPTR(i + maxram), PGM_BIT_ADDR, 0)) + goto out; +out: + report(i + maxram >= 0x80000000, "Invalid SCCB address"); +} + +/** + * Test some bits in the instruction format that are specified to be ignored. + */ +static void test_instbits(void) +{ + SCCBHeader *h = (SCCBHeader *)pagebuf; + int cc; + + sclp_mark_busy(); + h->length = 8; + sclp_setup_int(); + + asm volatile( + " .insn rre,0xb2204200,%1,%2\n" /* servc %1,%2 */ + " ipm %0\n" + " srl %0,28" + : "=&d" (cc) : "d" (valid_code), "a" (__pa(pagebuf)) + : "cc", "memory"); + /* No exception, but also no command accepted, so no interrupt is + * expected. We need to clear the flag manually otherwise we will + * loop forever when we try to report failure. + */ + if (cc) + sclp_handle_ext(); + else + sclp_wait_busy(); + report(cc == 0, "Instruction format ignored bits"); +} + +/** + * Find a valid READ INFO command code; not all codes are always allowed, and + * probing should be performed in the right order. + */ +static void find_valid_sclp_code(void) +{ + const unsigned int commands[] = { SCLP_CMDW_READ_SCP_INFO_FORCED, + SCLP_CMDW_READ_SCP_INFO }; + SCCBHeader *h = (SCCBHeader *)pagebuf; + int i, cc; + + for (i = 0; i < ARRAY_SIZE(commands); i++) { + sclp_mark_busy(); + memset(h, 0, sizeof(*h)); + h->length = 4096; + + valid_code = commands[i]; + cc = sclp_service_call(commands[i], h); + if (cc) + break; + if (h->response_code == SCLP_RC_NORMAL_READ_COMPLETION) + return; + if (h->response_code != SCLP_RC_INVALID_SCLP_COMMAND) + break; + } + report_abort("READ_SCP_INFO failed"); +} + +int main(void) +{ + report_prefix_push("sclp"); + find_valid_sclp_code(); + + /* Test some basic things */ + test_instbits(); + test_priv(); + test_addressing(); + + /* Test the specification exceptions */ + test_sccb_too_short(); + test_sccb_unaligned(); + test_sccb_prefix(); + test_sccb_high(); + + /* Test the expected response codes */ + test_inval(); + test_short(); + test_boundary(); + test_toolong(); + + return report_summary(); +} diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index f1b07cd..07013b2 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -75,3 +75,11 @@ file = stsi.elf [smp] file = smp.elf extra_params =-smp 2 + +[sclp-1g] +file = sclp.elf +extra_params = -m 1G + +[sclp-3g] +file = sclp.elf +extra_params = -m 3G