* [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected
@ 2016-01-22 6:34 Alexey Kardashevskiy
2016-01-22 6:48 ` Alexey Kardashevskiy
2016-01-22 17:24 ` Alex Williamson
0 siblings, 2 replies; 3+ messages in thread
From: Alexey Kardashevskiy @ 2016-01-22 6:34 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Alexey Kardashevskiy, Alex Williamson, kvm, linux-kernel
Recent change 03a76b60 "vfio: Include No-IOMMU mode" disabled VFIO
on systems which do not implement iommu_ops for the PCI bus even though
there is an VFIO IOMMU driver for it such as SPAPR TCE driver for
PPC64/powernv platform.
This moves iommu_present() call under #ifdef CONFIG_VFIO_NOIOMMU as
it is done in the rest of the file to re-enable VFIO on powernv.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
drivers/vfio/vfio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 82f25cc..3f8060e 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -343,7 +343,6 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group,
atomic_set(&group->opened, 0);
group->iommu_group = iommu_group;
group->noiommu = !iommu_present;
-
group->nb.notifier_call = vfio_iommu_group_notifier;
/*
@@ -767,7 +766,11 @@ int vfio_add_group_dev(struct device *dev,
group = vfio_group_get_from_iommu(iommu_group);
if (!group) {
+#ifdef CONFIG_VFIO_NOIOMMU
group = vfio_create_group(iommu_group, iommu_present(dev->bus));
+#else
+ group = vfio_create_group(iommu_group, true);
+#endif
if (IS_ERR(group)) {
iommu_group_put(iommu_group);
return PTR_ERR(group);
--
2.5.0.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected
2016-01-22 6:34 [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected Alexey Kardashevskiy
@ 2016-01-22 6:48 ` Alexey Kardashevskiy
2016-01-22 17:24 ` Alex Williamson
1 sibling, 0 replies; 3+ messages in thread
From: Alexey Kardashevskiy @ 2016-01-22 6:48 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Alex Williamson, kvm, linux-kernel
On 01/22/2016 05:34 PM, Alexey Kardashevskiy wrote:
> Recent change 03a76b60 "vfio: Include No-IOMMU mode" disabled VFIO
> on systems which do not implement iommu_ops for the PCI bus even though
> there is an VFIO IOMMU driver for it such as SPAPR TCE driver for
> PPC64/powernv platform.
>
> This moves iommu_present() call under #ifdef CONFIG_VFIO_NOIOMMU as
> it is done in the rest of the file to re-enable VFIO on powernv.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> drivers/vfio/vfio.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 82f25cc..3f8060e 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -343,7 +343,6 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group,
> atomic_set(&group->opened, 0);
> group->iommu_group = iommu_group;
> group->noiommu = !iommu_present;
> -
Agrh. Unrelated change, repost?
> group->nb.notifier_call = vfio_iommu_group_notifier;
>
> /*
> @@ -767,7 +766,11 @@ int vfio_add_group_dev(struct device *dev,
>
> group = vfio_group_get_from_iommu(iommu_group);
> if (!group) {
> +#ifdef CONFIG_VFIO_NOIOMMU
> group = vfio_create_group(iommu_group, iommu_present(dev->bus));
> +#else
> + group = vfio_create_group(iommu_group, true);
> +#endif
> if (IS_ERR(group)) {
> iommu_group_put(iommu_group);
> return PTR_ERR(group);
>
--
Alexey
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected
2016-01-22 6:34 [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected Alexey Kardashevskiy
2016-01-22 6:48 ` Alexey Kardashevskiy
@ 2016-01-22 17:24 ` Alex Williamson
1 sibling, 0 replies; 3+ messages in thread
From: Alex Williamson @ 2016-01-22 17:24 UTC (permalink / raw)
To: Alexey Kardashevskiy, linuxppc-dev; +Cc: kvm, linux-kernel
On Fri, 2016-01-22 at 17:34 +1100, Alexey Kardashevskiy wrote:
> Recent change 03a76b60 "vfio: Include No-IOMMU mode" disabled VFIO
> on systems which do not implement iommu_ops for the PCI bus even
> though
> there is an VFIO IOMMU driver for it such as SPAPR TCE driver for
> PPC64/powernv platform.
>
> This moves iommu_present() call under #ifdef CONFIG_VFIO_NOIOMMU as
> it is done in the rest of the file to re-enable VFIO on powernv.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> drivers/vfio/vfio.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 82f25cc..3f8060e 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -343,7 +343,6 @@ static struct vfio_group
> *vfio_create_group(struct iommu_group *iommu_group,
> atomic_set(&group->opened, 0);
> group->iommu_group = iommu_group;
> group->noiommu = !iommu_present;
> -
> group->nb.notifier_call = vfio_iommu_group_notifier;
>
> /*
> @@ -767,7 +766,11 @@ int vfio_add_group_dev(struct device *dev,
>
> group = vfio_group_get_from_iommu(iommu_group);
> if (!group) {
> +#ifdef CONFIG_VFIO_NOIOMMU
> group = vfio_create_group(iommu_group,
> iommu_present(dev->bus));
> +#else
> + group = vfio_create_group(iommu_group, true);
> +#endif
> if (IS_ERR(group)) {
> iommu_group_put(iommu_group);
> return PTR_ERR(group);
A serious problem indeed, but this isn't the right solution. I've
copied you on a patch that I think fixes it. Please verify. Thanks,
Alex
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-22 17:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-22 6:34 [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected Alexey Kardashevskiy
2016-01-22 6:48 ` Alexey Kardashevskiy
2016-01-22 17:24 ` Alex Williamson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).