Commit 6c02ac4c authored by Eric Farman's avatar Eric Farman Committed by Cornelia Huck
Browse files

vfio-ccw: Reset FSM state to IDLE inside FSM 



When an I/O request is made, the fsm_io_request() routine
moves the FSM state from IDLE to CP_PROCESSING, and then
fsm_io_helper() moves it to CP_PENDING if the START SUBCHANNEL
received a cc0. Yet, the error case to go from CP_PROCESSING
back to IDLE is done after the FSM call returns.

Let's move this up into the FSM proper, to provide some
better symmetry when unwinding in this case.

Signed-off-by: default avatarEric Farman <farman@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Message-Id: <20210511195631.3995081-3-farman@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent c6c82e0c

drivers/s390/cio/vfio_ccw_fsm.c

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ static void fsm_io_request(struct vfio_ccw_private *private, 
	}



err_out:

	private->state = VFIO_CCW_STATE_IDLE;

	trace_vfio_ccw_fsm_io_request(scsw->cmd.fctl, schid,

				      io_region->ret_code, errstr);

}

drivers/s390/cio/vfio_ccw_ops.c

+0 −2
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ static ssize_t vfio_ccw_mdev_write_io_region(struct vfio_ccw_private *private, 
	}



	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_IO_REQ);

	if (region->ret_code != 0)

		private->state = VFIO_CCW_STATE_IDLE;

	ret = (region->ret_code != 0) ? region->ret_code : count;



out_unlock: