From: Joerg Roedel <joro@8bytes.org> To: iommu@lists.linux-foundation.org Cc: David Woodhouse <dwmw2@infradead.org>, zhen-hual@hp.com, bhe@redhat.com, linux-kernel@vger.kernel.org, Joerg Roedel <jroedel@suse.de> Subject: [PATCH 4/4] iommu/vt-d: Make sure si_domain is allocated for kdump kernel Date: Thu, 11 Jun 2015 15:47:43 +0200 [thread overview] Message-ID: <1434030463-942-5-git-send-email-joro@8bytes.org> (raw) In-Reply-To: <1434030463-942-1-git-send-email-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> The si_domain needs to be allocated in the kdump kernel too. Otherwise the iommu=pt case breaks with a panic of the kdump kernel. Signed-off-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/intel-iommu.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index fcb9310..e5af94a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2781,10 +2781,6 @@ static int __init iommu_prepare_static_identity_mapping(int hw) int i; int ret = 0; - ret = si_domain_init(hw); - if (ret) - return -EFAULT; - for_each_pci_dev(pdev) { ret = dev_prepare_static_identity_mapping(&pdev->dev, hw); if (ret) @@ -2798,7 +2794,7 @@ static int __init iommu_prepare_static_identity_mapping(int hw) if (dev->bus != &acpi_bus_type) continue; - + adev= to_acpi_device(dev); mutex_lock(&adev->physical_node_lock); list_for_each_entry(pn, &adev->physical_node_list, node) { @@ -2979,9 +2975,20 @@ static int __init init_dmars(void) check_tylersburg_isoch(); /* - * In the second kernel: Skip setting-up new domains for - * si, rmrr, and the isa bus on the expectation that these - * translations were copied from the old kernel. + * Make sure the si_domain is allocated in the case we are in a + * kdump kernel. + */ + if (iommu_identity_mapping) { + ret = si_domain_init(hw_pass_through); + if (ret) + goto free_iommu; + } + + /* + * In the second kernel: Skip setting-up new domains for rmrr + * and the isa bus, they will be allocated and assigned on the + * first DMA-API call. This is to keep the old mappings alive + * until the device driver of the kdump kernel takes over. */ if (g_translation_pre_enabled) goto skip_new_domains_for_si_rmrr_isa; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>, zhen-hual-VXdhtT5mjnY@public.gmane.org, David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Subject: [PATCH 4/4] iommu/vt-d: Make sure si_domain is allocated for kdump kernel Date: Thu, 11 Jun 2015 15:47:43 +0200 [thread overview] Message-ID: <1434030463-942-5-git-send-email-joro@8bytes.org> (raw) In-Reply-To: <1434030463-942-1-git-send-email-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org> The si_domain needs to be allocated in the kdump kernel too. Otherwise the iommu=pt case breaks with a panic of the kdump kernel. Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org> --- drivers/iommu/intel-iommu.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index fcb9310..e5af94a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2781,10 +2781,6 @@ static int __init iommu_prepare_static_identity_mapping(int hw) int i; int ret = 0; - ret = si_domain_init(hw); - if (ret) - return -EFAULT; - for_each_pci_dev(pdev) { ret = dev_prepare_static_identity_mapping(&pdev->dev, hw); if (ret) @@ -2798,7 +2794,7 @@ static int __init iommu_prepare_static_identity_mapping(int hw) if (dev->bus != &acpi_bus_type) continue; - + adev= to_acpi_device(dev); mutex_lock(&adev->physical_node_lock); list_for_each_entry(pn, &adev->physical_node_list, node) { @@ -2979,9 +2975,20 @@ static int __init init_dmars(void) check_tylersburg_isoch(); /* - * In the second kernel: Skip setting-up new domains for - * si, rmrr, and the isa bus on the expectation that these - * translations were copied from the old kernel. + * Make sure the si_domain is allocated in the case we are in a + * kdump kernel. + */ + if (iommu_identity_mapping) { + ret = si_domain_init(hw_pass_through); + if (ret) + goto free_iommu; + } + + /* + * In the second kernel: Skip setting-up new domains for rmrr + * and the isa bus, they will be allocated and assigned on the + * first DMA-API call. This is to keep the old mappings alive + * until the device driver of the kdump kernel takes over. */ if (g_translation_pre_enabled) goto skip_new_domains_for_si_rmrr_isa; -- 1.9.1
next prev parent reply other threads:[~2015-06-11 13:48 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-11 13:47 [PATCH 0/4] More cleanups and fixes for Intel VT-d Joerg Roedel 2015-06-11 13:47 ` Joerg Roedel 2015-06-11 13:47 ` [PATCH 1/4] iommu/vt-d: Remove iommu_attach_domain_with_id() Joerg Roedel 2015-06-11 13:47 ` Joerg Roedel 2015-06-11 13:47 ` [PATCH 2/4] iommu/vt-d: Don't consider copied context entries as present Joerg Roedel 2015-06-11 13:47 ` Joerg Roedel 2015-06-11 14:07 ` David Woodhouse 2015-06-11 14:07 ` David Woodhouse 2015-06-11 14:12 ` Joerg Roedel 2015-06-11 14:12 ` Joerg Roedel 2015-06-11 14:19 ` David Woodhouse 2015-06-11 14:19 ` David Woodhouse 2015-06-11 14:25 ` Joerg Roedel 2015-06-11 14:25 ` Joerg Roedel 2015-06-11 14:44 ` David Woodhouse 2015-06-11 15:12 ` David Woodhouse 2015-06-11 14:51 ` Joerg Roedel 2015-06-11 14:51 ` Joerg Roedel 2015-06-11 13:47 ` [PATCH 3/4] iommu/vt-d: Remove unmap_device_dma() Joerg Roedel 2015-06-11 13:47 ` Joerg Roedel 2015-06-11 13:47 ` Joerg Roedel [this message] 2015-06-11 13:47 ` [PATCH 4/4] iommu/vt-d: Make sure si_domain is allocated for kdump kernel Joerg Roedel 2015-06-11 15:54 ` [PATCH 0/4] More cleanups and fixes for Intel VT-d David Woodhouse 2015-06-11 15:54 ` David Woodhouse 2015-06-12 7:31 ` Joerg Roedel 2015-06-12 20:29 ` Joerg Roedel 2015-06-12 20:29 ` Joerg Roedel
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=1434030463-942-5-git-send-email-joro@8bytes.org \ --to=joro@8bytes.org \ --cc=bhe@redhat.com \ --cc=dwmw2@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jroedel@suse.de \ --cc=linux-kernel@vger.kernel.org \ --cc=zhen-hual@hp.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: 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.