From: Matthew Rosato <mjrosato@linux.ibm.com>
To: Eric Farman <farman@linux.ibm.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
Alex Williamson <alex.williamson@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>,
kvm@vger.kernel.org, linux-s390@vger.kernel.org
Subject: Re: [PATCH v3 09/11] vfio/ccw: Create a CLOSE FSM event
Date: Tue, 5 Jul 2022 15:29:19 -0400 [thread overview]
Message-ID: <67a0cc2d-2489-7022-5dce-033a6dd5f030@linux.ibm.com> (raw)
In-Reply-To: <20220630203647.2529815-10-farman@linux.ibm.com>
On 6/30/22 4:36 PM, Eric Farman wrote:
> Refactor the vfio_ccw_sch_quiesce() routine to extract the bit that
> disables the subchannel and affects the FSM state. Use this to form
> the basis of a CLOSE event that will mirror the OPEN event, and move
> the subchannel back to NOT_OPER state.
>
> A key difference with that mirroring is that while OPEN handles the
> transition from NOT_OPER => STANDBY, the later probing of the mdev
> handles the transition from STANDBY => IDLE. On the other hand,
> the CLOSE event will move from one of the operating states {IDLE,
> CP_PROCESSING, CP_PENDING} => NOT_OPER. That is, there is no stop
> in a STANDBY state on the deconfigure path.
>
> Add a call to cp_free() in this event, such that it is captured for
> the various permutations of this event.
>
> In the unlikely event that cio_disable_subchannel() returns -EBUSY,
> the remaining logic of vfio_ccw_sch_quiesce() can still be used.
>
> Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
> ---
> drivers/s390/cio/vfio_ccw_drv.c | 17 +++++------------
> drivers/s390/cio/vfio_ccw_fsm.c | 26 ++++++++++++++++++++++++++
> drivers/s390/cio/vfio_ccw_ops.c | 14 ++------------
> drivers/s390/cio/vfio_ccw_private.h | 1 +
> 4 files changed, 34 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c
> index 7d9189640da3..f98c9915e73d 100644
> --- a/drivers/s390/cio/vfio_ccw_drv.c
> +++ b/drivers/s390/cio/vfio_ccw_drv.c
> @@ -41,13 +41,6 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)
> DECLARE_COMPLETION_ONSTACK(completion);
> int iretry, ret = 0;
>
> - spin_lock_irq(sch->lock);
> - if (!sch->schib.pmcw.ena)
> - goto out_unlock;
> - ret = cio_disable_subchannel(sch);
> - if (ret != -EBUSY)
> - goto out_unlock;
> -
> iretry = 255;
> do {
>
> @@ -74,9 +67,7 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)
> spin_lock_irq(sch->lock);
> ret = cio_disable_subchannel(sch);
> } while (ret == -EBUSY);
> -out_unlock:
> - private->state = VFIO_CCW_STATE_NOT_OPER;
> - spin_unlock_irq(sch->lock);
> +
> return ret;
> }
>
> @@ -256,7 +247,7 @@ static void vfio_ccw_sch_remove(struct subchannel *sch)
> {
> struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
>
> - vfio_ccw_sch_quiesce(sch);
> + vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_CLOSE);
> mdev_unregister_device(&sch->dev);
>
> dev_set_drvdata(&sch->dev, NULL);
> @@ -270,7 +261,9 @@ static void vfio_ccw_sch_remove(struct subchannel *sch)
>
> static void vfio_ccw_sch_shutdown(struct subchannel *sch)
> {
> - vfio_ccw_sch_quiesce(sch);
> + struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
> +
> + vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_CLOSE);
> }
>
> /**
> diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c
> index 2811b2040490..89eb3feffa41 100644
> --- a/drivers/s390/cio/vfio_ccw_fsm.c
> +++ b/drivers/s390/cio/vfio_ccw_fsm.c
> @@ -384,6 +384,27 @@ static void fsm_open(struct vfio_ccw_private *private,
> spin_unlock_irq(sch->lock);
> }
>
> +static void fsm_close(struct vfio_ccw_private *private,
> + enum vfio_ccw_event event)
> +{
> + struct subchannel *sch = private->sch;
> + int ret;
> +
> + spin_lock_irq(sch->lock);
> +
> + if (!sch->schib.pmcw.ena)
> + goto out_unlock;
> +
> + ret = cio_disable_subchannel(sch);
> + if (ret == -EBUSY)
> + vfio_ccw_sch_quiesce(sch);
> +
> +out_unlock:
> + private->state = VFIO_CCW_STATE_NOT_OPER;
> + spin_unlock_irq(sch->lock);
> + cp_free(&private->cp);
> +}
> +
> /*
> * Device statemachine
> */
> @@ -394,6 +415,7 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {
> [VFIO_CCW_EVENT_ASYNC_REQ] = fsm_async_error,
> [VFIO_CCW_EVENT_INTERRUPT] = fsm_disabled_irq,
> [VFIO_CCW_EVENT_OPEN] = fsm_open,
> + [VFIO_CCW_EVENT_CLOSE] = fsm_nop,
> },
> [VFIO_CCW_STATE_STANDBY] = {
> [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper,
> @@ -401,6 +423,7 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {
> [VFIO_CCW_EVENT_ASYNC_REQ] = fsm_async_error,
> [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq,
> [VFIO_CCW_EVENT_OPEN] = fsm_notoper,
> + [VFIO_CCW_EVENT_CLOSE] = fsm_close,
> },
> [VFIO_CCW_STATE_IDLE] = {
> [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper,
> @@ -408,6 +431,7 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {
> [VFIO_CCW_EVENT_ASYNC_REQ] = fsm_async_request,
> [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq,
> [VFIO_CCW_EVENT_OPEN] = fsm_notoper,
> + [VFIO_CCW_EVENT_CLOSE] = fsm_close,
> },
> [VFIO_CCW_STATE_CP_PROCESSING] = {
> [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper,
> @@ -415,6 +439,7 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {
> [VFIO_CCW_EVENT_ASYNC_REQ] = fsm_async_retry,
> [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq,
> [VFIO_CCW_EVENT_OPEN] = fsm_notoper,
> + [VFIO_CCW_EVENT_CLOSE] = fsm_close,
> },
> [VFIO_CCW_STATE_CP_PENDING] = {
> [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper,
> @@ -422,5 +447,6 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = {
> [VFIO_CCW_EVENT_ASYNC_REQ] = fsm_async_request,
> [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq,
> [VFIO_CCW_EVENT_OPEN] = fsm_notoper,
> + [VFIO_CCW_EVENT_CLOSE] = fsm_close,
> },
> };
> diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c
> index a7ea9358e461..fc5b83187bd9 100644
> --- a/drivers/s390/cio/vfio_ccw_ops.c
> +++ b/drivers/s390/cio/vfio_ccw_ops.c
> @@ -33,9 +33,7 @@ static int vfio_ccw_mdev_reset(struct vfio_ccw_private *private)
> * There are still a lot more instructions need to be handled. We
> * should come back here later.
> */
> - ret = vfio_ccw_sch_quiesce(sch);
> - if (ret)
> - return ret;
> + vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_CLOSE);
>
> ret = cio_enable_subchannel(sch, (u32)(unsigned long)sch);
> if (!ret)
> @@ -64,7 +62,6 @@ static int vfio_ccw_mdev_notifier(struct notifier_block *nb,
> if (vfio_ccw_mdev_reset(private))
> return NOTIFY_BAD;
>
> - cp_free(&private->cp);
> return NOTIFY_OK;
> }
>
> @@ -159,15 +156,9 @@ static void vfio_ccw_mdev_remove(struct mdev_device *mdev)
>
> vfio_unregister_group_dev(&private->vdev);
>
> - if ((private->state != VFIO_CCW_STATE_NOT_OPER) &&
> - (private->state != VFIO_CCW_STATE_STANDBY)) {
> - if (!vfio_ccw_sch_quiesce(private->sch))
> - private->state = VFIO_CCW_STATE_STANDBY;
> - /* The state will be NOT_OPER on error. */
> - }
> + vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_CLOSE);
>
> vfio_uninit_group_dev(&private->vdev);
> - cp_free(&private->cp);
> atomic_inc(&private->avail);
> }
>
> @@ -217,7 +208,6 @@ static void vfio_ccw_mdev_close_device(struct vfio_device *vdev)
> /* The state will be NOT_OPER on error. */
> }
>
> - cp_free(&private->cp);
> vfio_ccw_unregister_dev_regions(private);
> vfio_unregister_notifier(vdev, VFIO_IOMMU_NOTIFY, &private->nb);
> }
> diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h
> index 8dff1699a7d9..435d401b8fb9 100644
> --- a/drivers/s390/cio/vfio_ccw_private.h
> +++ b/drivers/s390/cio/vfio_ccw_private.h
> @@ -143,6 +143,7 @@ enum vfio_ccw_event {
> VFIO_CCW_EVENT_INTERRUPT,
> VFIO_CCW_EVENT_ASYNC_REQ,
> VFIO_CCW_EVENT_OPEN,
> + VFIO_CCW_EVENT_CLOSE,
> /* last element! */
> NR_VFIO_CCW_EVENTS
> };
next prev parent reply other threads:[~2022-07-05 19:29 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 20:36 [PATCH v3 00/11] s390/vfio-ccw rework Eric Farman
2022-06-30 20:36 ` [PATCH v3 01/11] vfio/ccw: Remove UUID from s390 debug log Eric Farman
2022-06-30 20:36 ` [PATCH v3 02/11] vfio/ccw: Fix FSM state if mdev probe fails Eric Farman
2022-06-30 20:36 ` [PATCH v3 03/11] vfio/ccw: Do not change FSM state in subchannel event Eric Farman
2022-06-30 20:36 ` [PATCH v3 04/11] vfio/ccw: Remove private->mdev Eric Farman
2022-06-30 20:36 ` [PATCH v3 05/11] vfio/ccw: Pass enum to FSM event jumptable Eric Farman
2022-06-30 20:36 ` [PATCH v3 06/11] vfio/ccw: Flatten MDEV device (un)register Eric Farman
2022-06-30 20:36 ` [PATCH v3 07/11] vfio/ccw: Update trace data for not operational event Eric Farman
2022-07-05 19:29 ` Matthew Rosato
2022-06-30 20:36 ` [PATCH v3 08/11] vfio/ccw: Create an OPEN FSM Event Eric Farman
2022-07-05 19:29 ` Matthew Rosato
2022-06-30 20:36 ` [PATCH v3 09/11] vfio/ccw: Create a CLOSE FSM event Eric Farman
2022-07-05 19:29 ` Matthew Rosato [this message]
2022-06-30 20:36 ` [PATCH v3 10/11] vfio/ccw: Refactor vfio_ccw_mdev_reset Eric Farman
2022-07-05 19:29 ` Matthew Rosato
2022-06-30 20:36 ` [PATCH v3 11/11] vfio/ccw: Move FSM open/close to MDEV open/close Eric Farman
2022-07-05 20:17 ` Matthew Rosato
2022-06-30 23:44 ` [PATCH v3 00/11] s390/vfio-ccw rework Jason Gunthorpe
2022-07-01 12:40 ` Eric Farman
2022-07-01 12:48 ` Christian Borntraeger
2022-07-04 11:25 ` Jason Gunthorpe
2022-07-07 9:06 ` Christian Borntraeger
2022-07-07 12:34 ` Matthew Rosato
2022-07-07 13:04 ` Christian Borntraeger
2022-07-07 13:11 ` Matthew Rosato
2022-07-04 2:16 ` Yi Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=67a0cc2d-2489-7022-5dce-033a6dd5f030@linux.ibm.com \
--to=mjrosato@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=farman@linux.ibm.com \
--cc=jgg@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.