From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753411AbdJMRnJ (ORCPT ); Fri, 13 Oct 2017 13:43:09 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41054 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153AbdJMRkF (ORCPT ); Fri, 13 Oct 2017 13:40:05 -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 09/19] s390/zcrypt: validate adapter assignment Date: Fri, 13 Oct 2017 13:38:54 -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-0052-0000-0000-000002719EDB 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.00930642; 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:02 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17101317-0053-0000-0000-0000524F723D Message-Id: <1507916344-3896-10-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 Each adapter assigned to the mediated matrix device must be validated to ensure that the adapter is accessible from one of the AP queues bound to the AP matrix device driver. Each AP queue bound to the matrix device is identified by its AP Queue Number (APQN). An APQN is comprised of an adapter ID (APID) and an AP queue index (APQI) which corresponds to a domain ID. Consequently, each adapter being assigned will be validated as follows: * If no domains have been assigned to the mediated matrix device: * The ID of the adapter being assigned must correspond to the APID of at least one of the AP queue devices bound to the AP matrix device driver. * If domains have been assigned to the mediated matrix device: * Each APQN that can be derived from the ID of the adapter being assigned and the ID of each domain previously assigned must match the APQN of an AP queue bound to the AP matrix device driver. Signed-off-by: Tony Krowiak --- drivers/s390/crypto/vfio_ap_matrix_ops.c | 63 ++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/drivers/s390/crypto/vfio_ap_matrix_ops.c b/drivers/s390/crypto/vfio_ap_matrix_ops.c index e4b1236..2e63d1b 100644 --- a/drivers/s390/crypto/vfio_ap_matrix_ops.c +++ b/drivers/s390/crypto/vfio_ap_matrix_ops.c @@ -191,6 +191,65 @@ static int ap_matrix_parse_id(const char *buf, unsigned int *id) return ret; } +static int ap_matrix_validate_adapter_queues(unsigned long apid, + unsigned long *aqm) +{ + unsigned long apqi; + unsigned long nbits = AP_MATRIX_MAX_MASK_BITS; + ap_qid_t qid; + + apqi = find_first_bit_inv(aqm, nbits); + while (apqi < nbits) { + qid = AP_MKQID(apid, apqi); + + if (find_vapq(matrix, qid)) { + apqi = find_next_bit_inv(aqm, nbits, apqi + 1); + continue; + } + + pr_err("%s: AP queue %02lx.%04lx not bound to driver", + VFIO_AP_MATRIX_MODULE_NAME, apid, apqi); + return -ENODEV; + } + + return 0; +} + +static int ap_matrix_validate_apid(unsigned long apid) +{ + + struct vfio_ap_queue *vapq; + + if (!list_empty(&matrix->queues)) { + list_for_each_entry(vapq, &matrix->queues, list) + if (AP_QID_CARD(vapq->queue->qid) == apid) + return 0; + } + + pr_err("%s: AP queue with adapter %02lx is not bound to driver", + VFIO_AP_MATRIX_MODULE_NAME, apid); + + return -ENODEV; +} + +static int ap_matrix_validate_adapter(struct ap_matrix_mdev *matrix_mdev, + unsigned long apid) +{ + int ret = 0; + unsigned long nbits = AP_MATRIX_MAX_MASK_BITS; + unsigned long *aqm = (unsigned long *)matrix_mdev->masks.aqm; + unsigned long apqi; + + apqi = find_first_bit_inv(aqm, nbits); + /* If no queues have yet been assigned */ + if (apqi < nbits) + ret = ap_matrix_validate_adapter_queues(apid, aqm); + else + ret = ap_matrix_validate_apid(apid); + + return ret; +} + static ssize_t ap_matrix_adapters_assign(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -204,6 +263,10 @@ static ssize_t ap_matrix_adapters_assign(struct device *dev, if (ret) return ret; + ret = ap_matrix_validate_adapter(matrix_mdev, apid); + if (ret) + return ret; + set_bit_inv((unsigned long)apid, (unsigned long *)matrix_mdev->masks.apm); -- 1.7.1