Skip to contentSkip to conversation

vfio: ccw: Refactoring state changes

PATCH In review Pierre Morel 2 participants 2 messages Oct 17, 2018 – Nov 21, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 4/5 vfio: ccw: Refactoring state changes

Currently, he state machine is hesitating between following the state of the subchannel, the state of the subchannel device, and the state of the mediated device.

The situation leads to unclear state changes
and we need to clarify the situation.

Let's let the guest take care of the subchannel and let us keep track of the mediated device parent in the mediated device driver.

probe() : -> NOT_OPERATIONAL
We have a transtion to the NOT_OPERATIONAL state as soon as the device is bound and the private structure is allocated.
In NOT_OPERATIONAL:
Nothing is done on the subchannel in this state

mdev_create() : -> STANDBY
in STANDBY:
Nothing is done on the subchannel in this state Interruptions should not happen but are cleared if they happen.

mdev_open() : -> IDLE
The subchannel is enabled
In IDLE:
We expect I/O and accept interruptions.

fsm_io_request() : -> BUSY
mdev_write() eventually calls fsm_io_request() which starts the IO
In BUSY:
We refuse I/O and accept interruptions.

vfio_ccw_sch_io_todo() -> IDLE

	If we expected an interruption we process it.
	otherwise we clear it and ignore it.

      bind() unbind()
        |       ^
        v       |
      -------------
      | NOT_OPER  |<---- on Error
      -------------    |
        |       ^      |
     create() remove() |
        v       |      |
      -------------    |
      | STANDBY   |<--- release()
      -------------    |
        |       ^      |
      open() release() |
        v       |      |
      -------------    |
      |   IDLE    |<--- reset()
      -------------    |
        |       ^      |
      write()  irq()   |
        v       |      |
      -------------    |
      |   BUSY    |>----
      -------------
---
 drivers/s390/cio/vfio_ccw_drv.c | 19 +++++++++++++++----
 drivers/s390/cio/vfio_ccw_ops.c | 19 +++++++++----------
 2 files changed, 24 insertions(+), 14 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +15 -4
index 1996353..b29a96f 100644
@@ -63,7 +63,6 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)
 		ret = cio_disable_subchannel(sch);
 	} while (ret == -EBUSY);
 out_unlock:
-	private->state = VFIO_CCW_STATE_NOT_OPER;
 	spin_unlock_irq(sch->lock);
 	return ret;
 }
@@ -80,13 +79,15 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work)
 		cp_update_scsw(&private->cp, &irb->scsw);
 		cp_free(&private->cp);
 	}
+	if (private->state != VFIO_CCW_STATE_BUSY)
+		return;
+
 	memcpy(private->io_region->irb_area, irb, sizeof(*irb));
 
 	if (private->io_trigger)
 		eventfd_signal(private->io_trigger, 1);
 
-	if (private->mdev)
-		private->state = VFIO_CCW_STATE_IDLE;
+	private->state = VFIO_CCW_STATE_IDLE;
 }
 
 /*
@@ -150,6 +151,7 @@ static int vfio_ccw_sch_remove(struct subchannel *sch)
 	struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
 
 	vfio_ccw_sch_quiesce(sch);
+	private->state = VFIO_CCW_STATE_NOT_OPER;
 
 	vfio_ccw_mdev_unreg(sch);
 
@@ -163,7 +165,10 @@ static int vfio_ccw_sch_remove(struct subchannel *sch)
 
 static void vfio_ccw_sch_shutdown(struct subchannel *sch)
 {
+	struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
+
 	vfio_ccw_sch_quiesce(sch);
+	private->state = VFIO_CCW_STATE_NOT_OPER;
 }
 
 /**
@@ -194,12 +199,18 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)
 		rc = 0;
 		goto out_unlock;
 	}
-
+#if 0
+	/*
+	 * We must find a solution to report the change to the guest
+	 * until there I see no need to change the state of the SCH
+	 * here.
+	 */
 	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;
 	}
+#endif
 	rc = 0;
 
 out_unlock:
drivers/s390/cio/vfio_ccw_ops.c +9 -10
index 87a8f8c..765afd7 100644
@@ -36,6 +36,8 @@ static int vfio_ccw_mdev_reset(struct mdev_device *mdev)
 	ret = cio_enable_subchannel(sch, (u32)(unsigned long)sch);
 	if (!ret)
 		private->state = VFIO_CCW_STATE_IDLE;
+	else
+		private->state = VFIO_CCW_STATE_NOT_OPER;
 
 	return ret;
 }
@@ -111,14 +113,11 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev)
 	struct vfio_ccw_private *private =
 		dev_get_drvdata(mdev_parent_dev(mdev));
 
-	if (private->state == VFIO_CCW_STATE_NOT_OPER)
-		return -ENODEV;
-
 	if (atomic_dec_if_positive(&private->avail) < 0)
 		return -EPERM;
 
 	private->mdev = mdev;
-	private->state = VFIO_CCW_STATE_IDLE;
+	private->state = VFIO_CCW_STATE_STANDBY;
 
 	return 0;
 }
@@ -129,11 +128,10 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev)
 		dev_get_drvdata(mdev_parent_dev(mdev));
 
 	if ((private->state != VFIO_CCW_STATE_NOT_OPER) &&
-	    (private->state != VFIO_CCW_STATE_STANDBY)) {
-		if (!vfio_ccw_mdev_reset(mdev))
-			private->state = VFIO_CCW_STATE_STANDBY;
-		/* The state will be NOT_OPER on error. */
-	}
+	    (private->state != VFIO_CCW_STATE_STANDBY))
+		return -EPERM;
+
+	private->state = VFIO_CCW_STATE_NOT_OPER;
 
 	private->mdev = NULL;
 	atomic_inc(&private->avail);
@@ -160,7 +158,7 @@ static int vfio_ccw_mdev_open(struct mdev_device *mdev)
 	if (cio_enable_subchannel(sch, (u32)(unsigned long)sch))
 		goto error;
 
-	private->state = VFIO_CCW_STATE_STANDBY;
+	private->state = VFIO_CCW_STATE_IDLE;
 	spin_unlock_irq(sch->lock);
 	return 0;
 
@@ -177,6 +175,7 @@ static void vfio_ccw_mdev_release(struct mdev_device *mdev)
 		dev_get_drvdata(mdev_parent_dev(mdev));
 
 	vfio_ccw_sch_quiesce(private->sch);
+	private->state = VFIO_CCW_STATE_STANDBY;
 	vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,
 				 &private->nb);
 }
Signature · 1 line
2.7.4
#1 lore raw
Quoted 18 lines · On Wed, 17 Oct 2018 11:18:42 +0200 Pierre Morel <[email protected]> wrote:

Currently, he state machine is hesitating between following the state of the subchannel, the state of the subchannel device, and the state of the mediated device.

The situation leads to unclear state changes
and we need to clarify the situation.

Let's let the guest take care of the subchannel and let us keep track of the mediated device parent in the mediated device driver.

probe() : -> NOT_OPERATIONAL
We have a transtion to the NOT_OPERATIONAL state as soon as the device is bound and the private structure is allocated.
In NOT_OPERATIONAL:
Nothing is done on the subchannel in this state

Quoted 5 lines

mdev_create() : -> STANDBY
in STANDBY:
Nothing is done on the subchannel in this state Interruptions should not happen but are cleared if they happen.

Is there any reason interrupts could happen here? If the subchannel is not enabled, I don't see how we can get them from the hardware, and I would expect transitions to this state disabling the subchannel and clearing any interrupt state that might be in the way beforehand.

Quoted 12 lines

mdev_open() : -> IDLE
The subchannel is enabled
In IDLE:
We expect I/O and accept interruptions.

fsm_io_request() : -> BUSY
mdev_write() eventually calls fsm_io_request() which starts the IO
In BUSY:
We refuse I/O and accept interruptions.

Quoted 3 lines

vfio_ccw_sch_io_todo() -> IDLE
If we expected an interruption we process it. otherwise we clear it and ignore it.

Should we do something for unsolicited interrupts? (Pass them on?)

Quoted 17 lines
      bind() unbind()
        |       ^
        v       |
      -------------
      | NOT_OPER  |<---- on Error
      -------------    |
        |       ^      |
     create() remove() |
        v       |      |
      -------------    |
      | STANDBY   |<--- release()
      -------------    |
        |       ^      |
      open() release() |
        v       |      |
      -------------    |
Quoted 8 lines
      |   IDLE    |<--- reset()
      -------------    |
        |       ^      |
      write()  irq()   |
        v       |      |
      -------------    |
      |   BUSY    |>----
      -------------

This diagram and the explanations are too useful to hide in a patch description :) Maybe put at least some of the info into the fsm source file?

Quoted 6 lines
---
 drivers/s390/cio/vfio_ccw_drv.c | 19 +++++++++++++++----
 drivers/s390/cio/vfio_ccw_ops.c | 19 +++++++++----------
 2 files changed, 24 insertions(+), 14 deletions(-)

(...)

drivers/s390/cio/vfio_ccw_drv.c static int vfio_ccw_sch_event(struct subchannel *sch, int process) · line 206

Quoted 10 lines
drivers/s390/cio/vfio_ccw_drv.c +5 -1
@@ -194,12 +199,18 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)
 		rc = 0;
 		goto out_unlock;
 	}
-
+#if 0
+	/*
+	 * We must find a solution to report the change to the guest
+	 * until there I see no need to change the state of the SCH
+	 * here.

Hm? I don't think the guest is involved, unless you end up changing the availability to the guest (operational vs. not operational). My guess is that this function should do something similar to the callback used by the normal I/O subchannel driver, only simpler as we don't support a disconnected state.

Quoted 15 lines
drivers/s390/cio/vfio_ccw_drv.c +2 -0
+	 */
 	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;
 	}
+#endif
 	rc = 0;
 
 out_unlock:
drivers/s390/cio/vfio_ccw_ops.c +0 -0
index 87a8f8c..765afd7 100644

drivers/s390/cio/vfio_ccw_ops.c static int vfio_ccw_mdev_reset(struct mdev_device *mdev) · line 40

Quoted 5 lines
drivers/s390/cio/vfio_ccw_ops.c +2 -0
@@ -36,6 +36,8 @@ static int vfio_ccw_mdev_reset(struct mdev_device *mdev)
 	ret = cio_enable_subchannel(sch, (u32)(unsigned long)sch);
 	if (!ret)
 		private->state = VFIO_CCW_STATE_IDLE;
+	else
+		private->state = VFIO_CCW_STATE_NOT_OPER;

private->state = ret ? VFIO_CCW_STATE_NOT_OPER : VFIO_CCW_STATE_IDLE;

?

Quoted 3 lines
drivers/s390/cio/vfio_ccw_ops.c +0 -0
 	return ret;
 }