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=-13.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 434B9C433E1 for ; Fri, 7 Aug 2020 11:16:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E1562075D for ; Fri, 7 Aug 2020 11:16:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="EHRgfQcG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726058AbgHGLQR (ORCPT ); Fri, 7 Aug 2020 07:16:17 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:9298 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726418AbgHGLQH (ORCPT ); Fri, 7 Aug 2020 07:16:07 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 077B1gR3191993; Fri, 7 Aug 2020 07:16:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=aLUCZG0byd/L0nTnpRLr0CEhle5/TDx0KglUE8IUI08=; b=EHRgfQcGDNGr1KMEWIbNWrrSaEcAdwGdkYsTqVa+YvgGtdQt3N6skYtQXPB3vOTYihLp /zreK9k26Ei1rSRq7NqSguf/z+SBt9p3Eh4x36lyYKI86PHtRJbBSpYg6o0/zHSvK6VW 8U2OcoSYSUKkbclRtvmVe9a0XzYh63wdTwjkXZ8z1zpLoAZbip+jcK75VPC2NtB31DDD oHt2QJuQ27lE0Mfz57GNupbDhUwX9iKP0VMiPHVBJ2o3LbsoBIukXuhvxy2ADeD83v2K X9iU1O8eUnzDrhw+nhacJ1p8ViIkha13F6hdb3+svYEAD2+Dm4qCYJrCPY1FRNv4IyhA 3g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 32s0tes24r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2020 07:16:06 -0400 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 077B3PSd002333; Fri, 7 Aug 2020 07:16:06 -0400 Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 32s0tes23q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2020 07:16:06 -0400 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 077BG4gM029095; Fri, 7 Aug 2020 11:16:04 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04fra.de.ibm.com with ESMTP id 32n018c13y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2020 11:16:04 +0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 077BG14W65601874 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Aug 2020 11:16:01 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F1A3AE061; Fri, 7 Aug 2020 11:16:01 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5CCC7AE056; Fri, 7 Aug 2020 11:16:00 +0000 (GMT) Received: from linux01.pok.stglabs.ibm.com (unknown [9.114.17.81]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 7 Aug 2020 11:16:00 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: thuth@redhat.com, linux-s390@vger.kernel.org, david@redhat.com, borntraeger@de.ibm.com, cohuck@redhat.com, imbrenda@linux.ibm.com Subject: [kvm-unit-tests PATCH v2 3/3] s390x: Ultravisor guest API test Date: Fri, 7 Aug 2020 07:15:55 -0400 Message-Id: <20200807111555.11169-4-frankja@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200807111555.11169-1-frankja@linux.ibm.com> References: <20200807111555.11169-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-08-07_06:2020-08-06,2020-08-07 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 priorityscore=1501 bulkscore=0 lowpriorityscore=0 suspectscore=3 phishscore=0 impostorscore=0 clxscore=1015 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008070077 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Test the error conditions of guest 2 Ultravisor calls, namely: * Query Ultravisor information * Set shared access * Remove shared access Signed-off-by: Janosch Frank Reviewed-by: Claudio Imbrenda --- lib/s390x/asm/uv.h | 74 ++++++++++++++++++++ s390x/Makefile | 1 + s390x/unittests.cfg | 3 + s390x/uv-guest.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) create mode 100644 lib/s390x/asm/uv.h create mode 100644 s390x/uv-guest.c diff --git a/lib/s390x/asm/uv.h b/lib/s390x/asm/uv.h new file mode 100644 index 0000000..4c2fc48 --- /dev/null +++ b/lib/s390x/asm/uv.h @@ -0,0 +1,74 @@ +/* + * s390x Ultravisor related definitions + * + * Copyright (c) 2020 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. + */ +#ifndef UV_H +#define UV_H + +#define UVC_RC_EXECUTED 0x0001 +#define UVC_RC_INV_CMD 0x0002 +#define UVC_RC_INV_STATE 0x0003 +#define UVC_RC_INV_LEN 0x0005 +#define UVC_RC_NO_RESUME 0x0007 + +#define UVC_CMD_QUI 0x0001 +#define UVC_CMD_SET_SHARED_ACCESS 0x1000 +#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001 + +/* Bits in installed uv calls */ +enum uv_cmds_inst { + BIT_UVC_CMD_QUI = 0, + BIT_UVC_CMD_SET_SHARED_ACCESS = 8, + BIT_UVC_CMD_REMOVE_SHARED_ACCESS = 9, +}; + +struct uv_cb_header { + u16 len; + u16 cmd; /* Command Code */ + u16 rc; /* Response Code */ + u16 rrc; /* Return Reason Code */ +} __attribute__((packed)) __attribute__((aligned(8))); + +struct uv_cb_qui { + struct uv_cb_header header; + u64 reserved08; + u64 inst_calls_list[4]; + u64 reserved30[15]; +} __attribute__((packed)) __attribute__((aligned(8))); + +struct uv_cb_share { + struct uv_cb_header header; + u64 reserved08[3]; + u64 paddr; + u64 reserved28; +} __attribute__((packed)) __attribute__((aligned(8))); + +static inline int uv_call(unsigned long r1, unsigned long r2) +{ + int cc; + + /* + * The brc instruction will take care of the cc 2/3 case where + * we need to continue the execution because we were + * interrupted. The inline assembly will only return on + * success/error i.e. cc 0/1. + */ + asm volatile( + "0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" + " brc 3,0b\n" + " ipm %[cc]\n" + " srl %[cc],28\n" + : [cc] "=d" (cc) + : [r1] "a" (r1), [r2] "a" (r2) + : "memory", "cc"); + return cc; +} + +#endif diff --git a/s390x/Makefile b/s390x/Makefile index 0f54bf4..c2213ad 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -18,6 +18,7 @@ tests += $(TEST_DIR)/skrf.elf tests += $(TEST_DIR)/smp.elf tests += $(TEST_DIR)/sclp.elf tests += $(TEST_DIR)/css.elf +tests += $(TEST_DIR)/uv-guest.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index b35269b..6d50c63 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -92,3 +92,6 @@ extra_params = -device virtio-net-ccw [skrf] file = skrf.elf smp = 2 + +[uv-guest] +file = uv-guest.elf diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c new file mode 100644 index 0000000..1aaf7ca --- /dev/null +++ b/s390x/uv-guest.c @@ -0,0 +1,162 @@ +/* + * Guest Ultravisor Call tests + * + * Copyright (c) 2020 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 +#include + +static unsigned long page; + +static inline int share(unsigned long addr, u16 cmd) +{ + struct uv_cb_share uvcb = { + .header.cmd = cmd, + .header.len = sizeof(uvcb), + .paddr = addr + }; + + uv_call(0, (u64)&uvcb); + return uvcb.header.rc; +} + +static inline int uv_set_shared(unsigned long addr) +{ + return share(addr, UVC_CMD_SET_SHARED_ACCESS); +} + +static inline int uv_remove_shared(unsigned long addr) +{ + return share(addr, UVC_CMD_REMOVE_SHARED_ACCESS); +} + +static void test_priv(void) +{ + struct uv_cb_header uvcb = {}; + + report_prefix_push("privileged"); + + report_prefix_push("query"); + expect_pgm_int(); + uvcb.cmd = UVC_CMD_QUI; + uvcb.len = sizeof(struct uv_cb_qui); + enter_pstate(); + uv_call(0, (u64)&uvcb); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + report_prefix_pop(); + + report_prefix_push("share"); + expect_pgm_int(); + enter_pstate(); + uv_set_shared((unsigned long)page); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + report_prefix_pop(); + + report_prefix_push("unshare"); + expect_pgm_int(); + enter_pstate(); + uv_remove_shared((unsigned long)page); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + report_prefix_pop(); + + report_prefix_pop(); +} + +static void test_query(void) +{ + struct uv_cb_qui uvcb = { + .header.cmd = UVC_CMD_QUI, + .header.len = sizeof(uvcb) - 8, + }; + int cc; + + report_prefix_push("query"); + cc = uv_call(0, (u64)&uvcb); + report(cc == 1 && uvcb.header.rc == UVC_RC_INV_LEN, "length"); + + uvcb.header.len = sizeof(uvcb); + cc = uv_call(0, (u64)&uvcb); + report(cc == 0 && uvcb.header.rc == UVC_RC_EXECUTED, "successful query"); + + /* + * These bits have been introduced with the very first + * Ultravisor version and are expected to always be available + * because they are basic building blocks. + */ + report(uvcb.inst_calls_list[0] & (1UL << (63 - BIT_UVC_CMD_QUI)), + "query indicated"); + report(uvcb.inst_calls_list[0] & (1UL << (63 - BIT_UVC_CMD_SET_SHARED_ACCESS)), + "share indicated"); + report(uvcb.inst_calls_list[0] & (1UL << (63 - BIT_UVC_CMD_REMOVE_SHARED_ACCESS)), + "unshare indicated"); + report_prefix_pop(); +} + +static void test_sharing(void) +{ + struct uv_cb_share uvcb = { + .header.cmd = UVC_CMD_SET_SHARED_ACCESS, + .header.len = sizeof(uvcb) - 8, + }; + int cc; + + report_prefix_push("share"); + cc = uv_call(0, (u64)&uvcb); + report(cc == 1 && uvcb.header.rc == UVC_RC_INV_LEN, "length"); + report(uv_set_shared(page) == UVC_RC_EXECUTED, "share"); + report_prefix_pop(); + + report_prefix_push("unshare"); + uvcb.header.cmd = UVC_CMD_REMOVE_SHARED_ACCESS; + cc = uv_call(0, (u64)&uvcb); + report(cc == 1 && uvcb.header.rc == UVC_RC_INV_LEN, "length"); + report(uv_remove_shared(page) == UVC_RC_EXECUTED, "unshare"); + report_prefix_pop(); + + report_prefix_pop(); +} + +static void test_invalid(void) +{ + struct uv_cb_header uvcb = { + .len = 16, + .cmd = 0x4242, + }; + int cc; + + cc = uv_call(0, (u64)&uvcb); + report(cc == 1 && uvcb.rc == UVC_RC_INV_CMD, "invalid command"); +} + +int main(void) +{ + bool has_uvc = test_facility(158); + + report_prefix_push("uvc"); + if (!has_uvc) { + report_skip("Ultravisor call facility is not available"); + goto done; + } + + page = (unsigned long)alloc_page(); + test_priv(); + test_invalid(); + test_query(); + test_sharing(); + free_page((void *)page); +done: + report_prefix_pop(); + return report_summary(); +} -- 2.25.1