From: Auger Eric <eric.auger@redhat.com> To: Sinan Kaya <okaya@codeaurora.org>, kvm@vger.kernel.org, timur@codeaurora.org, cov@codeaurora.org, jcm@redhat.com, eric.auger@linaro.org Cc: linux-acpi@vger.kernel.org, agross@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Baptiste Reynal <b.reynal@virtualopensystems.com>, Alex Williamson <alex.williamson@redhat.com>, linux-kernel@vger.kernel.org Subject: Re: [PATCH V6 6/8] vfio, platform: make reset driver a requirement by default Date: Tue, 7 Jun 2016 21:59:56 +0200 [thread overview] Message-ID: <c3538f11-d206-1ffc-35e0-ff5a7672c7d9@redhat.com> (raw) In-Reply-To: <1464472878-27176-7-git-send-email-okaya@codeaurora.org> Le 29/05/2016 à 00:01, Sinan Kaya a écrit : > The code was allowing platform devices to be used without a supporting > VFIO reset driver. The hardware can be left in some inconsistent state > after a guest machine abort. > > The reset driver will put the hardware back to safe state and disable > interrupts before returning the control back to the host machine. > > Adding a new reset_required kernel module option to AMBA and platform > VFIO drivers with a default value of true. > > New requirements are: > 1. A reset function needs to be implemented by the corresponding driver > via DT/ACPI. > 2. The reset function needs to be discovered via DT/ACPI. > > The probe of the driver will fail if any of the above conditions are > not satisfied. > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > --- > drivers/vfio/platform/vfio_amba.c | 5 +++++ > drivers/vfio/platform/vfio_platform.c | 5 +++++ > drivers/vfio/platform/vfio_platform_common.c | 14 +++++++++++--- > drivers/vfio/platform/vfio_platform_private.h | 1 + > 4 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c > index a66479b..7585902 100644 > --- a/drivers/vfio/platform/vfio_amba.c > +++ b/drivers/vfio/platform/vfio_amba.c > @@ -23,6 +23,10 @@ > #define DRIVER_AUTHOR "Antonios Motakis <a.motakis@virtualopensystems.com>" > #define DRIVER_DESC "VFIO for AMBA devices - User Level meta-driver" > > +static bool reset_required = true; > +module_param(reset_required, bool, 0644); > +MODULE_PARM_DESC(reset_required, "override reset requirement (default: 1)"); > + > /* probing devices from the AMBA bus */ > > static struct resource *get_amba_resource(struct vfio_platform_device *vdev, > @@ -68,6 +72,7 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) > vdev->get_resource = get_amba_resource; > vdev->get_irq = get_amba_irq; > vdev->parent_module = THIS_MODULE; > + vdev->reset_required = reset_required; > > ret = vfio_platform_probe_common(vdev, &adev->dev); > if (ret) { > diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c > index b1cc3a7..ef89146 100644 > --- a/drivers/vfio/platform/vfio_platform.c > +++ b/drivers/vfio/platform/vfio_platform.c > @@ -23,6 +23,10 @@ > #define DRIVER_AUTHOR "Antonios Motakis <a.motakis@virtualopensystems.com>" > #define DRIVER_DESC "VFIO for platform devices - User Level meta-driver" > > +static bool reset_required = true; > +module_param(reset_required, bool, 0644); > +MODULE_PARM_DESC(reset_required, "override reset requirement (default: 1)"); > + > /* probing devices from the linux platform bus */ > > static struct resource *get_platform_resource(struct vfio_platform_device *vdev, > @@ -66,6 +70,7 @@ static int vfio_platform_probe(struct platform_device *pdev) > vdev->get_resource = get_platform_resource; > vdev->get_irq = get_platform_irq; > vdev->parent_module = THIS_MODULE; > + vdev->reset_required = reset_required; > > ret = vfio_platform_probe_common(vdev, &pdev->dev); > if (ret) > diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c > index 0ea8c26..e87ceab 100644 > --- a/drivers/vfio/platform/vfio_platform_common.c > +++ b/drivers/vfio/platform/vfio_platform_common.c > @@ -128,10 +128,10 @@ static bool vfio_platform_has_reset(struct vfio_platform_device *vdev) > return vdev->of_reset ? true : false; > } > > -static void vfio_platform_get_reset(struct vfio_platform_device *vdev) > +static int vfio_platform_get_reset(struct vfio_platform_device *vdev) > { > if (vdev->acpihid) > - return; > + return vfio_platform_acpi_has_reset(vdev) ? 0 : -ENOENT; > > vdev->of_reset = vfio_platform_lookup_reset(vdev->compat, > &vdev->reset_module); > @@ -140,6 +140,8 @@ static void vfio_platform_get_reset(struct vfio_platform_device *vdev) > vdev->of_reset = vfio_platform_lookup_reset(vdev->compat, > &vdev->reset_module); > } > + > + return vdev->of_reset ? 0 : -ENOENT; > } > > static void vfio_platform_put_reset(struct vfio_platform_device *vdev) > @@ -675,7 +677,13 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, > return ret; > } > > - vfio_platform_get_reset(vdev); > + ret = vfio_platform_get_reset(vdev); > + if (ret && vdev->reset_required) { > + pr_err("vfio: no reset function found for device %s\n", > + vdev->name); > + iommu_group_put(group); > + return ret; nit: in case you respin you can factorize the group put and return ret in a goto label (since also used above). Besides Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > + } > > mutex_init(&vdev->igate); > > diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h > index ba9e4f8..68fbc00 100644 > --- a/drivers/vfio/platform/vfio_platform_private.h > +++ b/drivers/vfio/platform/vfio_platform_private.h > @@ -50,6 +50,7 @@ struct vfio_platform_region { > }; > > struct vfio_platform_device { > + bool reset_required; > struct vfio_platform_region *regions; > u32 num_regions; > struct vfio_platform_irq *irqs; >
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@redhat.com (Auger Eric) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V6 6/8] vfio, platform: make reset driver a requirement by default Date: Tue, 7 Jun 2016 21:59:56 +0200 [thread overview] Message-ID: <c3538f11-d206-1ffc-35e0-ff5a7672c7d9@redhat.com> (raw) In-Reply-To: <1464472878-27176-7-git-send-email-okaya@codeaurora.org> Le 29/05/2016 ? 00:01, Sinan Kaya a ?crit : > The code was allowing platform devices to be used without a supporting > VFIO reset driver. The hardware can be left in some inconsistent state > after a guest machine abort. > > The reset driver will put the hardware back to safe state and disable > interrupts before returning the control back to the host machine. > > Adding a new reset_required kernel module option to AMBA and platform > VFIO drivers with a default value of true. > > New requirements are: > 1. A reset function needs to be implemented by the corresponding driver > via DT/ACPI. > 2. The reset function needs to be discovered via DT/ACPI. > > The probe of the driver will fail if any of the above conditions are > not satisfied. > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > --- > drivers/vfio/platform/vfio_amba.c | 5 +++++ > drivers/vfio/platform/vfio_platform.c | 5 +++++ > drivers/vfio/platform/vfio_platform_common.c | 14 +++++++++++--- > drivers/vfio/platform/vfio_platform_private.h | 1 + > 4 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c > index a66479b..7585902 100644 > --- a/drivers/vfio/platform/vfio_amba.c > +++ b/drivers/vfio/platform/vfio_amba.c > @@ -23,6 +23,10 @@ > #define DRIVER_AUTHOR "Antonios Motakis <a.motakis@virtualopensystems.com>" > #define DRIVER_DESC "VFIO for AMBA devices - User Level meta-driver" > > +static bool reset_required = true; > +module_param(reset_required, bool, 0644); > +MODULE_PARM_DESC(reset_required, "override reset requirement (default: 1)"); > + > /* probing devices from the AMBA bus */ > > static struct resource *get_amba_resource(struct vfio_platform_device *vdev, > @@ -68,6 +72,7 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) > vdev->get_resource = get_amba_resource; > vdev->get_irq = get_amba_irq; > vdev->parent_module = THIS_MODULE; > + vdev->reset_required = reset_required; > > ret = vfio_platform_probe_common(vdev, &adev->dev); > if (ret) { > diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c > index b1cc3a7..ef89146 100644 > --- a/drivers/vfio/platform/vfio_platform.c > +++ b/drivers/vfio/platform/vfio_platform.c > @@ -23,6 +23,10 @@ > #define DRIVER_AUTHOR "Antonios Motakis <a.motakis@virtualopensystems.com>" > #define DRIVER_DESC "VFIO for platform devices - User Level meta-driver" > > +static bool reset_required = true; > +module_param(reset_required, bool, 0644); > +MODULE_PARM_DESC(reset_required, "override reset requirement (default: 1)"); > + > /* probing devices from the linux platform bus */ > > static struct resource *get_platform_resource(struct vfio_platform_device *vdev, > @@ -66,6 +70,7 @@ static int vfio_platform_probe(struct platform_device *pdev) > vdev->get_resource = get_platform_resource; > vdev->get_irq = get_platform_irq; > vdev->parent_module = THIS_MODULE; > + vdev->reset_required = reset_required; > > ret = vfio_platform_probe_common(vdev, &pdev->dev); > if (ret) > diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c > index 0ea8c26..e87ceab 100644 > --- a/drivers/vfio/platform/vfio_platform_common.c > +++ b/drivers/vfio/platform/vfio_platform_common.c > @@ -128,10 +128,10 @@ static bool vfio_platform_has_reset(struct vfio_platform_device *vdev) > return vdev->of_reset ? true : false; > } > > -static void vfio_platform_get_reset(struct vfio_platform_device *vdev) > +static int vfio_platform_get_reset(struct vfio_platform_device *vdev) > { > if (vdev->acpihid) > - return; > + return vfio_platform_acpi_has_reset(vdev) ? 0 : -ENOENT; > > vdev->of_reset = vfio_platform_lookup_reset(vdev->compat, > &vdev->reset_module); > @@ -140,6 +140,8 @@ static void vfio_platform_get_reset(struct vfio_platform_device *vdev) > vdev->of_reset = vfio_platform_lookup_reset(vdev->compat, > &vdev->reset_module); > } > + > + return vdev->of_reset ? 0 : -ENOENT; > } > > static void vfio_platform_put_reset(struct vfio_platform_device *vdev) > @@ -675,7 +677,13 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, > return ret; > } > > - vfio_platform_get_reset(vdev); > + ret = vfio_platform_get_reset(vdev); > + if (ret && vdev->reset_required) { > + pr_err("vfio: no reset function found for device %s\n", > + vdev->name); > + iommu_group_put(group); > + return ret; nit: in case you respin you can factorize the group put and return ret in a goto label (since also used above). Besides Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > + } > > mutex_init(&vdev->igate); > > diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h > index ba9e4f8..68fbc00 100644 > --- a/drivers/vfio/platform/vfio_platform_private.h > +++ b/drivers/vfio/platform/vfio_platform_private.h > @@ -50,6 +50,7 @@ struct vfio_platform_region { > }; > > struct vfio_platform_device { > + bool reset_required; > struct vfio_platform_region *regions; > u32 num_regions; > struct vfio_platform_irq *irqs; >
next prev parent reply other threads:[~2016-06-07 19:59 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-28 22:01 [PATCH V6 0/8] vfio, platform: add ACPI support Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 1/8] vfio: platform: move reset call to a common function Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 2/8] vfio: platform: determine reset capability Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 3/8] vfio: platform: add support for ACPI probe Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 4/8] vfio: platform: add extra debug info argument to call reset Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 5/8] vfio: platform: call _RST method when using ACPI Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-06-07 20:14 ` Auger Eric 2016-06-07 20:14 ` Auger Eric 2016-06-07 20:14 ` Auger Eric 2016-06-08 22:31 ` Rafael J. Wysocki 2016-06-08 22:31 ` Rafael J. Wysocki 2016-06-08 22:31 ` Rafael J. Wysocki 2016-06-09 2:33 ` Sinan Kaya 2016-06-09 2:33 ` Sinan Kaya 2016-06-09 2:33 ` Sinan Kaya 2016-06-13 3:41 ` Sinan Kaya 2016-06-13 3:41 ` Sinan Kaya 2016-06-13 3:41 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 6/8] vfio, platform: make reset driver a requirement by default Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-06-07 19:59 ` Auger Eric [this message] 2016-06-07 19:59 ` Auger Eric 2016-06-13 2:32 ` Sinan Kaya 2016-06-13 2:32 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 7/8] vfio: platform: check reset call return code during open Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-06-07 20:21 ` Auger Eric 2016-06-07 20:21 ` Auger Eric 2016-06-13 3:12 ` Sinan Kaya 2016-06-13 3:12 ` Sinan Kaya 2016-05-28 22:01 ` [PATCH V6 8/8] vfio: platform: check reset call return code during release Sinan Kaya 2016-05-28 22:01 ` Sinan Kaya 2016-06-07 20:28 ` Auger Eric 2016-06-07 20:28 ` Auger Eric 2016-06-07 20:28 ` Auger Eric 2016-06-07 20:37 ` [PATCH V6 0/8] vfio, platform: add ACPI support Auger Eric 2016-06-07 20:37 ` Auger Eric
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=c3538f11-d206-1ffc-35e0-ff5a7672c7d9@redhat.com \ --to=eric.auger@redhat.com \ --cc=agross@codeaurora.org \ --cc=alex.williamson@redhat.com \ --cc=b.reynal@virtualopensystems.com \ --cc=cov@codeaurora.org \ --cc=eric.auger@linaro.org \ --cc=jcm@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=okaya@codeaurora.org \ --cc=timur@codeaurora.org \ /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: linkBe 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.