On Thu, 26 Apr 2018 14:59:54 +0800The first part is moved to fsm_sch_event()
Dong Jia Shi <bjsdjshi@xxxxxxxxxxxxxxxxxx> wrote:
* Pierre Morel <pmorel@xxxxxxxxxxxxxxxxxx> [2018-04-19 16:48:06 +0200]:Indeed. Will you send a patch, or should I hack something up?
The Sub channel event callback is threaded using workqueues.Just realized that this has a bug in the orignal implementation. For
The work uses the FSM introducing the VFIO_CCW_EVENT_SCH_EVENT
event.
The update of the SCHIB is now done inside the FSM function.
Signed-off-by: Pierre Morel <pmorel@xxxxxxxxxxxxxxxxxx>
---
drivers/s390/cio/vfio_ccw_drv.c | 33 +++++++++++++--------------------
drivers/s390/cio/vfio_ccw_fsm.c | 23 +++++++++++++++++++++++
drivers/s390/cio/vfio_ccw_private.h | 3 +++
3 files changed, 39 insertions(+), 20 deletions(-)
@@ -171,28 +181,11 @@ static void vfio_ccw_sch_shutdown(struct subchannel *sch)
static int vfio_ccw_sch_event(struct subchannel *sch, int process)
{
struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
- unsigned long flags;
- spin_lock_irqsave(sch->lock, flags);
if (!device_is_registered(&sch->dev))
- goto out_unlock;
-
- if (work_pending(&sch->todo_work))
- goto out_unlock;
error out this should return -EAGAIN. We'd need a separated fix on
this.
-This hunk was toatally removed, and this is fine because?
- if (cio_update_schib(sch)) {
- vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_NOT_OPER);
- goto out_unlock;
- }
-
- private = dev_get_drvdata(&sch->dev);
- if (private->state == VFIO_CCW_STATE_NOT_OPER) {
- private->state = private->mdev ? VFIO_CCW_STATE_IDLE :
- VFIO_CCW_STATE_STANDBY;
- }
:) yes, forgot the -1 from the first tests.-ENODEV looks more fitting, if we decide to go with this rework.
--1 is not a valid code.
-out_unlock:
- spin_unlock_irqrestore(sch->lock, flags);
+ return -1;
I'm wondering why this should always be done via a workqueue. It seems+ WARN_ON(work_pending(&private->event_work));
+ queue_work(vfio_ccw_work_q, &private->event_work);
return 0;
}
the other subchannel types try to do as much as possible immediately?
(And returning -EAGAIN already triggers the css code to schedule
another call later.)