Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp633276imm; Wed, 22 Aug 2018 09:55:09 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwY10NInSU/7FKC8KWBmvQMdONbIw/RXZbHThm44GjVRLbF1e8+lb/8uTHFKeUU8oggz5GG X-Received: by 2002:a62:4808:: with SMTP id v8-v6mr58951084pfa.89.1534956909045; Wed, 22 Aug 2018 09:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534956909; cv=none; d=google.com; s=arc-20160816; b=uSY7EefZEWTyPnmUKlmkVA0rQgAtVialXADZqaE779xfmrF/3AqYAJfrFqgkzJvmSx wqJSuNWf35JGVQz1tBZ1FU0ZHYP7Zw9Ft/9DFHWIUAK9AgYnUqK9a1tX5ings6xhnOZC 2b/WcHCIRqtYjJNccIvJt+/h3hTwR+br5uzkkssJdnzKFzyI3tV+5mYjNnRRMpMTWBeI Wk5slcrAl5R5bNt2LML4w0CtZ0CS2Hagkk/QqfiNzmIjf5YyyQkQqP34dLF86inMrHcZ Q/FeEOeq3iSDnZ4IVA8z86ShNUNtIh/0r3mT628iFHSxaFH1/4oIHRruuUDVcaePKtnY gFzw== 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=5RX+xDb1cOeubC0nr1Jf61h593+vJw+EhXXnDPVVBI8=; b=xoBDSqifQvOAx2BUwUN2PhhWRwurhQD7exp6ErACAuA+lKPsf8yooDvjJ0GH5DaNRZ sh/49vwGU7Pj6pvrc2kXRlg4AAvdnfpJHX9LF31Tv/E20KDLwC6VdofYqUd1ynibbi2t TVguYUIhmPc5fNGaBybuElbC9EiNZr+aJEYXVg8LV+a6GL2jJx+US6gyN/EVN8hwigX0 zk1GkH2NfJYuDPwszf0Gtbk7+pPG6Gu51eLmzxwKodJ0vWTtwuqhrVWqUUwRrifjNaCm NekggE+5UGfxfxKT0susBV5IotTj9KqSRQWV0DNfZ11KO9+7eIhUVyY4gzE11oeFbULY wvRg== 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 y10-v6si1851695plr.86.2018.08.22.09.54.53; Wed, 22 Aug 2018 09:55:09 -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 S1727522AbeHVUSJ (ORCPT + 99 others); Wed, 22 Aug 2018 16:18:09 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:40816 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727353AbeHVURq (ORCPT ); Wed, 22 Aug 2018 16:17:46 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w7MGmhqm086950 for ; Wed, 22 Aug 2018 12:52:07 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2m19uywsxe-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Aug 2018 12:52:07 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Aug 2018 17:52:04 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) 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:02 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w7MGq1eO29229184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 22 Aug 2018 16:52:01 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BB724AE04D; Wed, 22 Aug 2018 19:51:38 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 68A73AE051; Wed, 22 Aug 2018 19:51:38 +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:38 +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 2/5] KVM: s390: vsie: Only accept FORMAT1 CRYCB for guest2 Date: Wed, 22 Aug 2018 18:51:54 +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-0012-0000-0000-0000029D3F4C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18082216-0013-0000-0000-000020D083A3 Message-Id: <1534956717-14087-3-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=768 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 As the comment above the function suggested the shadowing of the guest2 CRYCB can only accept a format 1 since AP instructions are not supported in the guest. Let's modify the check which allowed to accept a format 2 too. Signed-off-by: Pierre Morel --- arch/s390/kvm/vsie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 12b9707..56a9d47 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -156,7 +156,9 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) u8 ecb3_flags; scb_s->crycbd = 0; - if (!(crycbd_o & vcpu->arch.sie_block->crycbd & CRYCB_FORMAT1)) + if (!(crycbd_o == CRYCB_FORMAT1)) + return 0; + if (!(vcpu->arch.sie_block->crycbd & CRYCB_FORMAT1)) return 0; /* format-1 is supported with message-security-assist extension 3 */ if (!test_kvm_facility(vcpu->kvm, 76)) -- 2.7.4