From patchwork Wed Mar 28 07:39:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10312469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 77E2060467 for ; Wed, 28 Mar 2018 07:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6760628A0F for ; Wed, 28 Mar 2018 07:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BB8F2940F; Wed, 28 Mar 2018 07:40:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88FEC28A0F for ; Wed, 28 Mar 2018 07:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753230AbeC1HkK (ORCPT ); Wed, 28 Mar 2018 03:40:10 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49280 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753325AbeC1Hjw (ORCPT ); Wed, 28 Mar 2018 03:39:52 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 90C6C84222; Wed, 28 Mar 2018 07:39:51 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE71110B2B38; Wed, 28 Mar 2018 07:39:50 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: kvm@vger.kernel.org, David Hildenbrand , Janosch Frank Subject: [kvm-unit-tests PULL 3/8] s390x: Add storage keys tests Date: Wed, 28 Mar 2018 09:39:39 +0200 Message-Id: <1522222784-7709-4-git-send-email-thuth@redhat.com> In-Reply-To: <1522222784-7709-1-git-send-email-thuth@redhat.com> References: <1522222784-7709-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 28 Mar 2018 07:39:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 28 Mar 2018 07:39:51 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Janosch Frank Storage keys are not used by Linux anymore, so let's show them some love and test if the basics still work. Signed-off-by: Janosch Frank Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- lib/s390x/asm/mem.h | 52 +++++++++++++++++++++++++++++ s390x/Makefile | 1 + s390x/skey.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 3 ++ 4 files changed, 150 insertions(+) create mode 100644 lib/s390x/asm/mem.h create mode 100644 s390x/skey.c diff --git a/lib/s390x/asm/mem.h b/lib/s390x/asm/mem.h new file mode 100644 index 0000000..909e6d4 --- /dev/null +++ b/lib/s390x/asm/mem.h @@ -0,0 +1,52 @@ +/* + * Physical memory management related functions and definitions. + * + * Copyright IBM Corp. 2018 + * Author(s): Janosch Frank + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU Library General Public License version 2. + */ +#ifndef _ASM_S390_MEM_H +#define _ASM_S390_MEM_H + +union skey { + struct { + uint8_t acc : 4; + uint8_t fp : 1; + uint8_t rf : 1; + uint8_t ch : 1; + uint8_t pad : 1; + } str; + uint8_t val; +}; + +static inline void set_storage_key(unsigned long addr, + unsigned char skey, + int nq) +{ + if (nq) + asm volatile(".insn rrf,0xb22b0000,%0,%1,8,0" + : : "d" (skey), "a" (addr)); + else + asm volatile("sske %0,%1" : : "d" (skey), "a" (addr)); +} + +static inline unsigned long set_storage_key_mb(unsigned long addr, + unsigned char skey) +{ + assert(test_facility(8)); + + asm volatile(".insn rrf,0xb22b0000,%[skey],%[addr],1,0" + : [addr] "+a" (addr) : [skey] "d" (skey)); + return addr; +} + +static inline unsigned char get_storage_key(unsigned long addr) +{ + unsigned char skey; + + asm volatile("iske %0,%1" : "=d" (skey) : "a" (addr)); + return skey; +} +#endif diff --git a/s390x/Makefile b/s390x/Makefile index f68d8a7..c860ed8 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -3,6 +3,7 @@ tests += $(TEST_DIR)/intercept.elf tests += $(TEST_DIR)/emulator.elf tests += $(TEST_DIR)/sieve.elf tests += $(TEST_DIR)/sthyi.elf +tests += $(TEST_DIR)/skey.elf all: directories test_cases diff --git a/s390x/skey.c b/s390x/skey.c new file mode 100644 index 0000000..e4c2a43 --- /dev/null +++ b/s390x/skey.c @@ -0,0 +1,94 @@ +/* + * Storage key tests + * + * Copyright (c) 2018 IBM Corp + * + * Authors: + * Janosch Frank + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU Library General Public License version 2. + */ +#include +#include +#include +#include +#include +#include + + +static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); +const unsigned long page0 = (unsigned long)pagebuf; +const unsigned long page1 = (unsigned long)(pagebuf + PAGE_SIZE); + +static void test_set_mb(void) +{ + union skey skey, ret1, ret2; + unsigned long addr = 0x10000 - 2 * PAGE_SIZE; + unsigned long end = 0x10000; + + /* Multi block support came with EDAT 1 */ + if (!test_facility(8)) + return; + + skey.val = 0x30; + while (addr < end) + addr = set_storage_key_mb(addr, skey.val); + + ret1.val = get_storage_key(end - PAGE_SIZE); + ret2.val = get_storage_key(end - PAGE_SIZE * 2); + report("multi block", ret1.val == ret2.val && ret1.val == skey.val); +} + +static void test_chg(void) +{ + union skey skey1, skey2; + + skey1.val = 0x30; + set_storage_key(page0, skey1.val, 0); + skey1.val = get_storage_key(page0); + pagebuf[0] = 3; + skey2.val = get_storage_key(page0); + report("chg bit test", !skey1.str.ch && skey2.str.ch); +} + +static void test_set(void) +{ + union skey skey, ret; + + skey.val = 0x30; + ret.val = get_storage_key(page0); + set_storage_key(page0, skey.val, 0); + ret.val = get_storage_key(page0); + report("set key test", skey.val == ret.val); +} + +static void test_priv(void) +{ + union skey skey; + + memset(pagebuf, 0, PAGE_SIZE * 2); + expect_pgm_int(); + enter_pstate(); + set_storage_key(page0, 0x30, 0); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + + skey.val = get_storage_key(page0); + report("skey did not change on exception", skey.str.acc != 3); + + expect_pgm_int(); + enter_pstate(); + get_storage_key(page0); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); +} + +int main(void) +{ + report_prefix_push("skey"); + test_priv(); + test_set(); + test_set_mb(); + test_chg(); + report_prefix_pop(); + return report_summary(); +} diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index 258189e..c98cddd 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -37,3 +37,6 @@ timeout = 600 [sthyi] file = sthyi.elf + +[skey] +file = skey.elf