[PATCH 1/2] x86/amd-iommu: enable iommu before attaching devices
Joerg Roedel
joro at 8bytes.org
Fri Apr 2 05:11:18 EDT 2010
On Thu, Apr 01, 2010 at 06:23:53PM -0700, Chris Wright wrote:
> Hit another kdump problem as reported by Neil Horman. When initializaing
> the IOMMU, we attach devices to their domains before the IOMMU is
> fully (re)initialized. Attaching a device will issue some important
> invalidations. In the context of the newly kexec'd kdump kernel, the
> IOMMU may have stale cached data from the original kernel. Because we
> do the attach too early, the invalidation commands are placed in the new
> command buffer before the IOMMU is updated w/ that buffer. This leaves
> the stale entries in the kdump context and can renders device unusable.
> Simply enable the IOMMU before we do the attach.
>
> Cc: Neil Horman <nhorman at tuxdriver.com>
> Cc: Vivek Goyal <vgoyal at redhat.com>
> Signed-off-by: Chris Wright <chrisw at sous-sol.org>
> ---
> arch/x86/kernel/amd_iommu_init.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- a/arch/x86/kernel/amd_iommu_init.c
> +++ b/arch/x86/kernel/amd_iommu_init.c
> @@ -1288,6 +1288,8 @@ static int __init amd_iommu_init(void)
> if (ret)
> goto free;
>
> + enable_iommus();
> +
> if (iommu_pass_through)
> ret = amd_iommu_init_passthrough();
> else
> @@ -1300,8 +1302,6 @@ static int __init amd_iommu_init(void)
>
> amd_iommu_init_notifier();
>
> - enable_iommus();
> -
> if (iommu_pass_through)
> goto out;
Ok, good to know this fixes the problem. One issue: If the
initialization of the domains fails the iommu hardware needs to be
disabled again in the free path.
Thanks,
Joerg
More information about the kexec
mailing list