s390/ap: notify drivers on config changed and scan complete callbacks

This patch introduces an extension to the ap bus to notify device drivers
when the host AP configuration changes - i.e., adapters, domains or
control domains are added or removed. When an adapter or domain is added to
the host's AP configuration, the AP bus will create the associated queue
devices in the linux sysfs device model. Each new type 10 (i.e., CEX4) or
newer queue device with an APQN that is not reserved for the default device
driver will get bound to the vfio_ap device driver. Likewise, whan an
adapter or domain is removed from the host's AP configuration, the AP bus
will remove the associated queue devices from the sysfs device model. Each
of the queues that is bound to the vfio_ap device driver will get unbound.

With the introduction of hot plug support, binding or unbinding of a
queue device will result in plugging or unplugging one or more queues from
a guest that is using the queue. If there are multiple changes to the
host's AP configuration, it could result in the probe and remove callbacks
getting invoked multiple times. Each time queues are plugged into or
unplugged from a guest, the guest's VCPUs must be taken out of SIE.
If this occurs multiple times due to changes in the host's AP
configuration, that can have an undesirable negative affect on the guest's
performance.

To alleviate this problem, this patch introduces two new callbacks: one to
notify the vfio_ap device driver when the AP bus scan routine detects a
change to the host's AP configuration; and, one to notify the driver when
the AP bus is done scanning. This will allow the vfio_ap driver to do
bulk processing of all affected adapters, domains and control domains for
affected guests rather than plugging or unplugging them one at a time when
the probe or remove callback is invoked. The two new callbacks are:

void (*on_config_changed)(struct ap_config_info *new_config_info,
                          struct ap_config_info *old_config_info);

This callback is invoked at the start of the AP bus scan
function when it determines that the host AP configuration information
has changed since the previous scan. This is done by storing
an old and current QCI info struct and comparing them. If there is any
difference, the callback is invoked.

void (*on_scan_complete)(struct ap_config_info *new_config_info,
                         struct ap_config_info *old_config_info);

The on_scan_complete callback is invoked after the ap bus scan is
completed if the host AP configuration data has changed.

Signed-off-by: Tony Krowiak <akrowiak@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 d71d2d2c341fcb5352f46f51fdc247603d609495..f5fae8b62bdf99a9704c9f4f665c51eaef8c2678 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -92,6 +92,7 @@ static atomic64_t ap_bindings_complete_count = ATOMIC64_INIT(0);
 static DECLARE_COMPLETION(ap_init_apqn_bindings_complete);
 
 static struct ap_config_info *ap_qci_info;
+static struct ap_config_info *ap_qci_info_old;
 
 /*
  * AP bus related debug feature things.
@@ -229,9 +230,14 @@ static void __init ap_init_qci_info(void)
        ap_qci_info = kzalloc(sizeof(*ap_qci_info), GFP_KERNEL);
        if (!ap_qci_info)
                return;
+       ap_qci_info_old = kzalloc(sizeof(*ap_qci_info_old), GFP_KERNEL);
+       if (!ap_qci_info_old)
+               return;
        if (ap_fetch_qci_info(ap_qci_info) != 0) {
                kfree(ap_qci_info);
+               kfree(ap_qci_info_old);
                ap_qci_info = NULL;
+               ap_qci_info_old = NULL;
                return;
        }
        AP_DBF_INFO("%s successful fetched initial qci info\n", __func__);
@@ -248,6 +254,8 @@ static void __init ap_init_qci_info(void)
                                    __func__, ap_max_domain_id);
                }
        }
+
+       memcpy(ap_qci_info_old, ap_qci_info, sizeof(*ap_qci_info));
 }
 
 /*
@@ -1630,6 +1638,49 @@ static int __match_queue_device_with_queue_id(struct device *dev, const void *da
                && AP_QID_QUEUE(to_ap_queue(dev)->qid) == (int)(long) data;
 }
 
+/* Helper function for notify_config_changed */
+static int __drv_notify_config_changed(struct device_driver *drv, void *data)
+{
+       struct ap_driver *ap_drv = to_ap_drv(drv);
+
+       if (try_module_get(drv->owner)) {
+               if (ap_drv->on_config_changed)
+                       ap_drv->on_config_changed(ap_qci_info, ap_qci_info_old);
+               module_put(drv->owner);
+       }
+
+       return 0;
+}
+
+/* Notify all drivers about an qci config change */
+static inline void notify_config_changed(void)
+{
+       bus_for_each_drv(&ap_bus_type, NULL, NULL,
+                        __drv_notify_config_changed);
+}
+
+/* Helper function for notify_scan_complete */
+static int __drv_notify_scan_complete(struct device_driver *drv, void *data)
+{
+       struct ap_driver *ap_drv = to_ap_drv(drv);
+
+       if (try_module_get(drv->owner)) {
+               if (ap_drv->on_scan_complete)
+                       ap_drv->on_scan_complete(ap_qci_info,
+                                                ap_qci_info_old);
+               module_put(drv->owner);
+       }
+
+       return 0;
+}
+
+/* Notify all drivers about bus scan complete */
+static inline void notify_scan_complete(void)
+{
+       bus_for_each_drv(&ap_bus_type, NULL, NULL,
+                        __drv_notify_scan_complete);
+}
+
 /*
  * Helper function for ap_scan_bus().
  * Remove card device and associated queue devices.
@@ -1917,6 +1968,25 @@ static inline void ap_scan_adapter(int ap)
        put_device(&ac->ap_dev.device);
 }
 
+/**
+ * ap_get_configuration - get the host AP configuration
+ *
+ * Stores the host AP configuration information returned from the previous call
+ * to Query Configuration Information (QCI), then retrieves and stores the
+ * current AP configuration returned from QCI.
+ *
+ * Return: true if the host AP configuration changed between calls to QCI;
+ * otherwise, return false.
+ */
+static bool ap_get_configuration(void)
+{
+       memcpy(ap_qci_info_old, ap_qci_info, sizeof(*ap_qci_info));
+       ap_fetch_qci_info(ap_qci_info);
+
+       return memcmp(ap_qci_info, ap_qci_info_old,
+                     sizeof(struct ap_config_info)) != 0;
+}
+
 /**
  * ap_scan_bus(): Scan the AP bus for new devices
  * Runs periodically, workqueue timer (ap_config_time)
@@ -1924,9 +1994,12 @@ static inline void ap_scan_adapter(int ap)
  */
 static void ap_scan_bus(struct work_struct *unused)
 {
-       int ap;
+       int ap, config_changed = 0;
 
-       ap_fetch_qci_info(ap_qci_info);
+       /* config change notify */
+       config_changed = ap_get_configuration();
+       if (config_changed)
+               notify_config_changed();
        ap_select_domain();
 
        AP_DBF_DBG("%s running\n", __func__);
@@ -1935,6 +2008,10 @@ static void ap_scan_bus(struct work_struct *unused)
        for (ap = 0; ap <= ap_max_adapter_id; ap++)
                ap_scan_adapter(ap);
 
+       /* scan complete notify */
+       if (config_changed)
+               notify_scan_complete();
+
        /* check if there is at least one queue available with default domain */
        if (ap_domain_index >= 0) {
                struct device *dev =

diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 7dd992bad949c376e17f8e8e65f0a3d968a4de79..dc6f563e87874f44910a9e3146ebec5f393a7898 100644 (file)
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -144,6 +144,18 @@ struct ap_driver {
        int (*probe)(struct ap_device *);
        void (*remove)(struct ap_device *);
        int (*in_use)(unsigned long *apm, unsigned long *aqm);
+       /*
+        * Called at the start of the ap bus scan function when
+        * the crypto config information (qci) has changed.
+        */
+       void (*on_config_changed)(struct ap_config_info *new_config_info,
+                                 struct ap_config_info *old_config_info);
+       /*
+        * Called at the end of the ap bus scan function when
+        * the crypto config information (qci) has changed.
+        */
+       void (*on_scan_complete)(struct ap_config_info *new_config_info,
+                                struct ap_config_info *old_config_info);
 };
 
 #define to_ap_drv(x) container_of((x), struct ap_driver, driver)