cio: Remove grace period for vary off chpid.
Subsystems (2)
From: Cornelia Huck <[email protected]>
[S390] cio: Remove grace period for vary off chpid.
The grace period handling introduced needless complexity. It didn't help the dasd driver (which can handle terminated I/O just well), and it doesn't help for long running channel programs (which won't complete during the grace period anyway). Terminating I/O using a path that just disappeared immediately is much more consistent with what the user expects.
Signed-off-by Cornelia Huck <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/cio/chsc.c | 17 +++------- drivers/s390/cio/css.h | 2 - drivers/s390/cio/device.h | 1 drivers/s390/cio/device_fsm.c | 68 ++++-------------------------------------- drivers/s390/cio/device_ops.c | 2 - 5 files changed, 14 insertions(+), 76 deletions(-)
drivers/s390/cio/chsc.c +6 -11
@@ -707,8 +707,7 @@ chp_process_crw(int chpid, int on)return chp_add (chpid); } -static inline int -__check_for_io_and_kill (struct subchannel *sch,int index) +static inline int check_for_io_on_path (struct subchannel *sch,int index) {int cc;
@@ -718,10 +717,8 @@ __check_for_io_and_kill(struct subchanne cc =stsch (sch->schid, &sch->schib);if (cc)return 0 ; -if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == (0x80 >> index)) { -device_set_waiting (sch); +if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == (0x80 >> index))return 1 ; - }return 0 ; }
@@ -750,12 +747,10 @@ __s390_subchannel_vary_chpid(struct subc }else { sch->opm &= ~(0x80 >> chp); sch->lpm &= ~(0x80 >> chp); -/* -* Give running I/O a grace period in which it -* can successfully terminate, even using the -* just varied off path. Then kill it. -*/ -if (!__check_for_io_and_kill (sch, chp) && !sch->lpm) { +if (check_for_io_on_path (sch, chp)) +/* Path verification is done after killing. */ +device_kill_io (sch); +else if (!sch->lpm) {if (css_enqueue_subchannel_slow (sch->schid)) {css_clear_subchannel_slow_list (); need_rescan =1 ;
drivers/s390/cio/css.h +1 -1
@@ -170,7 +170,7 @@ void device_trigger_reprobe(struct subch/* Helper functions for vary on/off. */ int device_is_online (struct subchannel *); -void device_set_waiting (struct subchannel *); +void device_kill_io (struct subchannel *);/* Machine check helper function. */ void device_kill_pending_timer (struct subchannel *);
drivers/s390/cio/device_fsm.c +7 -61
107 lines not on this page · raw message
drivers/s390/cio/device.h +0 -1
@@ -21,7 +21,6 @@ enum dev_state {/* states to wait for i/o completion before doing something */ DEV_STATE_CLEAR_VERIFY ,DEV_STATE_TIMEOUT_KILL , -DEV_STATE_WAIT4IO ,DEV_STATE_QUIESCE ,/* special states for devices gone not operational */ DEV_STATE_DISCONNECTED,
drivers/s390/cio/device_ops.c +0 -2
@@ -50,7 +50,6 @@ ccw_device_clear(struct ccw_device *cdevif (cdev->private->state ==DEV_STATE_NOT_OPER )return -ENODEV ;if (cdev->private->state !=DEV_STATE_ONLINE && - cdev->private->state !=DEV_STATE_WAIT4IO && cdev->private->state !=DEV_STATE_W4SENSE )return -EINVAL ; sch =to_subchannel (cdev->dev.parent);
@@ -155,7 +154,6 @@ ccw_device_halt(struct ccw_device *cdev,if (cdev->private->state ==DEV_STATE_NOT_OPER )return -ENODEV ;if (cdev->private->state !=DEV_STATE_ONLINE && - cdev->private->state !=DEV_STATE_WAIT4IO && cdev->private->state !=DEV_STATE_W4SENSE )return -EINVAL ; sch =to_subchannel (cdev->dev.parent);