Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp5935958ybi; Wed, 12 Jun 2019 11:00:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqxnZzABGpS7ZG0GCg9f3Q8iJqkQyWRsG1cXOAgCQ53JFkziW9IXeOYwG0S3r73iAMiI/2po X-Received: by 2002:a62:770e:: with SMTP id s14mr56164394pfc.150.1560362441091; Wed, 12 Jun 2019 11:00:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560362441; cv=none; d=google.com; s=arc-20160816; b=bFtlgiUp7t44mCbPiOp7sGONw7Jlv0Pis7A0goFnHK2dW60MEamoIEvaG2wARoLJmD 4X6BuY41Kw6GxTvrlg315YYYm+CjtkUlCyTrpbFKaJqjWZtCxhtcFtynRQl1UDNGQjol 1epmBMApp+wQmsV7j8sIpuba8sVZntpAPQ5wJUbjbfa0tnJLu3HP4OXDC/dB8Mb8FQi9 GyZjbQlMq9+dg06MjL1bjGEA4DeNkFK6UJ8dzjWsIlcJ0+xp50TrJIJUXz8tI5KsNuaS Ee2/amlTVlbEet67RRJXDZ8lzx1TjiuMceuCpGdDjpFdZiakug6UxZjbe0EUSUyneZgz ug9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :from:references:cc:to:subject; bh=j47vNZ6aUhHtlCp+2zjzLLgw0aeGcTr9aYdqJcQuiAU=; b=Kb/LiJ1d5q4Lx8n9kT827jAjjW1OJX5h423Irq9La8M9U60kRK9A9cr8IjWXPEcRQE 6Hag1nBFCow7D/ZEyVNIjIdCjac5YeCcOoOLt5bJkvTiwqZHADTp+AqFVff5zDfXXUQS ME3hMI77mlu0/0zhVOtEsMt4VMEyvaq8aELbfZaiM5g+XPE56ZRZ9BC2ZDYj2Gxyn+oT 1nw8h1cvMUxDLc+7C4b0Gd7UkNU6v6fVJduzi1Hsa3SM0Z6YhyFOHHLx46inrUTJUD6i c6wsrNw52OSL/xPE0k01KMMBDC/JGfO82ElXiTJHErUAtSqcqR7leT3zmGqy6DOKeO6v UI/w== 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 u67si385746pfu.154.2019.06.12.11.00.26; Wed, 12 Jun 2019 11:00:41 -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 S2409206AbfFLN4G (ORCPT + 99 others); Wed, 12 Jun 2019 09:56:06 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40342 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2407368AbfFLN4G (ORCPT ); Wed, 12 Jun 2019 09:56:06 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5CDh1oK007953 for ; Wed, 12 Jun 2019 09:56:04 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2t31mruhau-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Jun 2019 09:56:03 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Jun 2019 14:55:55 +0100 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 12 Jun 2019 14:55:52 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x5CDtgP838142208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Jun 2019 13:55:42 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B89A842042; Wed, 12 Jun 2019 13:55:49 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B621F42045; Wed, 12 Jun 2019 13:55:48 +0000 (GMT) Received: from [10.0.2.15] (unknown [9.145.62.239]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 12 Jun 2019 13:55:48 +0000 (GMT) Subject: Re: [PATCH v9 1/4] s390: ap: kvm: add PQAP interception for AQIC To: Pierre Morel , borntraeger@de.ibm.com Cc: alex.williamson@redhat.com, cohuck@redhat.com, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, frankja@linux.ibm.com, akrowiak@linux.ibm.com, pasic@linux.ibm.com, david@redhat.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, mimu@linux.ibm.com References: <1558452877-27822-1-git-send-email-pmorel@linux.ibm.com> <1558452877-27822-2-git-send-email-pmorel@linux.ibm.com> From: Harald Freudenberger Date: Wed, 12 Jun 2019 15:55:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <1558452877-27822-2-git-send-email-pmorel@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 x-cbid: 19061213-0028-0000-0000-00000379AB1F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19061213-0029-0000-0000-000024399FF0 Message-Id: <38d366f0-a7f9-fd59-c45a-969ef16750bf@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-06-12_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906120093 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21.05.19 17:34, Pierre Morel wrote: > We prepare the interception of the PQAP/AQIC instruction for > the case the AQIC facility is enabled in the guest. > > First of all we do not want to change existing behavior when > intercepting AP instructions without the SIE allowing the guest > to use AP instructions. > > In this patch we only handle the AQIC interception allowed by > facility 65 which will be enabled when the complete interception > infrastructure will be present. > > We add a callback inside the KVM arch structure for s390 for > a VFIO driver to handle a specific response to the PQAP > instruction with the AQIC command and only this command. > > But we want to be able to return a correct answer to the guest > even there is no VFIO AP driver in the kernel. > Therefor, we inject the correct exceptions from inside KVM for the > case the callback is not initialized, which happens when the vfio_ap > driver is not loaded. > > We do consider the responsability of the driver to always initialize > the PQAP callback if it defines queues by initializing the CRYCB for > a guest. > If the callback has been setup we call it. > If not we setup an answer considering that no queue is available > for the guest when no callback has been setup. > > Signed-off-by: Pierre Morel > Reviewed-by: Tony Krowiak > --- > arch/s390/include/asm/kvm_host.h | 7 +++ > arch/s390/kvm/priv.c | 86 +++++++++++++++++++++++++++++++++++ > drivers/s390/crypto/vfio_ap_private.h | 2 + > 3 files changed, 95 insertions(+) > > diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h > index faa7ebf..a0fc2f1 100644 > --- a/arch/s390/include/asm/kvm_host.h > +++ b/arch/s390/include/asm/kvm_host.h > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -723,8 +724,14 @@ struct kvm_s390_cpu_model { > unsigned short ibc; > }; > > +struct kvm_s390_module_hook { > + int (*hook)(struct kvm_vcpu *vcpu); > + struct module *owner; > +}; > + > struct kvm_s390_crypto { > struct kvm_s390_crypto_cb *crycb; > + struct kvm_s390_module_hook *pqap_hook; > __u32 crycbd; > __u8 aes_kw; > __u8 dea_kw; > diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c > index 8679bd7..ed52ffa 100644 > --- a/arch/s390/kvm/priv.c > +++ b/arch/s390/kvm/priv.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #include "gaccess.h" > #include "kvm-s390.h" > #include "trace.h" > @@ -592,6 +593,89 @@ static int handle_io_inst(struct kvm_vcpu *vcpu) > } > } > > +/* > + * handle_pqap: Handling pqap interception > + * @vcpu: the vcpu having issue the pqap instruction > + * > + * We now support PQAP/AQIC instructions and we need to correctly > + * answer the guest even if no dedicated driver's hook is available. > + * > + * The intercepting code calls a dedicated callback for this instruction > + * if a driver did register one in the CRYPTO satellite of the > + * SIE block. > + * > + * If no callback is available, the queues are not available, return this > + * response code to the caller and set CC to 3. > + * Else return the response code returned by the callback. > + */ > +static int handle_pqap(struct kvm_vcpu *vcpu) > +{ > + struct ap_queue_status status = {}; > + unsigned long reg0; > + int ret; > + uint8_t fc; > + > + /* Verify that the AP instruction are available */ > + if (!ap_instructions_available()) > + return -EOPNOTSUPP; > + /* Verify that the guest is allowed to use AP instructions */ > + if (!(vcpu->arch.sie_block->eca & ECA_APIE)) > + return -EOPNOTSUPP; > + /* > + * The only possibly intercepted functions when AP instructions are > + * available for the guest are AQIC and TAPQ with the t bit set > + * since we do not set IC.3 (FIII) we currently will only intercept > + * the AQIC function code. > + */ > + reg0 = vcpu->run->s.regs.gprs[0]; > + fc = (reg0 >> 24) & 0xff; > + if (WARN_ON_ONCE(fc != 0x03)) > + return -EOPNOTSUPP; > + > + /* PQAP instruction is allowed for guest kernel only */ > + if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) > + return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); > + > + /* Common PQAP instruction specification exceptions */ > + /* bits 41-47 must all be zeros */ > + if (reg0 & 0x007f0000UL) > + return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); > + /* APFT not install and T bit set */ > + if (!test_kvm_facility(vcpu->kvm, 15) && (reg0 & 0x00800000UL)) > + return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); > + /* APXA not installed and APID greater 64 or APQI greater 16 */ > + if (!(vcpu->kvm->arch.crypto.crycbd & 0x02) && (reg0 & 0x0000c0f0UL)) > + return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); > + > + /* AQIC function code specific exception */ > + /* facility 65 not present for AQIC function code */ > + if (!test_kvm_facility(vcpu->kvm, 65)) > + return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); > + > + /* > + * Verify that the hook callback is registered, lock the owner > + * and call the hook. > + */ > + if (vcpu->kvm->arch.crypto.pqap_hook) { > + if (!try_module_get(vcpu->kvm->arch.crypto.pqap_hook->owner)) > + return -EOPNOTSUPP; > + ret = vcpu->kvm->arch.crypto.pqap_hook->hook(vcpu); > + module_put(vcpu->kvm->arch.crypto.pqap_hook->owner); > + if (!ret && vcpu->run->s.regs.gprs[1] & 0x00ff0000) > + kvm_s390_set_psw_cc(vcpu, 3); > + return ret; > + } > + /* > + * A vfio_driver must register a hook. > + * No hook means no driver to enable the SIE CRYCB and no queues. > + * We send this response to the guest. > + */ > + status.response_code = 0x01; > + memcpy(&vcpu->run->s.regs.gprs[1], &status, sizeof(status)); > + kvm_s390_set_psw_cc(vcpu, 3); > + return 0; > +} > + > static int handle_stfl(struct kvm_vcpu *vcpu) > { > int rc; > @@ -878,6 +962,8 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu) > return handle_sthyi(vcpu); > case 0x7d: > return handle_stsi(vcpu); > + case 0xaf: > + return handle_pqap(vcpu); > case 0xb1: > return handle_stfl(vcpu); > case 0xb2: > diff --git a/drivers/s390/crypto/vfio_ap_private.h b/drivers/s390/crypto/vfio_ap_private.h > index 76b7f98..a910be1 100644 > --- a/drivers/s390/crypto/vfio_ap_private.h > +++ b/drivers/s390/crypto/vfio_ap_private.h > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include "ap_bus.h" > > @@ -81,6 +82,7 @@ struct ap_matrix_mdev { > struct ap_matrix matrix; > struct notifier_block group_notifier; > struct kvm *kvm; > + struct kvm_s390_module_hook pqap_hook; > }; > > extern int vfio_ap_mdev_register(void); acked-by: Harald Freudenberger