| Message ID | 1521051954-25715-10-git-send-email-akrowiak@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 14 Mar 2018 14:25:49 -0400 Tony Krowiak <akrowiak@linux.vnet.ibm.com> wrote: > Provides the sysfs interfaces for assigning AP domains to > and unassigning AP domains from a mediated matrix device. > > An AP domain ID corresponds to an AP queue index (APQI). For > each domain assigned to the mediated matrix device, its > corresponging APQI is stored in an AP queue mask (AQM). > The bits in the AQM, from most significant to least > significant bit, correspond to AP domain numbers 0 to 255. > When a domain is assigned, the bit corresponding to its > APQI will be set in the AQM. Likewise, when a domain is > unassigned, the bit corresponding to its APQI will be > cleared from the AQM. > > The relevant sysfs structures are: > > /sys/devices/vfio_ap > ... [matrix] > ...... [mdev_supported_types] > ......... [vfio_ap-passthrough] > ............ [devices] > ...............[$uuid] > .................. assign_domain > .................. unassign_domain > > To assign a domain to the $uuid mediated matrix device, > write the domain's ID to the assign_domain file. To > unassign a domain, write the domain's ID to the > unassign_domain file. The ID 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 domain 173 (0xad) to the mediated matrix > device $uuid: > > echo 173 > assign_domain > > or > > echo 0xad > assign_domain > > To unassign domain 173 (0xad): > > echo 173 > unassign_domain > > or > > echo 0xad > unassign_domain > > The assignment will be rejected: > > * If the domain ID exceeds the maximum value for an AP domain: > > * If the AP Extended Addressing (APXA) facility is installed, > the max value is 255 > > * Else the max value is 15 > > * If no AP adapters have yet been assigned and there are > no AP queues reserved by the VFIO AP driver that have an APQN > with an APQI matching that of the AP domain number being > assigned. > > * If any of the APQNs that can be derived from the intersection > of the APQI being assigned and the AP adapter ID (APID) of > each of the AP adapters 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 <akrowiak@linux.vnet.ibm.com> > --- > arch/s390/include/asm/kvm-ap.h | 1 + > drivers/s390/crypto/vfio_ap_ops.c | 215 ++++++++++++++++++++++++++++++++++++- > 2 files changed, 215 insertions(+), 1 deletions(-) > > diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c > index 90512a6..c448835 100644 > --- a/drivers/s390/crypto/vfio_ap_ops.c > +++ b/drivers/s390/crypto/vfio_ap_ops.c > @@ -377,10 +377,223 @@ static ssize_t unassign_adapter_store(struct device *dev, > } > DEVICE_ATTR_WO(unassign_adapter); > > +/** > + * vfio_ap_validate_queues_for_apqi > + * > + * @ap_matrix: the matrix device > + * @matrix_mdev: the mediated matrix device > + * @apqi: an AP queue index (APQI) - corresponds to a domain ID > + * > + * Verifies that each APQN that is derived from the intersection of @apqi and > + * each AP adapter ID (APID) corresponding to an AP domain 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_apqi(struct ap_matrix *ap_matrix, > + struct ap_matrix_mdev *matrix_mdev, > + unsigned long apqi) > +{ > + int ret; > + struct vfio_ap_qid_match qid_match; > + unsigned long apid; > + struct device_driver *drv = ap_matrix->device.driver; > + > + /** > + * Examine each APQN with the specified APQI > + */ > + for_each_set_bit_inv(apid, matrix_mdev->matrix->apm, > + 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) > + return ret; Hm, I'm wondering whether jumping out of the outer loop is the correct thing to do here - and if yes, whether we should log an error? > + > + /* > + * 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_MATRIX_MODULE_NAME, apqi, apqi, > + VFIO_AP_DRV_NAME); > + > + return -ENXIO; > + } > + > + return 0; > +}
On Tue, 3 Apr 2018 11:12:45 -0400 Tony Krowiak <akrowiak@linux.vnet.ibm.com> wrote: > On 04/03/2018 07:17 AM, Cornelia Huck wrote: > > On Wed, 14 Mar 2018 14:25:49 -0400 > > Tony Krowiak <akrowiak@linux.vnet.ibm.com> wrote: > > > >> Provides the sysfs interfaces for assigning AP domains to > >> and unassigning AP domains from a mediated matrix device. > >> > >> An AP domain ID corresponds to an AP queue index (APQI). For > >> each domain assigned to the mediated matrix device, its > >> corresponging APQI is stored in an AP queue mask (AQM). > >> The bits in the AQM, from most significant to least > >> significant bit, correspond to AP domain numbers 0 to 255. > >> When a domain is assigned, the bit corresponding to its > >> APQI will be set in the AQM. Likewise, when a domain is > >> unassigned, the bit corresponding to its APQI will be > >> cleared from the AQM. > >> > >> The relevant sysfs structures are: > >> > >> /sys/devices/vfio_ap > >> ... [matrix] > >> ...... [mdev_supported_types] > >> ......... [vfio_ap-passthrough] > >> ............ [devices] > >> ...............[$uuid] > >> .................. assign_domain > >> .................. unassign_domain > >> > >> To assign a domain to the $uuid mediated matrix device, > >> write the domain's ID to the assign_domain file. To > >> unassign a domain, write the domain's ID to the > >> unassign_domain file. The ID 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 domain 173 (0xad) to the mediated matrix > >> device $uuid: > >> > >> echo 173 > assign_domain > >> > >> or > >> > >> echo 0xad > assign_domain > >> > >> To unassign domain 173 (0xad): > >> > >> echo 173 > unassign_domain > >> > >> or > >> > >> echo 0xad > unassign_domain > >> > >> The assignment will be rejected: > >> > >> * If the domain ID exceeds the maximum value for an AP domain: > >> > >> * If the AP Extended Addressing (APXA) facility is installed, > >> the max value is 255 > >> > >> * Else the max value is 15 > >> > >> * If no AP adapters have yet been assigned and there are > >> no AP queues reserved by the VFIO AP driver that have an APQN > >> with an APQI matching that of the AP domain number being > >> assigned. > >> > >> * If any of the APQNs that can be derived from the intersection > >> of the APQI being assigned and the AP adapter ID (APID) of > >> each of the AP adapters 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 <akrowiak@linux.vnet.ibm.com> > >> --- > >> arch/s390/include/asm/kvm-ap.h | 1 + > >> drivers/s390/crypto/vfio_ap_ops.c | 215 ++++++++++++++++++++++++++++++++++++- > >> 2 files changed, 215 insertions(+), 1 deletions(-) > >> > >> diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c > >> index 90512a6..c448835 100644 > >> --- a/drivers/s390/crypto/vfio_ap_ops.c > >> +++ b/drivers/s390/crypto/vfio_ap_ops.c > >> @@ -377,10 +377,223 @@ static ssize_t unassign_adapter_store(struct device *dev, > >> } > >> DEVICE_ATTR_WO(unassign_adapter); > >> > >> +/** > >> + * vfio_ap_validate_queues_for_apqi > >> + * > >> + * @ap_matrix: the matrix device > >> + * @matrix_mdev: the mediated matrix device > >> + * @apqi: an AP queue index (APQI) - corresponds to a domain ID > >> + * > >> + * Verifies that each APQN that is derived from the intersection of @apqi and > >> + * each AP adapter ID (APID) corresponding to an AP domain 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_apqi(struct ap_matrix *ap_matrix, > >> + struct ap_matrix_mdev *matrix_mdev, > >> + unsigned long apqi) > >> +{ > >> + int ret; > >> + struct vfio_ap_qid_match qid_match; > >> + unsigned long apid; > >> + struct device_driver *drv = ap_matrix->device.driver; > >> + > >> + /** > >> + * Examine each APQN with the specified APQI > >> + */ > >> + for_each_set_bit_inv(apid, matrix_mdev->matrix->apm, > >> + 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) > >> + return ret; > > Hm, I'm wondering whether jumping out of the outer loop is the correct > > thing to do here - and if yes, whether we should log an error? > If you look at the vfio_ap_queue_match() function which is passed to the > driver_for_each_device() function, it never returns an error. The > driver_for_each_device() function only returns an error if the function > passed in returns an error, so in reality, the value of *ret *will never > be anything but 0. Having said that, there are no guarantees that the > vfio_ap_queue_match() function will never change, so it would probably > be a good idea to log an error if *ret *is not 0.**I think returning at > this point is valid because a non-zero is returned from > driver_for_each_device() function as soon as the input function returns > a non-zero value for a specific device. This means that subsequent > devices will not be processed, so we may not know whether an AP queue > has been reserved or not - see check below. OK, then logging an error makes the most sense. Is there a source tree with the patches somewhere, btw? Checking out a branch is less time-consuming than applying a series (and helps review). Same applies to the qemu patches; maybe one of the IBM maintainers can push to a branch? > > > > >> + > >> + /* > >> + * 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_MATRIX_MODULE_NAME, apqi, apqi, > >> + VFIO_AP_DRV_NAME); > >> + > >> + return -ENXIO; > >> + } > >> + > >> + return 0; > >> +} > >
On 04/03/2018 11:19 AM, Cornelia Huck wrote: > On Tue, 3 Apr 2018 11:12:45 -0400 > Tony Krowiak <akrowiak@linux.vnet.ibm.com> wrote: > >> On 04/03/2018 07:17 AM, Cornelia Huck wrote: >>> On Wed, 14 Mar 2018 14:25:49 -0400 >>> Tony Krowiak <akrowiak@linux.vnet.ibm.com> wrote: >>> >>>> Provides the sysfs interfaces for assigning AP domains to >>>> and unassigning AP domains from a mediated matrix device. >>>> >>>> An AP domain ID corresponds to an AP queue index (APQI). For >>>> each domain assigned to the mediated matrix device, its >>>> corresponging APQI is stored in an AP queue mask (AQM). >>>> The bits in the AQM, from most significant to least >>>> significant bit, correspond to AP domain numbers 0 to 255. >>>> When a domain is assigned, the bit corresponding to its >>>> APQI will be set in the AQM. Likewise, when a domain is >>>> unassigned, the bit corresponding to its APQI will be >>>> cleared from the AQM. >>>> >>>> The relevant sysfs structures are: >>>> >>>> /sys/devices/vfio_ap >>>> ... [matrix] >>>> ...... [mdev_supported_types] >>>> ......... [vfio_ap-passthrough] >>>> ............ [devices] >>>> ...............[$uuid] >>>> .................. assign_domain >>>> .................. unassign_domain >>>> >>>> To assign a domain to the $uuid mediated matrix device, >>>> write the domain's ID to the assign_domain file. To >>>> unassign a domain, write the domain's ID to the >>>> unassign_domain file. The ID 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 domain 173 (0xad) to the mediated matrix >>>> device $uuid: >>>> >>>> echo 173 > assign_domain >>>> >>>> or >>>> >>>> echo 0xad > assign_domain >>>> >>>> To unassign domain 173 (0xad): >>>> >>>> echo 173 > unassign_domain >>>> >>>> or >>>> >>>> echo 0xad > unassign_domain >>>> >>>> The assignment will be rejected: >>>> >>>> * If the domain ID exceeds the maximum value for an AP domain: >>>> >>>> * If the AP Extended Addressing (APXA) facility is installed, >>>> the max value is 255 >>>> >>>> * Else the max value is 15 >>>> >>>> * If no AP adapters have yet been assigned and there are >>>> no AP queues reserved by the VFIO AP driver that have an APQN >>>> with an APQI matching that of the AP domain number being >>>> assigned. >>>> >>>> * If any of the APQNs that can be derived from the intersection >>>> of the APQI being assigned and the AP adapter ID (APID) of >>>> each of the AP adapters 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 <akrowiak@linux.vnet.ibm.com> >>>> --- >>>> arch/s390/include/asm/kvm-ap.h | 1 + >>>> drivers/s390/crypto/vfio_ap_ops.c | 215 ++++++++++++++++++++++++++++++++++++- >>>> 2 files changed, 215 insertions(+), 1 deletions(-) >>>> >>>> diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c >>>> index 90512a6..c448835 100644 >>>> --- a/drivers/s390/crypto/vfio_ap_ops.c >>>> +++ b/drivers/s390/crypto/vfio_ap_ops.c >>>> @@ -377,10 +377,223 @@ static ssize_t unassign_adapter_store(struct device *dev, >>>> } >>>> DEVICE_ATTR_WO(unassign_adapter); >>>> >>>> +/** >>>> + * vfio_ap_validate_queues_for_apqi >>>> + * >>>> + * @ap_matrix: the matrix device >>>> + * @matrix_mdev: the mediated matrix device >>>> + * @apqi: an AP queue index (APQI) - corresponds to a domain ID >>>> + * >>>> + * Verifies that each APQN that is derived from the intersection of @apqi and >>>> + * each AP adapter ID (APID) corresponding to an AP domain 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_apqi(struct ap_matrix *ap_matrix, >>>> + struct ap_matrix_mdev *matrix_mdev, >>>> + unsigned long apqi) >>>> +{ >>>> + int ret; >>>> + struct vfio_ap_qid_match qid_match; >>>> + unsigned long apid; >>>> + struct device_driver *drv = ap_matrix->device.driver; >>>> + >>>> + /** >>>> + * Examine each APQN with the specified APQI >>>> + */ >>>> + for_each_set_bit_inv(apid, matrix_mdev->matrix->apm, >>>> + 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) >>>> + return ret; >>> Hm, I'm wondering whether jumping out of the outer loop is the correct >>> thing to do here - and if yes, whether we should log an error? >> If you look at the vfio_ap_queue_match() function which is passed to the >> driver_for_each_device() function, it never returns an error. The >> driver_for_each_device() function only returns an error if the function >> passed in returns an error, so in reality, the value of *ret *will never >> be anything but 0. Having said that, there are no guarantees that the >> vfio_ap_queue_match() function will never change, so it would probably >> be a good idea to log an error if *ret *is not 0.**I think returning at >> this point is valid because a non-zero is returned from >> driver_for_each_device() function as soon as the input function returns >> a non-zero value for a specific device. This means that subsequent >> devices will not be processed, so we may not know whether an AP queue >> has been reserved or not - see check below. > OK, then logging an error makes the most sense. > > Is there a source tree with the patches somewhere, btw? Checking out a > branch is less time-consuming than applying a series (and helps > review). Same applies to the qemu patches; maybe one of the IBM > maintainers can push to a branch? I'll check with Christian for the forthcoming v4 patches. > >>> >>>> + >>>> + /* >>>> + * 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_MATRIX_MODULE_NAME, apqi, apqi, >>>> + VFIO_AP_DRV_NAME); >>>> + >>>> + return -ENXIO; >>>> + } >>>> + >>>> + return 0; >>>> +} >>
diff --git a/arch/s390/include/asm/kvm-ap.h b/arch/s390/include/asm/kvm-ap.h index 2052329..8ec42e7 100644 --- a/arch/s390/include/asm/kvm-ap.h +++ b/arch/s390/include/asm/kvm-ap.h @@ -16,6 +16,7 @@ #define KVM_AP_MASK_BYTES(n) DIV_ROUND_UP(n, BITS_PER_BYTE) #define KVM_AP_MAX_APM_INDEX(matrix) (matrix->apm_max - 1) +#define KVM_AP_MAX_AQM_INDEX(matrix) (matrix->aqm_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 90512a6..c448835 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -377,10 +377,223 @@ static ssize_t unassign_adapter_store(struct device *dev, } DEVICE_ATTR_WO(unassign_adapter); +/** + * vfio_ap_validate_queues_for_apqi + * + * @ap_matrix: the matrix device + * @matrix_mdev: the mediated matrix device + * @apqi: an AP queue index (APQI) - corresponds to a domain ID + * + * Verifies that each APQN that is derived from the intersection of @apqi and + * each AP adapter ID (APID) corresponding to an AP domain 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_apqi(struct ap_matrix *ap_matrix, + struct ap_matrix_mdev *matrix_mdev, + unsigned long apqi) +{ + int ret; + struct vfio_ap_qid_match qid_match; + unsigned long apid; + struct device_driver *drv = ap_matrix->device.driver; + + /** + * Examine each APQN with the specified APQI + */ + for_each_set_bit_inv(apid, matrix_mdev->matrix->apm, + 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) + 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_MATRIX_MODULE_NAME, apqi, apqi, + VFIO_AP_DRV_NAME); + + return -ENXIO; + } + + return 0; +} + +struct vfio_ap_apqi_reserved { + unsigned long apqi; + bool reserved; +}; + +/** + * vfio_ap_queue_id_contains_apqi + * + * @dev: an AP queue device + * @data: an AP queue index (APQI) + * + * Returns 1 (true) if the APQI (@data) is contained in the AP queue's + * identifier; otherwise, returns 0; + */ +static int vfio_ap_queue_id_contains_apqi(struct device *dev, void *data) +{ + struct vfio_ap_apqi_reserved *apqi_res = data; + struct ap_queue *ap_queue = to_ap_queue(dev); + + if (apqi_res->apqi == AP_QID_QUEUE(ap_queue->qid)) + apqi_res->reserved = true; + + return 0; +} + +/** + * vfio_ap_verify_apqi_reserved + * + * @ap_matrix: the AP matrix configured for the mediated matrix device + * @apqi: the AP queue index (APQI) - corresponds to domain ID + * + * Verifies that at least one AP queue reserved by the VFIO AP device driver + * has an APQN containing @apqi. + * + * Returns 0 if the APQI is reserved; otherwise, returns -ENODEV. + */ +static int vfio_ap_verify_apqi_reserved(struct ap_matrix *ap_matrix, + unsigned long apqi) +{ + int ret; + struct vfio_ap_apqi_reserved apqi_res; + + apqi_res.apqi = apqi; + + ret = driver_for_each_device(ap_matrix->device.driver, NULL, + &apqi_res, + vfio_ap_queue_id_contains_apqi); + if (ret) + return ret; + + if (apqi_res.reserved) + return 0; + + pr_err("%s: no APQNs with domain ID %02lx are reserved by %s driver", + VFIO_AP_MATRIX_MODULE_NAME, apqi, VFIO_AP_DRV_NAME); + + return -ENODEV; +} + +/** + * vfio_ap_validate_apqi + * + * @matrix_mdev: the mediated matrix device + * @apqi: the APQI (domain ID) to validate + * + * Validates the value of @apqi: + * * If there are no AP adapters assigned, then there must be at least + * one AP queue device reserved by the VFIO AP device driver with an + * APQN containing @apqi. + * + * * Else each APQN that can be derived from the intersection of @apqi and + * the IDs of the AP adapters already assigned must identify an AP queue + * that has been reserved by the VFIO AP device driver. + * + * Returns 0 if the value of @apqi is valid; otherwise, returns an error. + */ +static int vfio_ap_validate_apqi(struct mdev_device *mdev, + struct ap_matrix_mdev *matrix_mdev, + unsigned long apqi) +{ + int ret; + struct device *dev = mdev_parent_dev(mdev); + struct ap_matrix *ap_matrix = to_ap_matrix(dev); + unsigned long apid; + + apid = find_first_bit_inv(matrix_mdev->matrix->apm, + matrix_mdev->matrix->apm_max); + /* If there are no adapters assigned */ + if (apid == matrix_mdev->matrix->apm_max) { + ret = vfio_ap_verify_apqi_reserved(ap_matrix, apqi); + } else { + ret = vfio_ap_validate_queues_for_apqi(ap_matrix, matrix_mdev, + apqi); + } + + if (ret) + return ret; + + return 0; +} + +static ssize_t assign_domain_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + int ret; + unsigned long apqi; + struct mdev_device *mdev = mdev_from_dev(dev); + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev); + int maxid = KVM_AP_MAX_AQM_INDEX(matrix_mdev->matrix); + + ret = kstrtoul(buf, 0, &apqi); + if (ret || (apqi > maxid)) { + pr_err("%s: domain id '%s' not a value from 0 to %02d(%#04x)", + VFIO_AP_MATRIX_MODULE_NAME, buf, maxid, maxid); + + return ret ? ret : -EINVAL; + } + + ret = vfio_ap_validate_apqi(mdev, matrix_mdev, apqi); + if (ret) + return ret; + + /* Set the bit in the AQM (bitmask) corresponding to the AP domain + * number (APQI). The bits in the mask, from most significant to least + * significant, correspond to numbers 0-255. + */ + set_bit_inv(apqi, matrix_mdev->matrix->aqm); + + return count; +} +DEVICE_ATTR_WO(assign_domain); + +static ssize_t unassign_domain_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + int ret; + unsigned long apqi; + struct mdev_device *mdev = mdev_from_dev(dev); + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev); + int maxid = KVM_AP_MAX_AQM_INDEX(matrix_mdev->matrix); + + ret = kstrtoul(buf, 0, &apqi); + if (ret || (apqi > maxid)) { + pr_err("%s: domain id '%s' not a value from 0 to %02d(%#04x)", + VFIO_AP_MATRIX_MODULE_NAME, buf, maxid, maxid); + + return ret ? ret : -EINVAL; + } + + clear_bit_inv((unsigned long)apqi, + (unsigned long *)matrix_mdev->matrix->aqm); + + return count; +} +DEVICE_ATTR_WO(unassign_domain); + static struct attribute *vfio_ap_mdev_attrs[] = { &dev_attr_assign_adapter.attr, &dev_attr_unassign_adapter.attr, - NULL + &dev_attr_assign_domain.attr, + &dev_attr_unassign_domain.attr, + NULL, }; static struct attribute_group vfio_ap_mdev_attr_group = {
Provides the sysfs interfaces for assigning AP domains to and unassigning AP domains from a mediated matrix device. An AP domain ID corresponds to an AP queue index (APQI). For each domain assigned to the mediated matrix device, its corresponging APQI is stored in an AP queue mask (AQM). The bits in the AQM, from most significant to least significant bit, correspond to AP domain numbers 0 to 255. When a domain is assigned, the bit corresponding to its APQI will be set in the AQM. Likewise, when a domain is unassigned, the bit corresponding to its APQI will be cleared from the AQM. The relevant sysfs structures are: /sys/devices/vfio_ap ... [matrix] ...... [mdev_supported_types] ......... [vfio_ap-passthrough] ............ [devices] ...............[$uuid] .................. assign_domain .................. unassign_domain To assign a domain to the $uuid mediated matrix device, write the domain's ID to the assign_domain file. To unassign a domain, write the domain's ID to the unassign_domain file. The ID 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 domain 173 (0xad) to the mediated matrix device $uuid: echo 173 > assign_domain or echo 0xad > assign_domain To unassign domain 173 (0xad): echo 173 > unassign_domain or echo 0xad > unassign_domain The assignment will be rejected: * If the domain ID exceeds the maximum value for an AP domain: * If the AP Extended Addressing (APXA) facility is installed, the max value is 255 * Else the max value is 15 * If no AP adapters have yet been assigned and there are no AP queues reserved by the VFIO AP driver that have an APQN with an APQI matching that of the AP domain number being assigned. * If any of the APQNs that can be derived from the intersection of the APQI being assigned and the AP adapter ID (APID) of each of the AP adapters 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 <akrowiak@linux.vnet.ibm.com> --- arch/s390/include/asm/kvm-ap.h | 1 + drivers/s390/crypto/vfio_ap_ops.c | 215 ++++++++++++++++++++++++++++++++++++- 2 files changed, 215 insertions(+), 1 deletions(-)