From: Ross Philipson <ross.philipson@oracle.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, iommu@lists.linux-foundation.org, linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org Cc: ross.philipson@oracle.com, dpsmith@apertussolutions.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, luto@amacapital.net, trenchboot-devel@googlegroups.com Subject: [PATCH 11/13] kexec: Secure Launch kexec SEXIT support Date: Thu, 24 Sep 2020 10:58:39 -0400 [thread overview] Message-ID: <1600959521-24158-12-git-send-email-ross.philipson@oracle.com> (raw) In-Reply-To: <1600959521-24158-1-git-send-email-ross.philipson@oracle.com> Prior to running the next kernel via kexec, the Secure Launch code closes down private SMX resources and does an SEXIT. This allows the next kernel to start normally without any issues starting the APs etc. Signed-off-by: Ross Philipson <ross.philipson@oracle.com> --- arch/x86/kernel/slaunch.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/kexec_core.c | 4 +++ 2 files changed, 74 insertions(+) diff --git a/arch/x86/kernel/slaunch.c b/arch/x86/kernel/slaunch.c index 7bdb89e..b2221d8 100644 --- a/arch/x86/kernel/slaunch.c +++ b/arch/x86/kernel/slaunch.c @@ -784,3 +784,73 @@ static void __exit slaunch_exit(void) late_initcall(slaunch_late_init); __exitcall(slaunch_exit); + +static inline void smx_getsec_sexit(void) +{ + asm volatile (".byte 0x0f,0x37\n" + : : "a" (SMX_X86_GETSEC_SEXIT)); +} + +void slaunch_finalize(int do_sexit) +{ + void __iomem *config; + u64 one = 1, val; + + if (!(slaunch_get_flags() & (SL_FLAG_ACTIVE|SL_FLAG_ARCH_TXT))) + return; + + config = ioremap(TXT_PRIV_CONFIG_REGS_BASE, TXT_NR_CONFIG_PAGES * + PAGE_SIZE); + if (!config) { + pr_emerg("Error SEXIT failed to ioremap TXT private reqs\n"); + return; + } + + /* Clear secrets bit for SEXIT */ + memcpy_toio(config + TXT_CR_CMD_NO_SECRETS, &one, sizeof(u64)); + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + + /* Unlock memory configurations */ + memcpy_toio(config + TXT_CR_CMD_UNLOCK_MEM_CONFIG, &one, sizeof(u64)); + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + + /* Close the TXT private register space */ + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + memcpy_toio(config + TXT_CR_CMD_CLOSE_PRIVATE, &one, sizeof(u64)); + + /* + * Calls to iounmap are not being done because of the state of the + * system this late in the kexec process. Local IRQs are disabled and + * iounmap causes a TLB flush which in turn causes a warning. Leaving + * thse mappings is not an issue since the next kernel is going to + * completely re-setup memory management. + */ + + /* Map public registers and do a final read fence */ + config = ioremap(TXT_PUB_CONFIG_REGS_BASE, TXT_NR_CONFIG_PAGES * + PAGE_SIZE); + if (!config) { + pr_emerg("Error SEXIT failed to ioremap TXT public reqs\n"); + return; + } + + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + + pr_emerg("TXT clear secrets bit and unlock memory complete."); + + if (!do_sexit) + return; + + if (smp_processor_id() != 0) { + pr_emerg("Error TXT SEXIT must be called on CPU 0\n"); + return; + } + + /* Disable SMX mode */ + cr4_set_bits(X86_CR4_SMXE); + + /* Do the SEXIT SMX operation */ + smx_getsec_sexit(); + + pr_emerg("TXT SEXIT complete."); +} diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index c19c0da..6b9ac11 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -37,6 +37,7 @@ #include <linux/compiler.h> #include <linux/hugetlb.h> #include <linux/frame.h> +#include <linux/slaunch.h> #include <asm/page.h> #include <asm/sections.h> @@ -1179,6 +1180,9 @@ int kernel_kexec(void) cpu_hotplug_enable(); pr_notice("Starting new kernel\n"); machine_shutdown(); + + /* Finalize TXT registers and do SEXIT */ + slaunch_finalize(1); } machine_kexec(kexec_image); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Ross Philipson <ross.philipson@oracle.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, iommu@lists.linux-foundation.org, linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org Cc: dpsmith@apertussolutions.com, ross.philipson@oracle.com, luto@amacapital.net, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, trenchboot-devel@googlegroups.com Subject: [PATCH 11/13] kexec: Secure Launch kexec SEXIT support Date: Thu, 24 Sep 2020 10:58:39 -0400 [thread overview] Message-ID: <1600959521-24158-12-git-send-email-ross.philipson@oracle.com> (raw) In-Reply-To: <1600959521-24158-1-git-send-email-ross.philipson@oracle.com> Prior to running the next kernel via kexec, the Secure Launch code closes down private SMX resources and does an SEXIT. This allows the next kernel to start normally without any issues starting the APs etc. Signed-off-by: Ross Philipson <ross.philipson@oracle.com> --- arch/x86/kernel/slaunch.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/kexec_core.c | 4 +++ 2 files changed, 74 insertions(+) diff --git a/arch/x86/kernel/slaunch.c b/arch/x86/kernel/slaunch.c index 7bdb89e..b2221d8 100644 --- a/arch/x86/kernel/slaunch.c +++ b/arch/x86/kernel/slaunch.c @@ -784,3 +784,73 @@ static void __exit slaunch_exit(void) late_initcall(slaunch_late_init); __exitcall(slaunch_exit); + +static inline void smx_getsec_sexit(void) +{ + asm volatile (".byte 0x0f,0x37\n" + : : "a" (SMX_X86_GETSEC_SEXIT)); +} + +void slaunch_finalize(int do_sexit) +{ + void __iomem *config; + u64 one = 1, val; + + if (!(slaunch_get_flags() & (SL_FLAG_ACTIVE|SL_FLAG_ARCH_TXT))) + return; + + config = ioremap(TXT_PRIV_CONFIG_REGS_BASE, TXT_NR_CONFIG_PAGES * + PAGE_SIZE); + if (!config) { + pr_emerg("Error SEXIT failed to ioremap TXT private reqs\n"); + return; + } + + /* Clear secrets bit for SEXIT */ + memcpy_toio(config + TXT_CR_CMD_NO_SECRETS, &one, sizeof(u64)); + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + + /* Unlock memory configurations */ + memcpy_toio(config + TXT_CR_CMD_UNLOCK_MEM_CONFIG, &one, sizeof(u64)); + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + + /* Close the TXT private register space */ + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + memcpy_toio(config + TXT_CR_CMD_CLOSE_PRIVATE, &one, sizeof(u64)); + + /* + * Calls to iounmap are not being done because of the state of the + * system this late in the kexec process. Local IRQs are disabled and + * iounmap causes a TLB flush which in turn causes a warning. Leaving + * thse mappings is not an issue since the next kernel is going to + * completely re-setup memory management. + */ + + /* Map public registers and do a final read fence */ + config = ioremap(TXT_PUB_CONFIG_REGS_BASE, TXT_NR_CONFIG_PAGES * + PAGE_SIZE); + if (!config) { + pr_emerg("Error SEXIT failed to ioremap TXT public reqs\n"); + return; + } + + memcpy_fromio(&val, config + TXT_CR_E2STS, sizeof(u64)); + + pr_emerg("TXT clear secrets bit and unlock memory complete."); + + if (!do_sexit) + return; + + if (smp_processor_id() != 0) { + pr_emerg("Error TXT SEXIT must be called on CPU 0\n"); + return; + } + + /* Disable SMX mode */ + cr4_set_bits(X86_CR4_SMXE); + + /* Do the SEXIT SMX operation */ + smx_getsec_sexit(); + + pr_emerg("TXT SEXIT complete."); +} diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index c19c0da..6b9ac11 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -37,6 +37,7 @@ #include <linux/compiler.h> #include <linux/hugetlb.h> #include <linux/frame.h> +#include <linux/slaunch.h> #include <asm/page.h> #include <asm/sections.h> @@ -1179,6 +1180,9 @@ int kernel_kexec(void) cpu_hotplug_enable(); pr_notice("Starting new kernel\n"); machine_shutdown(); + + /* Finalize TXT registers and do SEXIT */ + slaunch_finalize(1); } machine_kexec(kexec_image); -- 1.8.3.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-09-24 14:59 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-24 14:58 [PATCH 00/13] x86: Trenchboot secure dynamic launch Linux kernel support Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 01/13] x86: Secure Launch Kconfig Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-25 2:08 ` Randy Dunlap 2020-09-25 2:08 ` Randy Dunlap 2020-09-25 14:59 ` Ross Philipson 2020-09-25 14:59 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 02/13] x86: Secure Launch main header file Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 03/13] x86: Add early SHA support for Secure Launch early measurements Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-29 17:26 ` Jason Andryuk 2020-09-29 17:26 ` Jason Andryuk 2020-09-24 14:58 ` [PATCH 04/13] x86: Add early TPM TIS/CRB interface support for Secure Launch Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 05/13] x86: Add early TPM1.2/TPM2.0 " Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-25 5:43 ` Jarkko Sakkinen 2020-09-25 5:43 ` Jarkko Sakkinen 2020-09-29 23:47 ` Daniel P. Smith 2020-09-29 23:47 ` Daniel P. Smith 2020-09-30 3:19 ` Jarkko Sakkinen 2020-09-30 3:19 ` Jarkko Sakkinen 2020-09-30 3:24 ` Jarkko Sakkinen 2020-09-30 3:24 ` Jarkko Sakkinen 2021-01-20 0:33 ` Daniel P. Smith 2021-01-20 0:33 ` Daniel P. Smith 2020-09-24 14:58 ` [PATCH 06/13] x86: Add early general TPM " Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 07/13] x86: Secure Launch kernel early boot stub Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 17:38 ` Arvind Sankar 2020-09-24 17:38 ` Arvind Sankar 2020-09-25 14:56 ` Ross Philipson 2020-09-25 14:56 ` Ross Philipson 2020-09-25 19:18 ` Arvind Sankar 2020-09-25 19:18 ` Arvind Sankar 2020-09-29 14:03 ` Ross Philipson 2020-09-29 14:03 ` Ross Philipson 2020-09-29 14:53 ` Arvind Sankar 2020-09-29 14:53 ` Arvind Sankar 2020-10-15 18:26 ` Daniel Kiper 2020-10-15 18:26 ` Daniel Kiper 2020-10-16 20:51 ` Arvind Sankar 2020-10-16 20:51 ` Arvind Sankar 2020-10-19 14:38 ` Ross Philipson 2020-10-19 14:38 ` Ross Philipson 2020-10-19 17:06 ` Arvind Sankar 2020-10-19 17:06 ` Arvind Sankar 2020-10-19 19:00 ` Ross Philipson 2020-10-19 19:00 ` Ross Philipson 2020-10-19 14:51 ` Daniel Kiper 2020-10-19 14:51 ` Daniel Kiper 2020-10-19 17:18 ` Arvind Sankar 2020-10-19 17:18 ` Arvind Sankar 2020-10-21 15:28 ` Daniel Kiper 2020-10-21 15:28 ` Daniel Kiper 2020-10-21 16:18 ` Arvind Sankar 2020-10-21 16:18 ` Arvind Sankar 2020-10-21 20:36 ` Ross Philipson 2020-10-21 20:36 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 08/13] x86: Secure Launch kernel late " Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 09/13] x86: Secure Launch SMP bringup support Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 10/13] x86: Secure Launch adding event log securityfs Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` Ross Philipson [this message] 2020-09-24 14:58 ` [PATCH 11/13] kexec: Secure Launch kexec SEXIT support Ross Philipson 2020-09-24 14:58 ` [PATCH 12/13] reboot: Secure Launch SEXIT support on reboot paths Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-24 14:58 ` [PATCH 13/13] tpm: Allow locality 2 to be set when initializing the TPM for Secure Launch Ross Philipson 2020-09-24 14:58 ` Ross Philipson 2020-09-25 5:30 ` [PATCH 00/13] x86: Trenchboot secure dynamic launch Linux kernel support Jarkko Sakkinen 2020-09-25 5:30 ` Jarkko Sakkinen 2020-09-25 21:32 ` Daniel P. Smith 2020-09-25 21:32 ` Daniel P. Smith 2020-09-27 23:59 ` Jarkko Sakkinen 2020-09-27 23:59 ` Jarkko Sakkinen
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=1600959521-24158-12-git-send-email-ross.philipson@oracle.com \ --to=ross.philipson@oracle.com \ --cc=bp@alien8.de \ --cc=dpsmith@apertussolutions.com \ --cc=hpa@zytor.com \ --cc=iommu@lists.linux-foundation.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luto@amacapital.net \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=trenchboot-devel@googlegroups.com \ --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.