* [PATCH] amd_iommu: IO_PAGE_FAULTs on unity mapped regions during amd_iommu_init()
@ 2013-02-07 2:53 Shuah Khan
2013-02-07 10:49 ` Ingo Molnar
0 siblings, 1 reply; 6+ messages in thread
From: Shuah Khan @ 2013-02-07 2:53 UTC (permalink / raw)
To: Joerg Roedel, tglx, hpa, mingo; +Cc: stable, iommu, Greg KH, x86, shuahkhan
When dma_ops are initialized the unity mappings are created. The
init_device_table_dma() function makes sure DMA from all devices is
blocked by default. This opens a short window in time where DMA to
unity mapped regions is blocked by the IOMMU. Make sure this does not
happen by initializing the device table after dma_ops.
Reference: http://www.gossamer-threads.com/lists/linux/kernel/1670769
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
CC: stable@vger.kernel.org 3.0
---
arch/x86/kernel/amd_iommu_init.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 33df6e8..d86aa3f 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -1363,6 +1363,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
*/
static int __init amd_iommu_init(void)
{
+ struct amd_iommu *iommu;
int i, ret = 0;
/*
@@ -1411,9 +1412,6 @@ static int __init amd_iommu_init(void)
if (amd_iommu_pd_alloc_bitmap == NULL)
goto free;
- /* init the device table */
- init_device_table();
-
/*
* let all alias entries point to itself
*/
@@ -1463,6 +1461,12 @@ static int __init amd_iommu_init(void)
if (ret)
goto free_disable;
+ /* init the device table */
+ init_device_table();
+
+ for_each_iommu(iommu)
+ iommu_flush_all_caches(iommu);
+
amd_iommu_init_api();
amd_iommu_init_notifier();
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] amd_iommu: IO_PAGE_FAULTs on unity mapped regions during amd_iommu_init()
2013-02-07 2:53 [PATCH] amd_iommu: IO_PAGE_FAULTs on unity mapped regions during amd_iommu_init() Shuah Khan
@ 2013-02-07 10:49 ` Ingo Molnar
[not found] ` <20130207104905.GC8945-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Ingo Molnar @ 2013-02-07 10:49 UTC (permalink / raw)
To: Shuah Khan
Cc: Greg KH, x86-DgEjT+Ai2ygdnm+yROfE0A, stable,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
mingo-H+wXaHxf7aLQT0dZR+AlfA, shuahkhan-Re5JQEeQqe8AvxtiuMwx3w,
hpa-YMNOUZJC4hwAvxtiuMwx3w, tglx-hfZtesqFncYOwBW4kG4KsQ
* Shuah Khan <shuah.khan-VXdhtT5mjnY@public.gmane.org> wrote:
> When dma_ops are initialized the unity mappings are created. The
> init_device_table_dma() function makes sure DMA from all devices is
> blocked by default. This opens a short window in time where DMA to
> unity mapped regions is blocked by the IOMMU. Make sure this does not
> happen by initializing the device table after dma_ops.
>
> Reference: http://www.gossamer-threads.com/lists/linux/kernel/1670769
>
> Signed-off-by: Shuah Khan <shuah.khan-VXdhtT5mjnY@public.gmane.org>
> CC: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org 3.0
> ---
> arch/x86/kernel/amd_iommu_init.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
That file does not exist anymore, it died 2.5+ years ago:
403f81d8ee53 iommu/amd: Move missing parts to drivers/iommu
Thanks,
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] amd_iommu: IO_PAGE_FAULTs on unity mapped regions during amd_iommu_init()
@ 2013-02-07 2:45 Shuah Khan
0 siblings, 0 replies; 6+ messages in thread
From: Shuah Khan @ 2013-02-07 2:45 UTC (permalink / raw)
To: Joerg Roedel; +Cc: iommu, stable, Greg KH, shuahkhan
When dma_ops are initialized the unity mappings are created. The
init_device_table_dma() function makes sure DMA from all devices is
blocked by default. This opens a short window in time where DMA to
unity mapped regions is blocked by the IOMMU. Make sure this does not
happen by initializing the device table after dma_ops.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
CC: stable@vger.kernel.org 3.4
---
drivers/iommu/amd_iommu_init.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index ef0ae93..b573f80 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1572,8 +1572,6 @@ int __init amd_iommu_init_hardware(void)
if (amd_iommu_pd_alloc_bitmap == NULL)
goto free;
- /* init the device table */
- init_device_table();
/*
* let all alias entries point to itself
@@ -1655,6 +1653,7 @@ out:
*/
static int __init amd_iommu_init(void)
{
+ struct amd_iommu *iommu;
int ret = 0;
ret = amd_iommu_init_hardware();
@@ -1673,6 +1672,12 @@ static int __init amd_iommu_init(void)
if (ret)
goto free;
+ /* init the device table */
+ init_device_table();
+
+ for_each_iommu(iommu)
+ iommu_flush_all_caches(iommu);
+
amd_iommu_init_api();
x86_platform.iommu_shutdown = disable_iommus;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-02-26 23:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-07 2:53 [PATCH] amd_iommu: IO_PAGE_FAULTs on unity mapped regions during amd_iommu_init() Shuah Khan
2013-02-07 10:49 ` Ingo Molnar
[not found] ` <20130207104905.GC8945-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-02-07 11:07 ` Joerg Roedel
2013-02-07 11:12 ` [v3.0 backport patch] " Ingo Molnar
2013-02-26 23:36 ` [PATCH 3.0] iommu/amd: Initialize device table after dma_ops Shuah Khan
-- strict thread matches above, loose matches on Subject: below --
2013-02-07 2:45 [PATCH] amd_iommu: IO_PAGE_FAULTs on unity mapped regions during amd_iommu_init() Shuah Khan
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).