From patchwork Tue Feb 22 14:54:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Eiden X-Patchwork-Id: 12755267 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53D30C43217 for ; Tue, 22 Feb 2022 14:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232959AbiBVOzc (ORCPT ); Tue, 22 Feb 2022 09:55:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229679AbiBVOzb (ORCPT ); Tue, 22 Feb 2022 09:55:31 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4105810C513; Tue, 22 Feb 2022 06:55:06 -0800 (PST) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21MDhbe7017062; Tue, 22 Feb 2022 14:55:05 GMT 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=6Wu5eDkx8Lixyzh7KShtj7gaZAiMY4doEHgsWPSsmQ8=; b=VzCPFpmoQT77wR7u/X/cRqpFZFPriTGW9kHATUXTIj/D3I6GzIexO9YbpkLLnFU2H1lW H3rmZ4Xnfs7cN2FuHuuctdSDgKWuluZCgoHZdND98AB4Afcy83vhsPuIuslo0cJWPmbw F28sx2SpKSCZBpzyyMJB77wVBy2BHWioDHzjEvVTEvr9e+V8s5Y6AiTBYKSJ1DUP2+4q 3+CriHxNZBxgchoAQko6WU94pKZOJ/RFMapGUtofOmBk26PFrlQR8CjWIkQPltUJbN03 B75BpI8yYKrRHS/lq5O4JZWL8El9lLIQ038QB8U13z4KVfp61TV1seuoXUhyT2Y34UR6 ng== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ed036ug05-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:05 +0000 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21MEVSHm028206; Tue, 22 Feb 2022 14:55:04 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ed036ufyd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:04 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21MEhctm020607; Tue, 22 Feb 2022 14:55:03 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma03fra.de.ibm.com with ESMTP id 3ear692frt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:02 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21MEiMGj47317368 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Feb 2022 14:44:22 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7CAEAA4062; Tue, 22 Feb 2022 14:54:59 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F17EA405B; Tue, 22 Feb 2022 14:54:58 +0000 (GMT) Received: from linux7.. (unknown [9.114.12.92]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 22 Feb 2022 14:54:58 +0000 (GMT) From: Steffen Eiden To: Thomas Huth , Janosch Frank , Claudio Imbrenda , David Hildenbrand Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v3 1/5] s390x: uv-host: Add attestation test Date: Tue, 22 Feb 2022 14:54:52 +0000 Message-Id: <20220222145456.9956-2-seiden@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222145456.9956-1-seiden@linux.ibm.com> References: <20220222145456.9956-1-seiden@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 9crtBt0xRadRXr4Bvhphgtlasa3NNA7F X-Proofpoint-GUID: n07z4zhYF8aacn1SypA6pb9_Todnuhgy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-22_03,2022-02-21_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202220091 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Adds an invalid command test for attestation in the uv-host. Signed-off-by: Steffen Eiden Reviewed-by: Janosch Frank Reviewed-by: Claudio Imbrenda --- lib/s390x/asm/uv.h | 23 ++++++++++++++++++++++- s390x/uv-host.c | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/s390x/asm/uv.h b/lib/s390x/asm/uv.h index 70bf65c4..c330c0f8 100644 --- a/lib/s390x/asm/uv.h +++ b/lib/s390x/asm/uv.h @@ -1,7 +1,7 @@ /* * s390x Ultravisor related definitions * - * Copyright (c) 2020 IBM Corp + * Copyright IBM Corp. 2020, 2022 * * Authors: * Janosch Frank @@ -47,6 +47,7 @@ #define UVC_CMD_UNPIN_PAGE_SHARED 0x0342 #define UVC_CMD_SET_SHARED_ACCESS 0x1000 #define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001 +#define UVC_CMD_ATTESTATION 0x1020 /* Bits in installed uv calls */ enum uv_cmds_inst { @@ -71,6 +72,7 @@ enum uv_cmds_inst { BIT_UVC_CMD_UNSHARE_ALL = 20, BIT_UVC_CMD_PIN_PAGE_SHARED = 21, BIT_UVC_CMD_UNPIN_PAGE_SHARED = 22, + BIT_UVC_CMD_ATTESTATION = 28, }; struct uv_cb_header { @@ -178,6 +180,25 @@ struct uv_cb_cfs { u64 paddr; } __attribute__((packed)) __attribute__((aligned(8))); +/* Retrieve Attestation Measurement */ +struct uv_cb_attest { + struct uv_cb_header header; /* 0x0000 */ + uint64_t reserved08[2]; /* 0x0008 */ + uint64_t arcb_addr; /* 0x0018 */ + uint64_t continuation_token; /* 0x0020 */ + uint8_t reserved28[6]; /* 0x0028 */ + uint16_t user_data_length; /* 0x002e */ + uint8_t user_data[256]; /* 0x0030 */ + uint32_t reserved130[3]; /* 0x0130 */ + uint32_t measurement_length; /* 0x013c */ + uint64_t measurement_address; /* 0x0140 */ + uint8_t config_uid[16]; /* 0x0148 */ + uint32_t reserved158; /* 0x0158 */ + uint32_t add_data_length; /* 0x015c */ + uint64_t add_data_address; /* 0x0160 */ + uint64_t reserved168[4]; /* 0x0168 */ +} __attribute__((packed)) __attribute__((aligned(8))); + /* Set Secure Config Parameter */ struct uv_cb_ssc { struct uv_cb_header header; diff --git a/s390x/uv-host.c b/s390x/uv-host.c index de2e4850..fe49d7b9 100644 --- a/s390x/uv-host.c +++ b/s390x/uv-host.c @@ -418,6 +418,7 @@ static struct cmd_list invalid_cmds[] = { { "bogus", 0x4242, sizeof(struct uv_cb_header), -1}, { "share", UVC_CMD_SET_SHARED_ACCESS, sizeof(struct uv_cb_share), BIT_UVC_CMD_SET_SHARED_ACCESS }, { "unshare", UVC_CMD_REMOVE_SHARED_ACCESS, sizeof(struct uv_cb_share), BIT_UVC_CMD_REMOVE_SHARED_ACCESS }, + { "attest", UVC_CMD_ATTESTATION, sizeof(struct uv_cb_attest), BIT_UVC_CMD_ATTESTATION }, { NULL, 0, 0 }, }; From patchwork Tue Feb 22 14:54:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Eiden X-Patchwork-Id: 12755268 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A6E5C433F5 for ; Tue, 22 Feb 2022 14:55:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232967AbiBVOze (ORCPT ); Tue, 22 Feb 2022 09:55:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229679AbiBVOzd (ORCPT ); Tue, 22 Feb 2022 09:55:33 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4E5610C513; Tue, 22 Feb 2022 06:55:07 -0800 (PST) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21MEDVav029560; Tue, 22 Feb 2022 14:55:07 GMT 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=/pE9bxNfG6kL8HopJYYmH68KigzjetTd0Mjiknp64P8=; b=lBexlt8OXKHNVergtnplL/7JANXMVJBPjojzIX+xA5Vqb0rkUqgWkV4mBZGNRg7w9fAe 16DeVowuWRw1MFm1u39f6pvLnifgl1kcOz/WBNZOLrwbH2z/rQtQcMeLrp+B9zSc7Uk8 1Kg0RKIbr+/5xUFeEmPBr0/NBtU4vYs0LxD6dZ728HkSH+p6/2fQonOkJqcfdvFKdpqx NUAXwMpdWdDQomX2c15CzYfLVGFAh8vLVsdp8E/d2/JUAkNqKWZFlHkyUB0hb/VJTKAM dggy13MBuZ7FIikvGHbq5g3BUyVKUI1Zqt08cM30RqgrRWvbhIoEOjjSAU0h/mX8W590 wg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ed1dj8u3b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:07 +0000 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21MEkDvj014549; Tue, 22 Feb 2022 14:55:06 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ed1dj8u2e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:06 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21MEgu5k011798; Tue, 22 Feb 2022 14:55:04 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma01fra.de.ibm.com with ESMTP id 3ear692fuu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:04 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21MEt0Zw49676786 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Feb 2022 14:55:01 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DC79CA405B; Tue, 22 Feb 2022 14:55:00 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B6B99A405F; Tue, 22 Feb 2022 14:54:59 +0000 (GMT) Received: from linux7.. (unknown [9.114.12.92]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 22 Feb 2022 14:54:59 +0000 (GMT) From: Steffen Eiden To: Thomas Huth , Janosch Frank , Claudio Imbrenda , David Hildenbrand Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v3 2/5] s390x: lib: Add QUI getter Date: Tue, 22 Feb 2022 14:54:53 +0000 Message-Id: <20220222145456.9956-3-seiden@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222145456.9956-1-seiden@linux.ibm.com> References: <20220222145456.9956-1-seiden@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 35S3gXlq1d7OpR385bKsWLBjogRaK-eH X-Proofpoint-ORIG-GUID: H9vbIHNxEhz-Y_jrFRHhlEEpMkgKQoGg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-22_03,2022-02-21_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202220091 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Some tests need the information provided by the QUI UVC and lib/s390x/uv.c already has cached the qui result. Let's add a function to avoid unnecessary QUI UVCs. Signed-off-by: Steffen Eiden Reviewed-by: Claudio Imbrenda Reviewed-by: Janosch Frank --- lib/s390x/uv.c | 8 ++++++++ lib/s390x/uv.h | 1 + 2 files changed, 9 insertions(+) diff --git a/lib/s390x/uv.c b/lib/s390x/uv.c index 6fe11dff..602cbbfc 100644 --- a/lib/s390x/uv.c +++ b/lib/s390x/uv.c @@ -47,6 +47,14 @@ bool uv_query_test_call(unsigned int nr) return test_bit_inv(nr, uvcb_qui.inst_calls_list); } +const struct uv_cb_qui *uv_get_query_data(void) +{ + /* Query needs to be called first */ + assert(uvcb_qui.header.rc); + + return &uvcb_qui; +} + int uv_setup(void) { if (!test_facility(158)) diff --git a/lib/s390x/uv.h b/lib/s390x/uv.h index 8175d9c6..44264861 100644 --- a/lib/s390x/uv.h +++ b/lib/s390x/uv.h @@ -8,6 +8,7 @@ bool uv_os_is_guest(void); bool uv_os_is_host(void); bool uv_query_test_call(unsigned int nr); +const struct uv_cb_qui *uv_get_query_data(void); void uv_init(void); int uv_setup(void); void uv_create_guest(struct vm *vm); From patchwork Tue Feb 22 14:54:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Eiden X-Patchwork-Id: 12755269 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9DB1C433EF for ; Tue, 22 Feb 2022 14:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232973AbiBVOzf (ORCPT ); Tue, 22 Feb 2022 09:55:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232969AbiBVOze (ORCPT ); Tue, 22 Feb 2022 09:55:34 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90E2F10C527; Tue, 22 Feb 2022 06:55:08 -0800 (PST) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21MDhWdI024872; Tue, 22 Feb 2022 14:55:08 GMT 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=ayq88onlxV92hKR0dP6eKjRmjM6rdQBMYSPSToOWGd4=; b=PLfwY3fwkdA5BXIeyxG2P4B0nJ3srPGjaUclgy/DfUd04ireULmW1yUFnzPJtEvrlTjW 0BzE9ZZwJ2ddK9MGbMpy678DZpsiS6nwzykPVYdo0CjYy8r/BG9LHQpKxX1QeiQH7yZ3 Z2kb03/xvmzk0ACBSQCB7rmiCfNYvJY0GMOF9hySwSlgXYmRqyXNEI/k6nctDJSUAGVJ LSfKCei9/E33j0DEQBqPIqmFi5IrJfglPIBBESqdYeWrvEH8EJArMvIQtZ5esUSSxObI 2vryWFicp0rMKOnUoNTtcUjJDb7uqGADyJmdHVyYAvfd+FGM97cltOE5UQoe1THxHt+Q IQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ecyn9v20y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:08 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21MEMOA0005388; Tue, 22 Feb 2022 14:55:07 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ecyn9v1yx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:07 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21MEhdMW010539; Tue, 22 Feb 2022 14:55:05 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma04ams.nl.ibm.com with ESMTP id 3ear693pu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:05 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21MEt2xE59179448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Feb 2022 14:55:02 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 51DD1A4060; Tue, 22 Feb 2022 14:55:02 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 24957A405F; Tue, 22 Feb 2022 14:55:01 +0000 (GMT) Received: from linux7.. (unknown [9.114.12.92]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 22 Feb 2022 14:55:00 +0000 (GMT) From: Steffen Eiden To: Thomas Huth , Janosch Frank , Claudio Imbrenda , David Hildenbrand Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v3 3/5] s390x: uv-guest: remove duplicated checks Date: Tue, 22 Feb 2022 14:54:54 +0000 Message-Id: <20220222145456.9956-4-seiden@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222145456.9956-1-seiden@linux.ibm.com> References: <20220222145456.9956-1-seiden@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: _fUbV2enR6NEX8sq_K35ImbSMatpS-iM X-Proofpoint-ORIG-GUID: XqMg0wbUf1gmce9JNLqb88124dIs7hO- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-22_03,2022-02-21_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 bulkscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 mlxscore=0 phishscore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202220091 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Removing some tests which are done at other points in the code implicitly. In lib/s390x/uc.c#setup_uv(void) the rc of the qui result is verified using asserts. The whole test is fenced by lib/s390x/uc.c#uv_os_is_guest(void) that checks if SET and REMOVE SHARED is present. Signed-off-by: Steffen Eiden Reviewed-by: Janosch Frank --- s390x/uv-guest.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c index 99120cae..728c60aa 100644 --- a/s390x/uv-guest.c +++ b/s390x/uv-guest.c @@ -69,23 +69,15 @@ static void test_query(void) 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 && uvcb.header.rc == UVC_RC_EXECUTED) || - (cc == 1 && uvcb.header.rc == 0x100), - "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. + * BIT_UVC_CMD_QUI, BIT_UVC_CMD_SET_SHARED_ACCESS and + * BIT_UVC_CMD_REMOVE_SHARED_ACCESS are always present as they + * have been introduced with the first Ultravisor version. + * However, we only need to check for QUI as + * SET/REMOVE SHARED are used to fence this test to be only + * executed by protected guests. */ - report(test_bit_inv(BIT_UVC_CMD_QUI, &uvcb.inst_calls_list[0]), - "query indicated"); - report(test_bit_inv(BIT_UVC_CMD_SET_SHARED_ACCESS, &uvcb.inst_calls_list[0]), - "share indicated"); - report(test_bit_inv(BIT_UVC_CMD_REMOVE_SHARED_ACCESS, &uvcb.inst_calls_list[0]), - "unshare indicated"); + report(uv_query_test_call(BIT_UVC_CMD_QUI), "query indicated"); report_prefix_pop(); } From patchwork Tue Feb 22 14:54:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Eiden X-Patchwork-Id: 12755270 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B4AEC433F5 for ; Tue, 22 Feb 2022 14:55:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbiBVOzg (ORCPT ); Tue, 22 Feb 2022 09:55:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232972AbiBVOzf (ORCPT ); Tue, 22 Feb 2022 09:55:35 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33CDC10C513; Tue, 22 Feb 2022 06:55:10 -0800 (PST) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21MEhqrZ000330; Tue, 22 Feb 2022 14:55:10 GMT 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=btGRwvF7AFlYnTVHmc0uCAheHymyGzGwFIweOZtQICQ=; b=BpQ37i59s6tGM3caDRrVEuIl4ueTF6vbkGiXy+gTiEFC4RqmTEPFhkd6Jif3/hZ+ocLf zmNBvBAKTlUA9YOhS+Xj1ZEn6h4fts4VMfr5y3NoUqwnbflG2zQWXkNK0ftHoFoySIII ssXIvurD1lX/gyTfWetMht1xmPoo9Re2emFFerkxhUPKFdnWymXxyN6IkzRBS2FxKGRQ tbxuJ9k7BbGDD0rXFi5sBqoTzcDSDtlyocy1A0c8ZgY/046trHcOFpMyI4Eh3T5xXMsH KyNPF88wW2B/EsiFoyypRhYdgLU6pbxRTv0wUrh8xrZ8uw9Us1mSMX08fwGIWf0tVTbS jw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ed1dj8u4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:09 +0000 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21MEkcK4017163; Tue, 22 Feb 2022 14:55:09 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ed1dj8u3k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:09 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21MEhWHc018828; Tue, 22 Feb 2022 14:55:07 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 3ear693qns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:07 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21MEt3Wt56099124 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Feb 2022 14:55:03 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CC8BFA4065; Tue, 22 Feb 2022 14:55:03 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 96B88A405F; Tue, 22 Feb 2022 14:55:02 +0000 (GMT) Received: from linux7.. (unknown [9.114.12.92]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 22 Feb 2022 14:55:02 +0000 (GMT) From: Steffen Eiden To: Thomas Huth , Janosch Frank , Claudio Imbrenda , David Hildenbrand Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v3 4/5] s390x: uv-guest: add share bit test Date: Tue, 22 Feb 2022 14:54:55 +0000 Message-Id: <20220222145456.9956-5-seiden@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222145456.9956-1-seiden@linux.ibm.com> References: <20220222145456.9956-1-seiden@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: m9WkwSMBIExHV7-WTIV7nbo1sqDkYW_l X-Proofpoint-ORIG-GUID: MBdAFwdr1_TqfdCcziAqej7iGjDcMYjC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-22_03,2022-02-21_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202220091 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The UV facility bits shared/unshared must both be set or none. Signed-off-by: Steffen Eiden Reviewed-by: Claudio Imbrenda Reviewed-by: Janosch Frank --- s390x/uv-guest.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c index 728c60aa..77057bd2 100644 --- a/s390x/uv-guest.c +++ b/s390x/uv-guest.c @@ -159,6 +159,14 @@ static void test_invalid(void) report_prefix_pop(); } +static void test_share_bits(void) +{ + bool unshare = uv_query_test_call(BIT_UVC_CMD_REMOVE_SHARED_ACCESS); + bool share = uv_query_test_call(BIT_UVC_CMD_SET_SHARED_ACCESS); + + report(!(share ^ unshare), "share bits"); +} + int main(void) { bool has_uvc = test_facility(158); @@ -169,6 +177,12 @@ int main(void) goto done; } + /* + * Needs to be done before the guest-fence, + * as the fence tests if both shared bits are present + */ + test_share_bits(); + if (!uv_os_is_guest()) { report_skip("Not a protected guest"); goto done; From patchwork Tue Feb 22 14:54:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Eiden X-Patchwork-Id: 12755271 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BF72C433F5 for ; Tue, 22 Feb 2022 14:55:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232987AbiBVOzi (ORCPT ); Tue, 22 Feb 2022 09:55:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232969AbiBVOzh (ORCPT ); Tue, 22 Feb 2022 09:55:37 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CDAE10C52E; Tue, 22 Feb 2022 06:55:11 -0800 (PST) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21MDi5lc029849; Tue, 22 Feb 2022 14:55:10 GMT 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=92iJyNuF+Ym9VokFFCdNXi3MYQdquI9c0lcWpZl2Bv8=; b=FgehloX/557uvTVegDMe+/UwyO820BkIcAJbfB6pK4VkN0Zwvyd2xPvA9XGi3EyAIptB X2GwFcpubunNLtfNb9Fxkhdc6vz/VFSq6RefRzsffGsINB9NE2ntXQ5/ScvVSFQxb0hn Nc142LnUSVF9tJoDGpDVuMwCCSO/FG21D4tHWzqWqLSV6Feo0YbEpBwUAzaPptaTfkXp Vv/xthBxf5cRlTbS9IocyVKOJiWTc+9ocDp6zkg0Qoi0zWEALfM4bJLy6G7qDW0Haya0 v4egKodVHDjPPP2DVqgUgrnuz66ZvOG99RGhjc1nySsITf28Sy2EUEtmn6WEaYIgjcL8 EQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ed0yh9tah-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:10 +0000 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21MEiaJm027399; Tue, 22 Feb 2022 14:55:10 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ed0yh9t9u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:10 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21MEh7dS006090; Tue, 22 Feb 2022 14:55:08 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma05fra.de.ibm.com with ESMTP id 3ear69ae4p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 14:55:08 +0000 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 21MEt5jA27460006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Feb 2022 14:55:05 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5C8B9A405B; Tue, 22 Feb 2022 14:55:05 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 171D1A4068; Tue, 22 Feb 2022 14:55:04 +0000 (GMT) Received: from linux7.. (unknown [9.114.12.92]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 22 Feb 2022 14:55:03 +0000 (GMT) From: Steffen Eiden To: Thomas Huth , Janosch Frank , Claudio Imbrenda , David Hildenbrand Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v3 5/5] s390x: uv-guest: Add attestation tests Date: Tue, 22 Feb 2022 14:54:56 +0000 Message-Id: <20220222145456.9956-6-seiden@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222145456.9956-1-seiden@linux.ibm.com> References: <20220222145456.9956-1-seiden@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 354OVdo2FIzHOdQ1GCjBU0Kc5yQY1WvH X-Proofpoint-GUID: _v4iap-M6Yc8MzOrFZu97KdlIOPsokTg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-22_03,2022-02-21_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxlogscore=999 lowpriorityscore=0 suspectscore=0 adultscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202220091 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Adds several tests to verify correct error paths of attestation. Signed-off-by: Steffen Eiden --- lib/s390x/asm/uv.h | 5 +- s390x/uv-guest.c | 193 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 196 insertions(+), 2 deletions(-) diff --git a/lib/s390x/asm/uv.h b/lib/s390x/asm/uv.h index c330c0f8..e5f7aa72 100644 --- a/lib/s390x/asm/uv.h +++ b/lib/s390x/asm/uv.h @@ -108,7 +108,10 @@ struct uv_cb_qui { u8 reserved88[158 - 136]; /* 0x0088 */ uint16_t max_guest_cpus; /* 0x009e */ u64 uv_feature_indications; /* 0x00a0 */ - u8 reserveda8[200 - 168]; /* 0x00a8 */ + uint8_t reserveda8[224 - 168]; /* 0x00a8 */ + uint64_t supp_att_hdr_ver; /* 0x00e0 */ + uint64_t supp_paf; /* 0x00e8 */ + uint8_t reservedf0[256 - 240]; /* 0x00f0 */ } __attribute__((packed)) __attribute__((aligned(8))); struct uv_cb_cgc { diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c index 77057bd2..77edbba2 100644 --- a/s390x/uv-guest.c +++ b/s390x/uv-guest.c @@ -2,10 +2,11 @@ /* * Guest Ultravisor Call tests * - * Copyright (c) 2020 IBM Corp + * Copyright IBM Corp. 2020, 2022 * * Authors: * Janosch Frank + * Steffen Eiden */ #include @@ -53,6 +54,15 @@ static void test_priv(void) check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); report_prefix_pop(); + report_prefix_push("attest"); + uvcb.cmd = UVC_CMD_ATTESTATION; + uvcb.len = sizeof(struct uv_cb_attest); + expect_pgm_int(); + enter_pstate(); + uv_call_once(0, (uint64_t)&uvcb); + check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION); + report_prefix_pop(); + report_prefix_pop(); } @@ -111,7 +121,187 @@ static void test_sharing(void) cc = uv_call(0, (u64)&uvcb); report(cc == 0 && uvcb.header.rc == UVC_RC_EXECUTED, "unshare"); report_prefix_pop(); +} + +#define ARCB_VERSION_NONE 0 +#define ARCB_VERSION_1 0x0100 +#define ARCB_MEAS_NONE 0 +#define ARCB_MEAS_HMAC_SHA512 1 +#define MEASUREMENT_SIZE_HMAC_SHA512 64 +#define PAF_PHKH_ATT (1ULL << 61) +#define ADDITIONAL_SIZE_PAF_PHKH_ATT 32 +/* arcb with one key slot and no nonce */ +struct uv_arcb_v1 { + uint64_t reserved0; /* 0x0000 */ + uint32_t req_ver; /* 0x0008 */ + uint32_t req_len; /* 0x000c */ + uint8_t iv[12]; /* 0x0010 */ + uint32_t reserved1c; /* 0x001c */ + uint8_t reserved20[7]; /* 0x0020 */ + uint8_t nks; /* 0x0027 */ + uint32_t reserved28; /* 0x0028 */ + uint32_t sea; /* 0x002c */ + uint64_t plaint_att_flags; /* 0x0030 */ + uint32_t meas_alg_id; /* 0x0038 */ + uint32_t reserved3c; /* 0x003c */ + uint8_t cpk[160]; /* 0x0040 */ + uint8_t key_slot[80]; /* 0x00e0 */ + uint8_t meas_key[64]; /* 0x0130 */ + uint8_t tag[16]; /* 0x0170 */ +} __attribute__((packed)); + +struct attest_request_v1 { + struct uv_arcb_v1 arcb; + uint8_t measurement[MEASUREMENT_SIZE_HMAC_SHA512]; + uint8_t additional[ADDITIONAL_SIZE_PAF_PHKH_ATT]; +}; + +static void test_attest_v1(u64 supported_paf) +{ + struct uv_cb_attest uvcb = { + .header.cmd = UVC_CMD_ATTESTATION, + .header.len = sizeof(uvcb), + }; + struct attest_request_v1 *attest_req = (void *)page; + struct uv_arcb_v1 *arcb = &attest_req->arcb; + int cc; + + memset((void *)page, 0, PAGE_SIZE); + + /* + * Create a minimal arcb/uvcb such that FW has everything to start + * unsealing the request. However, this unsealing will fail as the + * kvm-unit-test framework provides no cryptography functions that + * would be needed to seal such requests. + */ + arcb->req_ver = ARCB_VERSION_1; + arcb->req_len = sizeof(*arcb); + arcb->nks = 1; + arcb->sea = sizeof(arcb->meas_key); + arcb->plaint_att_flags = PAF_PHKH_ATT; + arcb->meas_alg_id = ARCB_MEAS_HMAC_SHA512; + uvcb.arcb_addr = (uint64_t)&attest_req->arcb; + uvcb.measurement_address = (uint64_t)attest_req->measurement; + uvcb.measurement_length = sizeof(attest_req->measurement); + uvcb.add_data_address = (uint64_t)attest_req->additional; + uvcb.add_data_length = sizeof(attest_req->additional); + + uvcb.continuation_token = 0xff; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0101, "invalid continuation token"); + uvcb.continuation_token = 0; + + uvcb.user_data_length = sizeof(uvcb.user_data) + 1; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0102, "invalid user data size"); + uvcb.user_data_length = 0; + + uvcb.arcb_addr = get_ram_size() + PAGE_SIZE; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0103, "invalid address arcb"); + uvcb.arcb_addr = page; + + /* 0104 - 0105 need an unseal-able request */ + + arcb->req_ver = ARCB_VERSION_NONE; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0106, "unsupported version"); + arcb->req_ver = ARCB_VERSION_1; + + arcb->req_len += 1; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0107, "invalid arcb size 1"); + arcb->req_len -= 1; + + /* + * The arcb needs to grow as well if number of key slots (nks) + * is increased. However, this is not the case and there is no explicit + * 'too many/less nks for that arcb size' error code -> expect 0x0107 + */ + arcb->nks = 2; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0107, "invalid arcb size 2"); + arcb->nks = 1; + + arcb->nks = 0; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0108, "invalid num key slots"); + arcb->nks = 1; + + /* + * Possible valid size (when using nonce). + * However, req_len too small to host a nonce + */ + arcb->sea = 80; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0109, "invalid encrypted size 1"); + arcb->sea = 17; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x0109, "invalid encrypted size 2"); + arcb->sea = 64; + + arcb->plaint_att_flags = supported_paf ^ GENMASK_ULL(63, 0); + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x010a, "invalid flag"); + arcb->plaint_att_flags = PAF_PHKH_ATT; + + arcb->meas_alg_id = ARCB_MEAS_NONE; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x010b, "invalid measurement algorithm"); + arcb->meas_alg_id = ARCB_MEAS_HMAC_SHA512; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x010c, "unable unseal"); + + uvcb.measurement_length = 0; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x010d, "invalid measurement size"); + uvcb.measurement_length = sizeof(attest_req->measurement); + + uvcb.add_data_length = 0; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc == 1 && uvcb.header.rc == 0x010e, "invalid additional size"); + uvcb.add_data_length = sizeof(attest_req->additional); +} + +static void test_attest(void) +{ + struct uv_cb_attest uvcb = { + .header.cmd = UVC_CMD_ATTESTATION, + .header.len = sizeof(uvcb), + }; + const struct uv_cb_qui *uvcb_qui = uv_get_query_data(); + int cc; + + report_prefix_push("attest"); + + if (!uv_query_test_call(BIT_UVC_CMD_ATTESTATION)) { + report_skip("Attestation not supported."); + goto done; + } + + /* Verify that the UV supports at least one header version */ + report(uvcb_qui->supp_att_hdr_ver, "has hdr support"); + + memset((void *)page, 0, PAGE_SIZE); + + uvcb.header.len -= 1; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc && uvcb.header.rc == UVC_RC_INV_LEN, "invalid uvcb size 1"); + uvcb.header.len += 1; + + uvcb.header.len += 1; + cc = uv_call(0, (uint64_t)&uvcb); + report(cc && uvcb.header.rc == UVC_RC_INV_LEN, "invalid uvcb size 2"); + uvcb.header.len -= 1; + + report_prefix_push("v1"); + if (test_bit_inv(0, &uvcb_qui->supp_att_hdr_ver)) + test_attest_v1(uvcb_qui->supp_paf); + else + report_skip("Attestation version 1 not supported"); + report_prefix_pop(); +done: report_prefix_pop(); } @@ -193,6 +383,7 @@ int main(void) test_invalid(); test_query(); test_sharing(); + test_attest(); free_page((void *)page); done: report_prefix_pop();