Received: by 10.192.165.156 with SMTP id m28csp2994457imm; Sun, 15 Apr 2018 14:28:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx48oOcFtxoXMoO2/1UEsEwPX9eepoC9teaFpK4JF9k+yfR49tPtrC8djeZ9HUne9KFuVZe9w X-Received: by 10.101.88.140 with SMTP id d12mr10761614pgu.408.1523827704768; Sun, 15 Apr 2018 14:28:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523827704; cv=none; d=google.com; s=arc-20160816; b=A6MB0US9AUTCu+6xTDvMiQU8DWK6MvsI1QIxw5vvYrXQQsYOuFga9emQdB13DvKejy QTd5IbP6FEW7VJ5LPsNobRvL0mIUZHMbRwUc4YTVPMykbXbulE7n10ZTZwBMwo/RQUhc S2NP+TCpXNjruuQ7Mb6nQU0kP1NSRFUtkq45tGFQCNCOWQuIIrD61Qtikdk2s1SVoIFa nDh1S0FxRgToQFpY77D++a4HTbVnBVMP4Bm4VHM1OzeLni15RpG2Xu7uNazkENvT2IES hg2mkXY9OfuSGQeHNMbh2KGyc2UeZl5Zhh/fwJdI0M0UpAps0uDigDVkXkV8BURB1dDl CzPw== 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=is1hV0fCX/TjqNFwuLHQsyMQB2cQC9CKJUQUZ+A1pNM=; b=TCJYbKV1DGD854MylR6S6tKEoGKAw8MuLe3zqIFzw+/z2abfVIheOb4IA4LnFcoG7R H26mUvdIQFwvQs5likg2fpC2aZ92CEFYSP6l3ryRwD2Ab+axmH7RGqYJMafpExe/r4hb UbdNAMXsgCsAl2b9tvYfMbFm+Fg7UdPsoXdsQODjolHNdqc9H+FYk2JsZsvaG3SpLBKI +y2fRsQHDYciurqVNaYxz/O4IIH8prz9tmLJnCv/UaDH8fYnxvl3IHb4Y7PDfnj1jUBN J75DWuA33/TE9bv46iOJUbmp4ViNIoI8Wt2cjEvzI8EmSN6Yss+0819px6Y/1AiM7scd l/vw== 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 1-v6si10646473plj.275.2018.04.15.14.28.11; Sun, 15 Apr 2018 14:28:24 -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 S1753170AbeDOVYo (ORCPT + 99 others); Sun, 15 Apr 2018 17:24:44 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:45312 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753153AbeDOVWy (ORCPT ); Sun, 15 Apr 2018 17:22:54 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3FLMq2b184705 for ; Sun, 15 Apr 2018 17:22:53 -0400 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0b-001b2d01.pphosted.com with ESMTP id 2hcbrc4718-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Sun, 15 Apr 2018 17:22:53 -0400 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 15 Apr 2018 17:22:52 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 15 Apr 2018 17:22:49 -0400 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3FLMmmu48038050; Sun, 15 Apr 2018 21:22:48 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F912AE03B; Sun, 15 Apr 2018 17:24:34 -0400 (EDT) Received: from localhost.localdomain (unknown [9.85.139.141]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTPS id 1979FAE043; Sun, 15 Apr 2018 17:24:33 -0400 (EDT) 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, jjherne@linux.vnet.ibm.com, thuth@redhat.com, pasic@linux.vnet.ibm.com, berrange@redhat.com, fiuczy@linux.vnet.ibm.com, buendgen@de.ibm.com, akrowiak@linux.vnet.ibm.com Subject: [PATCH v4 09/15] s390: vfio-ap: sysfs interfaces to configure adapters Date: Sun, 15 Apr 2018 17:22:19 -0400 X-Mailer: git-send-email 1.7.1 In-Reply-To: <1523827345-11600-1-git-send-email-akrowiak@linux.vnet.ibm.com> References: <1523827345-11600-1-git-send-email-akrowiak@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18041521-0056-0000-0000-0000043E3822 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008862; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000257; SDB=6.01018429; UDB=6.00519481; IPR=6.00797666; MB=3.00020592; MTD=3.00000008; XFM=3.00000015; UTC=2018-04-15 21:22:51 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041521-0057-0000-0000-000008823AD2 Message-Id: <1523827345-11600-10-git-send-email-akrowiak@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-15_10:,, 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 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804150214 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provides the sysfs interfaces for assigning AP adapters to and unassigning AP adapters from a mediated matrix device. The IDs of the AP adapters assigned to the mediated matrix device are stored in an AP mask (APM). The bits in the APM, from most significant to least significant bit, correspond to AP adapter numbers 0 to 255. When an adapter is assigned, the bit corresponding adapter ID will be set in the APM. Likewise, when an adapter is unassigned, the bit corresponding to the adapter ID will be cleared from the APM. The relevant sysfs structures are: /sys/devices/vfio_ap ... [matrix] ...... [mdev_supported_types] ......... [vfio_ap-passthrough] ............ [devices] ...............[$uuid] .................. assign_adapter .................. unassign_adapter To assign an adapter to the $uuid mediated matrix device's APM, write the adapter ID (APID) to the assign_adapter file. To unassign an adapter, write the APID to the unassign_adapter file. The APID is specified using conventional semantics: If it begins with 0x the number will be parsed as a hexadecimal (case insensitive) number; otherwise, it will be parsed as a decimal number. For example, to assign adapter 173 (0xad) to the mediated matrix device $uuid: echo 173 > assign_adapter or echo 0xad > assign_adapter To unassign adapter 173 (0xad): echo 173 > unassign_adapter or echo 0xad > unassign_adapter The assignment will be rejected: * If the APID exceeds the maximum value for an AP adapter: * If the AP Extended Addressing (APXA) facility is installed, the max value is 255 * Else the max value is 64 * If no AP domains have yet been assigned and there are no AP queues bound to the VFIO AP driver that have an APQN with an APID matching that of the AP adapter being assigned. * If any of the APQNs that can be derived from the intersection of the APID being assigned and the AP queue index (APQI) of each of the AP domains previously assigned can not be matched with an APQN of an AP queue device reserved by the VFIO AP driver. Signed-off-by: Tony Krowiak --- arch/s390/include/asm/kvm-ap.h | 1 + drivers/s390/crypto/vfio_ap_ops.c | 299 +++++++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+), 0 deletions(-) diff --git a/arch/s390/include/asm/kvm-ap.h b/arch/s390/include/asm/kvm-ap.h index a068244..5ebb171 100644 --- a/arch/s390/include/asm/kvm-ap.h +++ b/arch/s390/include/asm/kvm-ap.h @@ -17,6 +17,7 @@ #include #define KVM_AP_MASK_BYTES(n) DIV_ROUND_UP(n, BITS_PER_BYTE) +#define KVM_AP_MAX_APM_INDEX(matrix) (matrix->apm_max - 1) /** * The AP matrix is comprised of three bit masks identifying the adapters, diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index 647ea24..6d32adb 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -97,9 +97,308 @@ static ssize_t device_api_show(struct kobject *kobj, struct device *dev, NULL, }; +struct vfio_apid_reserved { + unsigned long apid; + int reserved; +}; + +struct vfio_ap_qid_match { + qid_t qid; + struct device *dev; +}; + +/** + * vfio_ap_queue_match + * + * @dev: an AP queue device that has been reserved by the VFIO AP device + * driver + * @data: an AP queue identifier + * + * Returns 1 (true) if @data matches the AP queue identifier specified for @dev; + * otherwise, returns 0 (false); + */ +static int vfio_ap_queue_match(struct device *dev, void *data) +{ + struct vfio_ap_qid_match *qid_match = data; + struct ap_queue *ap_queue; + + ap_queue = to_ap_queue(dev); + if (ap_queue->qid == qid_match->qid) + qid_match->dev = dev; + + return 0; +} + +/** + * vfio_ap_validate_queues_for_apid + * + * @ap_matrix: the matrix device + * @matrix_mdev: the mediated matrix device + * @apid: an AP adapter ID (APID) + * + * Verifies that each APQN that is derived from the intersection of @apid and + * each AP queue index (APQI) corresponding to an AP adapter assigned to the + * @matrix_mdev matches the APQN of an AP queue reserved by the VFIO AP device + * driver. + * + * Returns 0 if validation succeeds; otherwise, returns an error. + */ +static int vfio_ap_validate_queues_for_apid(struct ap_matrix *ap_matrix, + struct ap_matrix_mdev *matrix_mdev, + unsigned long apid) +{ + int ret; + struct vfio_ap_qid_match qid_match; + unsigned long apqi; + struct device_driver *drv = ap_matrix->device.driver; + + /** + * Examine each APQN with the specified APID + */ + for_each_set_bit_inv(apqi, matrix_mdev->matrix->aqm, + matrix_mdev->matrix->apm_max) { + qid_match.qid = AP_MKQID(apid, apqi); + qid_match.dev = NULL; + + ret = driver_for_each_device(drv, NULL, &qid_match, + vfio_ap_queue_match); + if (ret) { + pr_err("%s: Error %d validating AP queue %02lx.%04lx reservation", + VFIO_AP_MODULE_NAME, ret, apid, apqi); + return ret; + } + + /* + * If the APQN identifies an AP queue that is reserved by the + * VFIO AP device driver, continue processing. + */ + if (qid_match.dev) + continue; + + pr_err("%s: AP queue %02lx.%04lx not reserved by %s driver", + VFIO_AP_MODULE_NAME, apid, apqi, + VFIO_AP_DRV_NAME); + + return -ENXIO; + } + + return 0; +} + +struct vfio_ap_apid_reserved { + unsigned long apid; + bool reserved; +}; + +/** + * vfio_ap_queue_id_contains_apid + * + * @dev: an AP queue device + * @data: an AP adapter ID (APID) + * + * Returns 1 (true) if the APID (@data) is contained in the AP queue's (@data) + * identifier; otherwise, returns 0; + */ +static int vfio_ap_queue_id_contains_apid(struct device *dev, void *data) +{ + struct vfio_ap_apid_reserved *apid_res = data; + struct ap_queue *ap_queue = to_ap_queue(dev); + + if (apid_res->apid == AP_QID_CARD(ap_queue->qid)) + apid_res->reserved = true; + + return 0; +} + +/** + * vfio_ap_verify_apid_reserved + * + * @ap_matrix: the AP matrix configured for the mediated matrix device + * @apid: the AP adapter ID + * + * Verifies that at least one AP queue reserved by the VFIO AP device driver + * has an APQN containing @apid. + * + * Returns 0 if the APID is reserved; otherwise, returns -ENODEV. + */ +static int vfio_ap_verify_apid_reserved(struct ap_matrix *ap_matrix, + unsigned long apid) +{ + int ret; + struct vfio_ap_apid_reserved apid_res; + + apid_res.apid = apid; + + ret = driver_for_each_device(ap_matrix->device.driver, NULL, + &apid_res, + vfio_ap_queue_id_contains_apid); + if (ret) + return ret; + + if (apid_res.reserved) + return 0; + + pr_err("%s: no APQNs with adapter ID %02lx are reserved by %s driver", + VFIO_AP_MODULE_NAME, apid, VFIO_AP_DRV_NAME); + + return -ENODEV; +} + +/** + * vfio_ap_validate_apid + * + * @mdev: the mediated device + * @matrix_mdev: the mediated matrix device + * @apid: the APID to validate + * + * Validates the value of @apid: + * * If there are no AP domains assigned, then there must be at least + * one AP queue device reserved by the VFIO AP device driver with an + * APQN containing @apid. + * + * * Else each APQN that can be derived from the intersection of @apid and + * the IDs of the AP domains already assigned must identify an AP queue + * that has been reserved by the VFIO AP device driver. + * + * Returns 0 if the value of @apid is valid; otherwise, returns an error. + */ +static int vfio_ap_validate_apid(struct mdev_device *mdev, + struct ap_matrix_mdev *matrix_mdev, + unsigned long apid) +{ + int ret; + struct device *dev = mdev_parent_dev(mdev); + struct ap_matrix *ap_matrix = to_ap_matrix(dev); + unsigned long apqi; + + apqi = find_first_bit_inv(matrix_mdev->matrix->aqm, + matrix_mdev->matrix->aqm_max); + if (apqi == matrix_mdev->matrix->aqm_max) { + ret = vfio_ap_verify_apid_reserved(ap_matrix, apid); + } else { + ret = vfio_ap_validate_queues_for_apid(ap_matrix, matrix_mdev, + apid); + } + + if (ret) + return ret; + + return 0; +} + +/** + * assign_adapter_store + * + * @dev: the matrix device + * @attr: a mediated matrix device attribute + * @buf: a buffer containing the adapter ID (APID) to be assigned + * @count: the number of bytes in @buf + * + * Parses the APID from @buf and assigns it to the mediated matrix device. The + * APID must be a valid value: + * * The APID value must not exceed the maximum allowable AP adapter ID + * + * * If there are no AP domains assigned, then there must be at least + * one AP queue device reserved by the VFIO AP device driver with an + * APQN containing @apid. + * + * * Else each APQN that can be derived from the intersection of @apid and + * the IDs of the AP domains already assigned must identify an AP queue + * that has been reserved by the VFIO AP device driver. + * + * Returns the number of bytes processed if the APID is valid; otherwise returns + * an error. + */ +static ssize_t assign_adapter_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + int ret; + unsigned long apid; + struct mdev_device *mdev = mdev_from_dev(dev); + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev); + int maxid = KVM_AP_MAX_APM_INDEX(matrix_mdev->matrix); + + ret = kstrtoul(buf, 0, &apid); + if (ret || (apid > maxid)) { + pr_err("%s: adapter id '%s' not a value from 0 to %02d(%#04x)", + VFIO_AP_MODULE_NAME, buf, maxid, maxid); + + return ret ? ret : -EINVAL; + } + + ret = vfio_ap_validate_apid(mdev, matrix_mdev, apid); + if (ret) + return ret; + + /* Set the bit in the AP mask (APM) corresponding to the AP adapter + * number (APID). The bits in the mask, from most significant to least + * significant bit, correspond to APIDs 0-255. + */ + set_bit_inv(apid, matrix_mdev->matrix->apm); + + return count; +} +static DEVICE_ATTR_WO(assign_adapter); + +/** + * unassign_adapter_store + * + * @dev: the matrix device + * @attr: a mediated matrix device attribute + * @buf: a buffer containing the adapter ID (APID) to be assigned + * @count: the number of bytes in @buf + * + * Parses the APID from @buf and unassigns it from the mediated matrix device. + * The APID must be a valid value + * + * Returns the number of bytes processed if the APID is valid; otherwise returns + * an error. + */ +static ssize_t unassign_adapter_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + int ret; + unsigned long apid; + struct mdev_device *mdev = mdev_from_dev(dev); + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev); + int maxid = KVM_AP_MAX_APM_INDEX(matrix_mdev->matrix); + + ret = kstrtoul(buf, 0, &apid); + if (ret || (apid > maxid)) { + pr_err("%s: adapter id '%s' must be a value from 0 to %02d(%#04x)", + VFIO_AP_MODULE_NAME, buf, maxid, maxid); + + return ret ? ret : -EINVAL; + } + + clear_bit_inv((unsigned long)apid, + (unsigned long *)matrix_mdev->matrix->apm); + + return count; +} +DEVICE_ATTR_WO(unassign_adapter); + +static struct attribute *vfio_ap_mdev_attrs[] = { + &dev_attr_assign_adapter.attr, + &dev_attr_unassign_adapter.attr, + NULL +}; + +static struct attribute_group vfio_ap_mdev_attr_group = { + .attrs = vfio_ap_mdev_attrs +}; + +static const struct attribute_group *vfio_ap_mdev_attr_groups[] = { + &vfio_ap_mdev_attr_group, + NULL +}; + static const struct mdev_parent_ops vfio_ap_matrix_ops = { .owner = THIS_MODULE, .supported_type_groups = vfio_ap_mdev_type_groups, + .mdev_attr_groups = vfio_ap_mdev_attr_groups, .create = vfio_ap_mdev_create, .remove = vfio_ap_mdev_remove, }; -- 1.7.1