From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:20652 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394107AbgLKKCV (ORCPT ); Fri, 11 Dec 2020 05:02:21 -0500 From: Janosch Frank Subject: [kvm-unit-tests PATCH v3 7/8] s390x: Add diag318 intercept test Date: Fri, 11 Dec 2020 05:00:38 -0500 Message-Id: <20201211100039.63597-8-frankja@linux.ibm.com> In-Reply-To: <20201211100039.63597-1-frankja@linux.ibm.com> References: <20201211100039.63597-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-ID: To: kvm@vger.kernel.org Cc: thuth@redhat.com, david@redhat.com, borntraeger@de.ibm.com, imbrenda@linux.ibm.com, cohuck@redhat.com, linux-s390@vger.kernel.org Not much to test except for the privilege and specification exceptions. Signed-off-by: Janosch Frank Reviewed-by: Thomas Huth --- lib/s390x/sclp.c | 2 ++ lib/s390x/sclp.h | 6 +++++- s390x/intercept.c | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c index cf6ea7c..0001993 100644 --- a/lib/s390x/sclp.c +++ b/lib/s390x/sclp.c @@ -138,6 +138,8 @@ void sclp_facilities_setup(void) assert(read_info); + sclp_facilities.has_diag318 = read_info->byte_134_diag318; + cpu = (void *)read_info + read_info->offset_cpu; for (i = 0; i < read_info->entries_cpu; i++, cpu++) { if (cpu->address == cpu0_addr) { diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h index 6c86037..58f8e54 100644 --- a/lib/s390x/sclp.h +++ b/lib/s390x/sclp.h @@ -105,7 +105,8 @@ extern struct sclp_facilities sclp_facilities; struct sclp_facilities { uint64_t has_sief2 : 1; - uint64_t : 63; + uint64_t has_diag318 : 1; + uint64_t : 62; }; typedef struct ReadInfo { @@ -130,6 +131,9 @@ typedef struct ReadInfo { uint16_t highest_cpu; uint8_t _reserved5[124 - 122]; /* 122-123 */ uint32_t hmfai; + uint8_t reserved7[134 - 128]; + uint8_t byte_134_diag318 : 1; + uint8_t : 7; struct CPUEntry entries[0]; } __attribute__((packed)) ReadInfo; diff --git a/s390x/intercept.c b/s390x/intercept.c index cde2f5f..86e57e1 100644 --- a/s390x/intercept.c +++ b/s390x/intercept.c @@ -8,6 +8,7 @@ * Thomas Huth */ #include +#include #include #include #include @@ -152,6 +153,23 @@ static void test_testblock(void) check_pgm_int_code(PGM_INT_CODE_ADDRESSING); } +static void test_diag318(void) +{ + expect_pgm_int(); + enter_pstate(); + asm volatile("diag %0,0,0x318\n" : : "d" (0x42)); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + + if (!sclp_facilities.has_diag318) + expect_pgm_int(); + + asm volatile("diag %0,0,0x318\n" : : "d" (0x42)); + + if (!sclp_facilities.has_diag318) + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); + +} + struct { const char *name; void (*func)(void); @@ -162,6 +180,7 @@ struct { { "stap", test_stap, false }, { "stidp", test_stidp, false }, { "testblock", test_testblock, false }, + { "diag318", test_diag318, false }, { NULL, NULL, false } }; -- 2.25.1