From: Lianbo Jiang <lijiang@redhat.com> To: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, akpm@linux-foundation.org, dan.j.williams@intel.com, thomas.lendacky@amd.com, bhelgaas@google.com, baiyaowei@cmss.chinamobile.com, tiwai@suse.de, bp@suse.de, brijesh.singh@amd.com, dyoung@redhat.com, bhe@redhat.com, jroedel@suse.de Subject: [PATCH v7 RESEND 3/4] iommu/amd: Remap the device table of IOMMU with the memory encryption mask for kdump Date: Thu, 27 Sep 2018 15:19:53 +0800 [thread overview] Message-ID: <20180927071954.29615-4-lijiang@redhat.com> (raw) In-Reply-To: <20180927071954.29615-1-lijiang@redhat.com> In kdump kernel, it will copy the device table of IOMMU from the old device table, which is encrypted when SME is enabled in the first kernel. So we have to remap the old device table with the memory encryption mask. Signed-off-by: Lianbo Jiang <lijiang@redhat.com> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Acked-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/amd_iommu_init.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 84b3e4445d46..3931c7de7c69 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -902,12 +902,22 @@ static bool copy_device_table(void) } } - old_devtb_phys = entry & PAGE_MASK; + /* + * When SME is enabled in the first kernel, the entry includes the + * memory encryption mask(sme_me_mask), we must remove the memory + * encryption mask to obtain the true physical address in kdump kernel. + */ + old_devtb_phys = __sme_clr(entry) & PAGE_MASK; + if (old_devtb_phys >= 0x100000000ULL) { pr_err("The address of old device table is above 4G, not trustworthy!\n"); return false; } - old_devtb = memremap(old_devtb_phys, dev_table_size, MEMREMAP_WB); + old_devtb = (sme_active() && is_kdump_kernel()) + ? (__force void *)ioremap_encrypted(old_devtb_phys, + dev_table_size) + : memremap(old_devtb_phys, dev_table_size, MEMREMAP_WB); + if (!old_devtb) return false; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Lianbo Jiang <lijiang@redhat.com> To: linux-kernel@vger.kernel.org Cc: thomas.lendacky@amd.com, jroedel@suse.de, brijesh.singh@amd.com, bhe@redhat.com, tiwai@suse.de, x86@kernel.org, kexec@lists.infradead.org, mingo@redhat.com, baiyaowei@cmss.chinamobile.com, hpa@zytor.com, bhelgaas@google.com, tglx@linutronix.de, bp@suse.de, dyoung@redhat.com, akpm@linux-foundation.org, dan.j.williams@intel.com Subject: [PATCH v7 RESEND 3/4] iommu/amd: Remap the device table of IOMMU with the memory encryption mask for kdump Date: Thu, 27 Sep 2018 15:19:53 +0800 [thread overview] Message-ID: <20180927071954.29615-4-lijiang@redhat.com> (raw) In-Reply-To: <20180927071954.29615-1-lijiang@redhat.com> In kdump kernel, it will copy the device table of IOMMU from the old device table, which is encrypted when SME is enabled in the first kernel. So we have to remap the old device table with the memory encryption mask. Signed-off-by: Lianbo Jiang <lijiang@redhat.com> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Acked-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/amd_iommu_init.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 84b3e4445d46..3931c7de7c69 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -902,12 +902,22 @@ static bool copy_device_table(void) } } - old_devtb_phys = entry & PAGE_MASK; + /* + * When SME is enabled in the first kernel, the entry includes the + * memory encryption mask(sme_me_mask), we must remove the memory + * encryption mask to obtain the true physical address in kdump kernel. + */ + old_devtb_phys = __sme_clr(entry) & PAGE_MASK; + if (old_devtb_phys >= 0x100000000ULL) { pr_err("The address of old device table is above 4G, not trustworthy!\n"); return false; } - old_devtb = memremap(old_devtb_phys, dev_table_size, MEMREMAP_WB); + old_devtb = (sme_active() && is_kdump_kernel()) + ? (__force void *)ioremap_encrypted(old_devtb_phys, + dev_table_size) + : memremap(old_devtb_phys, dev_table_size, MEMREMAP_WB); + if (!old_devtb) return false; -- 2.17.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2018-09-27 7:21 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-27 7:19 [PATCH v7 RESEND 0/4] Support kdump for AMD secure memory encryption(SME) Lianbo Jiang 2018-09-27 7:19 ` Lianbo Jiang 2018-09-27 7:19 ` [PATCH v7 RESEND 1/4] x86/ioremap: add a function ioremap_encrypted() to remap kdump old memory Lianbo Jiang 2018-09-27 7:19 ` Lianbo Jiang 2018-09-27 13:17 ` Borislav Petkov 2018-09-27 13:17 ` Borislav Petkov 2018-09-27 14:53 ` lijiang 2018-09-27 14:53 ` lijiang 2018-09-27 16:10 ` Borislav Petkov 2018-09-27 16:10 ` Borislav Petkov 2018-09-28 0:33 ` lijiang 2018-09-28 0:33 ` lijiang 2018-10-06 11:45 ` [tip:x86/mm] x86/ioremap: Add an ioremap_encrypted() helper tip-bot for Lianbo Jiang 2018-09-27 7:19 ` [PATCH v7 RESEND 2/4] kexec: allocate unencrypted control pages for kdump in case SME is enabled Lianbo Jiang 2018-09-27 7:19 ` Lianbo Jiang 2018-09-27 16:53 ` Borislav Petkov 2018-09-27 16:53 ` Borislav Petkov 2018-09-28 3:52 ` lijiang 2018-09-28 3:52 ` lijiang 2018-09-28 7:57 ` Borislav Petkov 2018-09-28 7:57 ` Borislav Petkov 2018-09-28 10:09 ` lijiang 2018-09-28 10:09 ` lijiang 2018-09-29 8:53 ` Borislav Petkov 2018-09-29 8:53 ` Borislav Petkov 2018-09-27 7:19 ` Lianbo Jiang [this message] 2018-09-27 7:19 ` [PATCH v7 RESEND 3/4] iommu/amd: Remap the device table of IOMMU with the memory encryption mask for kdump Lianbo Jiang 2018-09-27 7:19 ` [PATCH v7 RESEND 4/4] kdump/vmcore: support encrypted old memory with SME enabled Lianbo Jiang 2018-09-27 7:19 ` Lianbo Jiang 2018-09-28 8:38 ` Borislav Petkov 2018-09-28 8:38 ` Borislav Petkov 2018-09-29 6:24 ` lijiang 2018-09-29 6:24 ` lijiang 2018-09-29 8:30 ` Borislav Petkov 2018-09-29 8:30 ` Borislav Petkov 2018-09-29 9:36 ` lijiang 2018-09-29 9:36 ` lijiang
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=20180927071954.29615-4-lijiang@redhat.com \ --to=lijiang@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=baiyaowei@cmss.chinamobile.com \ --cc=bhe@redhat.com \ --cc=bhelgaas@google.com \ --cc=bp@suse.de \ --cc=brijesh.singh@amd.com \ --cc=dan.j.williams@intel.com \ --cc=dyoung@redhat.com \ --cc=hpa@zytor.com \ --cc=jroedel@suse.de \ --cc=kexec@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=thomas.lendacky@amd.com \ --cc=tiwai@suse.de \ --cc=x86@kernel.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.