s390/dasd: Prepare for additional path event handling

[ Upstream commit 150f5aa427e664ab3a52d56f0fc7d0a0efebbbee ]

As more path events need to be handled for ECKD the current path
verification infrastructure can be reused. Rename all path verifcation
code to fit the more broadly based task of path event handling and put
the path verification in a new separate function.

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Stefan Haberland <sth@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 460e9bed82e4 ("s390/dasd: Fix potential memleak in dasd_eckd_init()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index e0570cd0e520c07e8e40dbdf38fdfc70b32d9272..3362f235e8919999244f0f2f91f1c39b0c07a4f8 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2128,8 +2128,8 @@ static void __dasd_device_check_path_events(struct dasd_device *device)
        if (device->stopped &
            ~(DASD_STOPPED_DC_WAIT | DASD_UNRESUMED_PM))
                return;
-       rc = device->discipline->verify_path(device,
-                                            dasd_path_get_tbvpm(device));
+       rc = device->discipline->pe_handler(device,
+                                           dasd_path_get_tbvpm(device));
        if (rc)
                dasd_device_set_timer(device, 50);
        else

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 53d22975a32fdb62198b57350a1244308ccaa2c0..d1429936f38c683678c6de1570d6adb3006daf6b 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -103,7 +103,7 @@ struct ext_pool_exhaust_work_data {
 };
 
 /* definitions for the path verification worker */
-struct path_verification_work_data {
+struct pe_handler_work_data {
        struct work_struct worker;
        struct dasd_device *device;
        struct dasd_ccw_req cqr;
@@ -112,8 +112,8 @@ struct path_verification_work_data {
        int isglobal;
        __u8 tbvpm;
 };
-static struct path_verification_work_data *path_verification_worker;
-static DEFINE_MUTEX(dasd_path_verification_mutex);
+static struct pe_handler_work_data *pe_handler_worker;
+static DEFINE_MUTEX(dasd_pe_handler_mutex);
 
 struct check_attention_work_data {
        struct work_struct worker;
@@ -1219,7 +1219,7 @@ static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm)
 }
 
 static int rebuild_device_uid(struct dasd_device *device,
-                             struct path_verification_work_data *data)
+                             struct pe_handler_work_data *data)
 {
        struct dasd_eckd_private *private = device->private;
        __u8 lpm, opm = dasd_path_get_opm(device);
@@ -1257,10 +1257,9 @@ static int rebuild_device_uid(struct dasd_device *device,
        return rc;
 }
 
-static void do_path_verification_work(struct work_struct *work)
+static void dasd_eckd_path_available_action(struct dasd_device *device,
+                                           struct pe_handler_work_data *data)
 {
-       struct path_verification_work_data *data;
-       struct dasd_device *device;
        struct dasd_eckd_private path_private;
        struct dasd_uid *uid;
        __u8 path_rcd_buf[DASD_ECKD_RCD_DATA_SIZE];
@@ -1269,19 +1268,6 @@ static void do_path_verification_work(struct work_struct *work)
        char print_uid[60];
        int rc;
 
-       data = container_of(work, struct path_verification_work_data, worker);
-       device = data->device;
-
-       /* delay path verification until device was resumed */
-       if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
-               schedule_work(work);
-               return;
-       }
-       /* check if path verification already running and delay if so */
-       if (test_and_set_bit(DASD_FLAG_PATH_VERIFY, &device->flags)) {
-               schedule_work(work);
-               return;
-       }
        opm = 0;
        npm = 0;
        ppm = 0;
@@ -1418,30 +1404,54 @@ static void do_path_verification_work(struct work_struct *work)
                dasd_path_add_nohpfpm(device, hpfpm);
                spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
        }
+}
+
+static void do_pe_handler_work(struct work_struct *work)
+{
+       struct pe_handler_work_data *data;
+       struct dasd_device *device;
+
+       data = container_of(work, struct pe_handler_work_data, worker);
+       device = data->device;
+
+       /* delay path verification until device was resumed */
+       if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
+               schedule_work(work);
+               return;
+       }
+       /* check if path verification already running and delay if so */
+       if (test_and_set_bit(DASD_FLAG_PATH_VERIFY, &device->flags)) {
+               schedule_work(work);
+               return;
+       }
+
+       dasd_eckd_path_available_action(device, data);
+
        clear_bit(DASD_FLAG_PATH_VERIFY, &device->flags);
        dasd_put_device(device);
        if (data->isglobal)
-               mutex_unlock(&dasd_path_verification_mutex);
+               mutex_unlock(&dasd_pe_handler_mutex);
        else
                kfree(data);
 }
 
-static int dasd_eckd_verify_path(struct dasd_device *device, __u8 lpm)
+static int dasd_eckd_pe_handler(struct dasd_device *device, __u8 lpm)
 {
-       struct path_verification_work_data *data;
+       struct pe_handler_work_data *data;
 
        data = kmalloc(sizeof(*data), GFP_ATOMIC | GFP_DMA);
        if (!data) {
-               if (mutex_trylock(&dasd_path_verification_mutex)) {
-                       data = path_verification_worker;
+               if (mutex_trylock(&dasd_pe_handler_mutex)) {
+                       data = pe_handler_worker;
                        data->isglobal = 1;
-               } else
+               } else {
                        return -ENOMEM;
+               }
        } else {
                memset(data, 0, sizeof(*data));
                data->isglobal = 0;
        }
-       INIT_WORK(&data->worker, do_path_verification_work);
+       INIT_WORK(&data->worker, do_pe_handler_work);
        dasd_get_device(device);
        data->device = device;
        data->tbvpm = lpm;
@@ -6694,7 +6704,7 @@ static struct dasd_discipline dasd_eckd_discipline = {
        .check_device = dasd_eckd_check_characteristics,
        .uncheck_device = dasd_eckd_uncheck_device,
        .do_analysis = dasd_eckd_do_analysis,
-       .verify_path = dasd_eckd_verify_path,
+       .pe_handler = dasd_eckd_pe_handler,
        .basic_to_ready = dasd_eckd_basic_to_ready,
        .online_to_ready = dasd_eckd_online_to_ready,
        .basic_to_known = dasd_eckd_basic_to_known,
@@ -6755,16 +6765,16 @@ dasd_eckd_init(void)
                                    GFP_KERNEL | GFP_DMA);
        if (!dasd_vol_info_req)
                return -ENOMEM;
-       path_verification_worker = kmalloc(sizeof(*path_verification_worker),
-                                  GFP_KERNEL | GFP_DMA);
-       if (!path_verification_worker) {
+       pe_handler_worker = kmalloc(sizeof(*pe_handler_worker),
+                                   GFP_KERNEL | GFP_DMA);
+       if (!pe_handler_worker) {
                kfree(dasd_reserve_req);
                kfree(dasd_vol_info_req);
                return -ENOMEM;
        }
        rawpadpage = (void *)__get_free_page(GFP_KERNEL);
        if (!rawpadpage) {
-               kfree(path_verification_worker);
+               kfree(pe_handler_worker);
                kfree(dasd_reserve_req);
                kfree(dasd_vol_info_req);
                return -ENOMEM;
@@ -6773,7 +6783,7 @@ dasd_eckd_init(void)
        if (!ret)
                wait_for_device_probe();
        else {
-               kfree(path_verification_worker);
+               kfree(pe_handler_worker);
                kfree(dasd_reserve_req);
                kfree(dasd_vol_info_req);
                free_page((unsigned long)rawpadpage);
@@ -6785,7 +6795,7 @@ static void __exit
 dasd_eckd_cleanup(void)
 {
        ccw_driver_unregister(&dasd_eckd_driver);
-       kfree(path_verification_worker);
+       kfree(pe_handler_worker);
        kfree(dasd_reserve_req);
        free_page((unsigned long)rawpadpage);
 }

diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 9d9685c25253d5549089338d7c6d419f3892cad9..e8a06d85d6f723626fe42a08b0553299380933ec 100644 (file)
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -299,6 +299,7 @@ struct dasd_discipline {
         * configuration.
         */
        int (*verify_path)(struct dasd_device *, __u8);
+       int (*pe_handler)(struct dasd_device *, __u8);
 
        /*
         * Last things to do when a device is set online, and first things