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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 D3E4AC3A5A1 for ; Wed, 28 Aug 2019 11:46:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3A832189D for ; Wed, 28 Aug 2019 11:46:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726437AbfH1Lqf (ORCPT ); Wed, 28 Aug 2019 07:46:35 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35578 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbfH1Lqf (ORCPT ); Wed, 28 Aug 2019 07:46:35 -0400 Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x7SBh5h9140688 for ; Wed, 28 Aug 2019 07:46:34 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2umnmvwvxf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Aug 2019 07:46:33 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 28 Aug 2019 12:36:29 +0100 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 28 Aug 2019 12:36:27 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x7SBaQT436045198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Aug 2019 11:36:26 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 15D4BA4065; Wed, 28 Aug 2019 11:36:26 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 55214A405B; Wed, 28 Aug 2019 11:36:25 +0000 (GMT) Received: from localhost.localdomain (unknown [9.152.224.131]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 28 Aug 2019 11:36:25 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.com Subject: [kvm-unit-tests PATCH v2 4/4] s390x: Add storage key removal facility Date: Wed, 28 Aug 2019 13:36:15 +0200 X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190828113615.4769-1-frankja@linux.ibm.com> References: <20190828113615.4769-1-frankja@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19082811-0008-0000-0000-0000030E388E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19082811-0009-0000-0000-00004A2C786B Message-Id: <20190828113615.4769-5-frankja@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-08-28_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908280126 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The storage key removal facility (stfle bit 169) makes all key related instructions result in a special operation exception if they handle a key. Let's make sure that the skey and pfmf tests only run non key code (pfmf) or not at all (skey). Also let's test this new facility. As lots of instructions are affected by this, only some of them are tested for now. Signed-off-by: Janosch Frank --- s390x/Makefile | 1 + s390x/pfmf.c | 10 ++++ s390x/skey.c | 5 ++ s390x/skrf.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 s390x/skrf.c diff --git a/s390x/Makefile b/s390x/Makefile index 07bd353..96033dd 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -14,6 +14,7 @@ tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf tests += $(TEST_DIR)/diag288.elf tests += $(TEST_DIR)/stsi.elf +tests += $(TEST_DIR)/skrf.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary diff --git a/s390x/pfmf.c b/s390x/pfmf.c index 0b3e70b..e81f7c5 100644 --- a/s390x/pfmf.c +++ b/s390x/pfmf.c @@ -34,6 +34,10 @@ static void test_4k_key(void) union skey skey; report_prefix_push("4K"); + if (test_facility(169)) { + report_skip("storage key removal facility is active"); + goto out; + } r1.val = 0; r1.reg.sk = 1; r1.reg.fsc = PFMF_FSC_4K; @@ -42,6 +46,7 @@ static void test_4k_key(void) skey.val = get_storage_key(pagebuf); skey.val &= SKEY_ACC | SKEY_FP; report("set storage keys", skey.val == 0x30); +out: report_prefix_pop(); } @@ -53,6 +58,10 @@ static void test_1m_key(void) union skey skey; report_prefix_push("1M"); + if (test_facility(169)) { + report_skip("storage key removal facility is active"); + goto out; + } r1.val = 0; r1.reg.sk = 1; r1.reg.fsc = PFMF_FSC_1M; @@ -67,6 +76,7 @@ static void test_1m_key(void) } } report("set storage keys", rp); +out: report_prefix_pop(); } diff --git a/s390x/skey.c b/s390x/skey.c index efc4eca..5020e99 100644 --- a/s390x/skey.c +++ b/s390x/skey.c @@ -126,10 +126,15 @@ static void test_priv(void) int main(void) { report_prefix_push("skey"); + if (test_facility(169)) { + report_skip("storage key removal facility is active"); + goto done; + } test_priv(); test_set(); test_set_mb(); test_chg(); +done: report_prefix_pop(); return report_summary(); } diff --git a/s390x/skrf.c b/s390x/skrf.c new file mode 100644 index 0000000..e77ff35 --- /dev/null +++ b/s390x/skrf.c @@ -0,0 +1,128 @@ +/* + * Storage key removal facility tests + * + * Copyright (c) 2019 IBM Corp + * + * Authors: + * Janosch Frank + * + * 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 +#include + +static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); + +static void test_facilities(void) +{ + report_prefix_push("facilities"); + report("!10", !test_facility(10)); + report("!14", !test_facility(14)); + report("!66", !test_facility(66)); + report("!145", !test_facility(145)); + report("!149", !test_facility(140)); + report_prefix_pop(); +} + +static void test_skey(void) +{ + report_prefix_push("sske"); + expect_pgm_int(); + set_storage_key(pagebuf, 0x30, 0); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + expect_pgm_int(); + report_prefix_pop(); + report_prefix_push("iske"); + get_storage_key(pagebuf); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + report_prefix_pop(); +} + +static void test_pfmf(void) +{ + union pfmf_r1 r1; + + report_prefix_push("pfmf"); + r1.val = 0; + r1.reg.sk = 1; + r1.reg.fsc = PFMF_FSC_4K; + r1.reg.key = 0x30; + expect_pgm_int(); + pfmf(r1.val, pagebuf); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + report_prefix_pop(); +} + +static void test_psw_key(void) +{ + uint64_t psw_mask = extract_psw_mask() | 0xF0000000000000UL; + + report_prefix_push("psw key"); + expect_pgm_int(); + load_psw_mask(psw_mask); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + report_prefix_pop(); +} + +static void test_mvcos(void) +{ + uint64_t r3 = 64; + uint8_t *src = pagebuf; + uint8_t *dst = pagebuf + PAGE_SIZE; + /* K bit set, as well as keys */ + register unsigned long oac asm("0") = 0xf002f002; + + report_prefix_push("mvcos"); + expect_pgm_int(); + asm volatile("mvcos %[dst],%[src],%[len]" + : [dst] "+Q" (*(dst)) + : [src] "Q" (*(src)), [len] "d" (r3), "d" (oac) + : "cc", "memory"); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + report_prefix_pop(); +} + +static void test_spka(void) +{ + report_prefix_push("spka"); + expect_pgm_int(); + asm volatile("spka 0xf0(0)\n"); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + report_prefix_pop(); +} + +static void test_tprot(void) +{ + report_prefix_push("tprot"); + expect_pgm_int(); + asm volatile("tprot %[addr],0xf0(0)\n" + : : [addr] "a" (pagebuf) : ); + check_pgm_int_code(PGM_INT_CODE_SPECIAL_OPERATION); + report_prefix_pop(); +} + +int main(void) +{ + report_prefix_push("skrf"); + if (!test_facility(169)) { + report_skip("storage key removal facility not available\n"); + goto done; + } + + test_facilities(); + test_skey(); + test_pfmf(); + test_psw_key(); + test_mvcos(); + test_spka(); + test_tprot(); + +done: + report_prefix_pop(); + return report_summary(); +} -- 2.17.0