From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753380AbdJMRkU (ORCPT ); Fri, 13 Oct 2017 13:40:20 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36220 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753239AbdJMRkJ (ORCPT ); Fri, 13 Oct 2017 13:40:09 -0400 From: Tony Krowiak To: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: freude@de.ibm.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, borntraeger@de.ibm.com, cohuck@redhat.com, kwankhede@nvidia.com, bjsdjshi@linux.vnet.ibm.com, pbonzini@redhat.com, alex.williamson@redhat.com, pmorel@linux.vnet.ibm.com, alifm@linux.vnet.ibm.com, mjrosato@linux.vnet.ibm.com, qemu-s390x@nongnu.org, jjherne@linux.vnet.ibm.com, thuth@redhat.com, pasic@linux.vnet.ibm.com, Tony Krowiak Subject: [RFC 13/19] s390/zcrypt: validate control domain assignment Date: Fri, 13 Oct 2017 13:38:58 -0400 X-Mailer: git-send-email 1.7.1 In-Reply-To: <1507916344-3896-1-git-send-email-akrowiak@linux.vnet.ibm.com> References: <1507916344-3896-1-git-send-email-akrowiak@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17101317-0040-0000-0000-000003B293AC X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007892; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000236; SDB=6.00930643; UDB=6.00468501; IPR=6.00710909; BA=6.00005636; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017529; XFM=3.00000015; UTC=2017-10-13 17:40:06 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17101317-0041-0000-0000-000007A79710 Message-Id: <1507916344-3896-14-git-send-email-akrowiak@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-10-13_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710130244 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The AP control domain being assigned to the mediated matrix driver must be assigned to the LPAR. Signed-off-by: Tony Krowiak --- drivers/s390/crypto/vfio_ap_matrix_ops.c | 33 ++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/drivers/s390/crypto/vfio_ap_matrix_ops.c b/drivers/s390/crypto/vfio_ap_matrix_ops.c index 2387916..10a006c 100644 --- a/drivers/s390/crypto/vfio_ap_matrix_ops.c +++ b/drivers/s390/crypto/vfio_ap_matrix_ops.c @@ -469,12 +469,41 @@ static ssize_t ap_matrix_domains_show(struct device *dev, static DEVICE_ATTR(domains, 0644, ap_matrix_domains_show, NULL); +static int +ap_matrix_validate_control_domains(struct ap_matrix_mdev *matrix_mdev, + unsigned long id) +{ + int ret; + struct ap_config_info config; + + memset(&config, 0, sizeof(config)); + + ret = ap_query_configuration(&config); + if (ret == -EOPNOTSUPP) + return 0; + + if (ret) { + pr_err("%s: query AP configuration failed with rc %d", + VFIO_AP_MATRIX_MODULE_NAME, ret); + return ret; + } + + if (!test_bit_inv(id, (unsigned long *)config.adm)) { + pr_err("%s: control domain %04lx is not installed on the lpar", + VFIO_AP_MATRIX_MODULE_NAME, id); + return -ENODEV; + } + + return 0; +} + static ssize_t ap_matrix_control_domain_assign(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { int ret; unsigned int id; + struct mdev_device *mdev = mdev_from_dev(dev); struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev); @@ -482,6 +511,10 @@ static ssize_t ap_matrix_control_domain_assign(struct device *dev, if (ret) return ret; + ret = ap_matrix_validate_control_domains(matrix_mdev, id); + if (ret) + return ret; + set_bit_inv((unsigned long)id, (unsigned long *)matrix_mdev->masks.adm); -- 1.7.1