s390/dasd: Process FCES path event notification

If the Fibre Channel Endpoint-Security status of a path changes, a
corresponding path event is received from the CIO layer.

Process this event by re-reading the FCES information.

As the information is retrieved for all paths on a single CU in one
call, the internal status can also be updated for all paths and no
processing per path is necessary.

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>

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 8d7a53e98298431e986266c91ee7ae9c653b7ab5..874345e1138c3a505570522ccc07ecbfc8d2e94f 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2107,20 +2107,25 @@ static void __dasd_device_start_head(struct dasd_device *device)
 
 static void __dasd_device_check_path_events(struct dasd_device *device)
 {
+       __u8 tbvpm, fcsecpm;
        int rc;
 
-       if (!dasd_path_get_tbvpm(device))
+       tbvpm = dasd_path_get_tbvpm(device);
+       fcsecpm = dasd_path_get_fcsecpm(device);
+
+       if (!tbvpm && !fcsecpm)
                return;
 
        if (device->stopped &
            ~(DASD_STOPPED_DC_WAIT | DASD_UNRESUMED_PM))
                return;
-       rc = device->discipline->pe_handler(device,
-                                           dasd_path_get_tbvpm(device));
-       if (rc)
+       rc = device->discipline->pe_handler(device, tbvpm, fcsecpm);
+       if (rc) {
                dasd_device_set_timer(device, 50);
-       else
+       } else {
                dasd_path_clear_all_verify(device);
+               dasd_path_clear_all_fcsec(device);
+       }
 };
 
 /*
@@ -3869,6 +3874,10 @@ void dasd_generic_path_event(struct ccw_device *cdev, int *path_event)
                        if (device->discipline->kick_validate)
                                device->discipline->kick_validate(device);
                }
+               if (path_event[chp] & PE_PATH_FCES_EVENT) {
+                       dasd_path_fcsec_update(device, chp);
+                       dasd_schedule_device_bh(device);
+               }
        }
        hpfpm = dasd_path_get_hpfpm(device);
        ifccpm = dasd_path_get_ifccpm(device);

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 2e1cfacbf4d8974fffc2457d9e0c5d15a4709711..0d319c21c287e44578bc99324bfde7950e1967a0 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -111,6 +111,7 @@ struct pe_handler_work_data {
        __u8 rcd_buffer[DASD_ECKD_RCD_DATA_SIZE];
        int isglobal;
        __u8 tbvpm;
+       __u8 fcsecpm;
 };
 static struct pe_handler_work_data *pe_handler_worker;
 static DEFINE_MUTEX(dasd_pe_handler_mutex);
@@ -1466,7 +1467,10 @@ static void do_pe_handler_work(struct work_struct *work)
                return;
        }
 
-       dasd_eckd_path_available_action(device, data);
+       if (data->tbvpm)
+               dasd_eckd_path_available_action(device, data);
+       if (data->fcsecpm)
+               dasd_eckd_read_fc_security(device);
 
        clear_bit(DASD_FLAG_PATH_VERIFY, &device->flags);
        dasd_put_device(device);
@@ -1476,7 +1480,8 @@ static void do_pe_handler_work(struct work_struct *work)
                kfree(data);
 }
 
-static int dasd_eckd_pe_handler(struct dasd_device *device, __u8 lpm)
+static int dasd_eckd_pe_handler(struct dasd_device *device,
+                               __u8 tbvpm, __u8 fcsecpm)
 {
        struct pe_handler_work_data *data;
 
@@ -1495,7 +1500,8 @@ static int dasd_eckd_pe_handler(struct dasd_device *device, __u8 lpm)
        INIT_WORK(&data->worker, do_pe_handler_work);
        dasd_get_device(device);
        data->device = device;
-       data->tbvpm = lpm;
+       data->tbvpm = tbvpm;
+       data->fcsecpm = fcsecpm;
        schedule_work(&data->worker);
        return 0;
 }

diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 4cfed3b6d9a62a5159f037ad230be0a3cd17458b..10f411c9b3c0f36171d288ea05ff99c9ff52441c 100644 (file)
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -298,7 +298,7 @@ struct dasd_discipline {
         * configuration.
         */
        int (*verify_path)(struct dasd_device *, __u8);
-       int (*pe_handler)(struct dasd_device *, __u8);
+       int (*pe_handler)(struct dasd_device *, __u8, __u8);
 
        /*
         * Last things to do when a device is set online, and first things
@@ -423,6 +423,7 @@ extern struct dasd_discipline *dasd_diag_discipline_pointer;
 #define DASD_PATH_NOHPF        6
 #define DASD_PATH_CUIR        7
 #define DASD_PATH_IFCC        8
+#define DASD_PATH_FCSEC               9
 
 #define DASD_THRHLD_MAX                4294967295U
 #define DASD_INTERVAL_MAX      4294967295U
@@ -966,6 +967,29 @@ static inline void dasd_path_clear_all_verify(struct dasd_device *device)
                dasd_path_clear_verify(device, chp);
 }
 
+static inline void dasd_path_fcsec(struct dasd_device *device, int chp)
+{
+       __set_bit(DASD_PATH_FCSEC, &device->path[chp].flags);
+}
+
+static inline void dasd_path_clear_fcsec(struct dasd_device *device, int chp)
+{
+       __clear_bit(DASD_PATH_FCSEC, &device->path[chp].flags);
+}
+
+static inline int dasd_path_need_fcsec(struct dasd_device *device, int chp)
+{
+       return test_bit(DASD_PATH_FCSEC, &device->path[chp].flags);
+}
+
+static inline void dasd_path_clear_all_fcsec(struct dasd_device *device)
+{
+       int chp;
+
+       for (chp = 0; chp < 8; chp++)
+               dasd_path_clear_fcsec(device, chp);
+}
+
 static inline void dasd_path_operational(struct dasd_device *device, int chp)
 {
        __set_bit(DASD_PATH_OPERATIONAL, &device->path[chp].flags);
@@ -1091,6 +1115,17 @@ static inline __u8 dasd_path_get_tbvpm(struct dasd_device *device)
        return tbvpm;
 }
 
+static inline int dasd_path_get_fcsecpm(struct dasd_device *device)
+{
+       int chp;
+
+       for (chp = 0; chp < 8; chp++)
+               if (dasd_path_need_fcsec(device, chp))
+                       return 1;
+
+       return 0;
+}
+
 static inline __u8 dasd_path_get_nppm(struct dasd_device *device)
 {
        int chp;
@@ -1348,6 +1383,11 @@ static inline void dasd_path_notoper(struct dasd_device *device, int chp)
        dasd_path_clear_nonpreferred(device, chp);
 }
 
+static inline void dasd_path_fcsec_update(struct dasd_device *device, int chp)
+{
+       dasd_path_fcsec(device, chp);
+}
+
 /*
  * remove all paths from normal operation
  */