Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp631974imm; Wed, 22 Aug 2018 09:53:37 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZOCak5yX654YzWGKGyEIikYaV+HpIh/khIET/AAT2s6VT99TE3hA9NzZikmc2U/tt621Hh X-Received: by 2002:a62:57dc:: with SMTP id i89-v6mr2416618pfj.45.1534956817055; Wed, 22 Aug 2018 09:53:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534956817; cv=none; d=google.com; s=arc-20160816; b=Tuu/6sYN06s7mUrbqMB976VsRNsWHv+r1APjRkWukA+0YM3/iFkJj5kbFV2Nhz+qvi HHBAagwEr9LR2ImErVyCCWHhmdauM4nnZw41pdFZumKMob+B0gy6KRiWBBXu3Zt1opyG UVHC5ZuJx6ZvFV6ZG2k/HspwGHAIypjzPqOAkWvb1MupGxR903Ahz01Y++r7v39qBWfW LbWg+iRRvUs+xSeQFfJz32bnJ6CADJGHS1F/8VxxP2Fo76PqCPMASRcszVBvrQIAvrs+ Oi6URZarcH9987+RM4BzEHC8bXPimKILjhk92BI6iPGHvyhGMzdA9lsNYiahiTCLplgO P+6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from:arc-authentication-results; bh=qcWnwy8Dry19Et+ApS9FtHf96CFhDU5flv1+CpKW6Cg=; b=rk2IEojXXDCGwctZeEtWg66QbC3KAYpDJy4siQ6a59fmU5HTSRid0GQLYV7CtCSaey jDvPZWmeGVQ9C+7+d3cMyLk6JyHz0eACgvFSj6R5C5nMk/HMi8FaelsYb386IwYD92bE t+i9i5z5FZXDd4mKMVs8d2eAGUM8Ympi2FOaA0GJCVUnyX7pW+/eymC6+wVg3e/9t80l Pd+7uYuNbs4PyfCAhbbAPcKH/xxBuNZi1M+RnfdTKhgMzAmStktNhzOzgxZp53m8AL5K 0swkB1g8Pxgw7W5ML9cozJuvat/TS9dQc0ksQXnzw5sn1eee2rHY/b/8O83DXlVoZok5 bzBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y15-v6si2114707pgl.15.2018.08.22.09.53.22; Wed, 22 Aug 2018 09:53:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727490AbeHVURw (ORCPT + 99 others); Wed, 22 Aug 2018 16:17:52 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43994 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727363AbeHVURv (ORCPT ); Wed, 22 Aug 2018 16:17:51 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w7MGmgnG016075 for ; Wed, 22 Aug 2018 12:52:12 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2m1b7b19nf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Aug 2018 12:52:12 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Aug 2018 17:52:10 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 22 Aug 2018 17:52:06 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w7MGq55c43778142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 22 Aug 2018 16:52:05 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5B96AE056; Wed, 22 Aug 2018 19:51:42 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9268EAE051; Wed, 22 Aug 2018 19:51:42 +0100 (BST) Received: from morel-ThinkPad-W530.boeblingen.de.ibm.com (unknown [9.152.224.111]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 22 Aug 2018 19:51:42 +0100 (BST) From: Pierre Morel To: david@redhat.com Cc: linux-kernel@vger.kernel.org, cohuck@redhat.com, linux-s390@vger.kernel.org, kvm@vger.kernel.org, frankja@linux.ibm.com, akrowiak@linux.ibm.com, borntraeger@de.ibm.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com Subject: [PATCH v2 5/5] KVM: s390: vsie: Do the CRYCB validation first Date: Wed, 22 Aug 2018 18:51:57 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534956717-14087-1-git-send-email-pmorel@linux.ibm.com> References: <1534956717-14087-1-git-send-email-pmorel@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18082216-0020-0000-0000-000002BA42AD X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18082216-0021-0000-0000-000021079A1F Message-Id: <1534956717-14087-6-git-send-email-pmorel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-22_08:,, 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=864 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808220169 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When entering the SIE the CRYCB validation better be done independently of the instruction's availability. Signed-off-by: Pierre Morel --- arch/s390/kvm/vsie.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 7ee4329..fca25aa 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -164,17 +164,18 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) /* format-1 is supported with message-security-assist extension 3 */ if (!test_kvm_facility(vcpu->kvm, 76)) return 0; - /* we may only allow it if enabled for guest 2 */ - ecb3_flags = scb_o->ecb3 & vcpu->arch.sie_block->ecb3 & - (ECB3_AES | ECB3_DEA); - if (!ecb3_flags) - return 0; if ((crycb_addr & PAGE_MASK) != ((crycb_addr + 128) & PAGE_MASK)) return set_validity_icpt(scb_s, 0x003CU); if (!crycb_addr) return set_validity_icpt(scb_s, 0x0039U); + /* we may only allow it if enabled for guest 2 */ + ecb3_flags = scb_o->ecb3 & vcpu->arch.sie_block->ecb3 & + (ECB3_AES | ECB3_DEA); + if (!ecb3_flags) + return 0; + /* copy only the wrapping keys */ if (read_guest_real(vcpu, crycb_addr + 72, vsie_page->crycb.dea_wrapping_key_mask, 56)) -- 2.7.4