s390/ap: driver callback to indicate resource in use

Introduces a new driver callback to prevent a root user from re-assigning
the APQN of a queue that is in use by a non-default host device driver to
a default host device driver and vice versa. The callback will be invoked
whenever a change to the AP bus's sysfs apmask or aqmask attributes would
result in one or more APQNs being re-assigned. If the callback responds
in the affirmative for any driver queried, the change to the apmask or
aqmask will be rejected with a device busy error.

For this patch, only non-default drivers will be queried. Currently,
there is only one non-default driver, the vfio_ap device driver. The
vfio_ap device driver facilitates pass-through of an AP queue to a
guest. The idea here is that a guest may be administered by a different
sysadmin than the host and we don't want AP resources to unexpectedly
disappear from a guest's AP configuration (i.e., adapters and domains
assigned to the matrix mdev). This will enforce the proper procedure for
removing AP resources intended for guest usage which is to
first unassign them from the matrix mdev, then unbind them from the
vfio_ap device driver.

Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 1986243f9cd392d1941e5635170960c45b060135..d71d2d2c341fcb5352f46f51fdc247603d609495 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -36,6 +36,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/debugfs.h>
 #include <linux/ctype.h>
+#include <linux/module.h>
 
 #include "ap_bus.h"
 #include "ap_debug.h"
@@ -1067,6 +1068,23 @@ static int modify_bitmap(const char *str, unsigned long *bitmap, int bits)
        return 0;
 }
 
+static int ap_parse_bitmap_str(const char *str, unsigned long *bitmap, int bits,
+                              unsigned long *newmap)
+{
+       unsigned long size;
+       int rc;
+
+       size = BITS_TO_LONGS(bits) * sizeof(unsigned long);
+       if (*str == '+' || *str == '-') {
+               memcpy(newmap, bitmap, size);
+               rc = modify_bitmap(str, newmap, bits);
+       } else {
+               memset(newmap, 0, size);
+               rc = hex2bitmap(str, newmap, bits);
+       }
+       return rc;
+}
+
 int ap_parse_mask_str(const char *str,
                      unsigned long *bitmap, int bits,
                      struct mutex *lock)
@@ -1086,14 +1104,7 @@ int ap_parse_mask_str(const char *str,
                kfree(newmap);
                return -ERESTARTSYS;
        }
-
-       if (*str == '+' || *str == '-') {
-               memcpy(newmap, bitmap, size);
-               rc = modify_bitmap(str, newmap, bits);
-       } else {
-               memset(newmap, 0, size);
-               rc = hex2bitmap(str, newmap, bits);
-       }
+       rc = ap_parse_bitmap_str(str, bitmap, bits, newmap);
        if (rc == 0)
                memcpy(bitmap, newmap, size);
        mutex_unlock(lock);
@@ -1286,12 +1297,69 @@ static ssize_t apmask_show(struct bus_type *bus, char *buf)
        return rc;
 }
 
+static int __verify_card_reservations(struct device_driver *drv, void *data)
+{
+       int rc = 0;
+       struct ap_driver *ap_drv = to_ap_drv(drv);
+       unsigned long *newapm = (unsigned long *)data;
+
+       /*
+        * increase the driver's module refcounter to be sure it is not
+        * going away when we invoke the callback function.
+        */
+       if (!try_module_get(drv->owner))
+               return 0;
+
+       if (ap_drv->in_use) {
+               rc = ap_drv->in_use(newapm, ap_perms.aqm);
+               if (rc)
+                       rc = -EBUSY;
+       }
+
+       /* release the driver's module */
+       module_put(drv->owner);
+
+       return rc;
+}
+
+static int apmask_commit(unsigned long *newapm)
+{
+       int rc;
+       unsigned long reserved[BITS_TO_LONGS(AP_DEVICES)];
+
+       /*
+        * Check if any bits in the apmask have been set which will
+        * result in queues being removed from non-default drivers
+        */
+       if (bitmap_andnot(reserved, newapm, ap_perms.apm, AP_DEVICES)) {
+               rc = bus_for_each_drv(&ap_bus_type, NULL, reserved,
+                                     __verify_card_reservations);
+               if (rc)
+                       return rc;
+       }
+
+       memcpy(ap_perms.apm, newapm, APMASKSIZE);
+
+       return 0;
+}
+
 static ssize_t apmask_store(struct bus_type *bus, const char *buf,
                            size_t count)
 {
        int rc;
+       DECLARE_BITMAP(newapm, AP_DEVICES);
+
+       if (mutex_lock_interruptible(&ap_perms_mutex))
+               return -ERESTARTSYS;
 
-       rc = ap_parse_mask_str(buf, ap_perms.apm, AP_DEVICES, &ap_perms_mutex);
+       rc = ap_parse_bitmap_str(buf, ap_perms.apm, AP_DEVICES, newapm);
+       if (rc)
+               goto done;
+
+       rc = apmask_commit(newapm);
+
+done:
+       mutex_unlock(&ap_perms_mutex);
        if (rc)
                return rc;
 
@@ -1317,12 +1385,69 @@ static ssize_t aqmask_show(struct bus_type *bus, char *buf)
        return rc;
 }
 
+static int __verify_queue_reservations(struct device_driver *drv, void *data)
+{
+       int rc = 0;
+       struct ap_driver *ap_drv = to_ap_drv(drv);
+       unsigned long *newaqm = (unsigned long *)data;
+
+       /*
+        * increase the driver's module refcounter to be sure it is not
+        * going away when we invoke the callback function.
+        */
+       if (!try_module_get(drv->owner))
+               return 0;
+
+       if (ap_drv->in_use) {
+               rc = ap_drv->in_use(ap_perms.apm, newaqm);
+               if (rc)
+                       return -EBUSY;
+       }
+
+       /* release the driver's module */
+       module_put(drv->owner);
+
+       return rc;
+}
+
+static int aqmask_commit(unsigned long *newaqm)
+{
+       int rc;
+       unsigned long reserved[BITS_TO_LONGS(AP_DOMAINS)];
+
+       /*
+        * Check if any bits in the aqmask have been set which will
+        * result in queues being removed from non-default drivers
+        */
+       if (bitmap_andnot(reserved, newaqm, ap_perms.aqm, AP_DOMAINS)) {
+               rc = bus_for_each_drv(&ap_bus_type, NULL, reserved,
+                                     __verify_queue_reservations);
+               if (rc)
+                       return rc;
+       }
+
+       memcpy(ap_perms.aqm, newaqm, AQMASKSIZE);
+
+       return 0;
+}
+
 static ssize_t aqmask_store(struct bus_type *bus, const char *buf,
                            size_t count)
 {
        int rc;
+       DECLARE_BITMAP(newaqm, AP_DOMAINS);
 
-       rc = ap_parse_mask_str(buf, ap_perms.aqm, AP_DOMAINS, &ap_perms_mutex);
+       if (mutex_lock_interruptible(&ap_perms_mutex))
+               return -ERESTARTSYS;
+
+       rc = ap_parse_bitmap_str(buf, ap_perms.aqm, AP_DOMAINS, newaqm);
+       if (rc)
+               goto done;
+
+       rc = aqmask_commit(newaqm);
+
+done:
+       mutex_unlock(&ap_perms_mutex);
        if (rc)
                return rc;
 

diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 714c7583af5eaff30feb945c5b74c6fb2ec6546e..7dd992bad949c376e17f8e8e65f0a3d968a4de79 100644 (file)
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -143,6 +143,7 @@ struct ap_driver {
 
        int (*probe)(struct ap_device *);
        void (*remove)(struct ap_device *);
+       int (*in_use)(unsigned long *apm, unsigned long *aqm);
 };
 
 #define to_ap_drv(x) container_of((x), struct ap_driver, driver)
@@ -290,6 +291,9 @@ void ap_queue_init_state(struct ap_queue *aq);
 struct ap_card *ap_card_create(int id, int queue_depth, int raw_type,
                               int comp_type, unsigned int functions, int ml);
 
+#define APMASKSIZE (BITS_TO_LONGS(AP_DEVICES) * sizeof(unsigned long))
+#define AQMASKSIZE (BITS_TO_LONGS(AP_DOMAINS) * sizeof(unsigned long))
+
 struct ap_perms {
        unsigned long ioctlm[BITS_TO_LONGS(AP_IOCTLS)];
        unsigned long apm[BITS_TO_LONGS(AP_DEVICES)];