All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ross Philipson <ross.philipson@oracle.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org,
	linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org,
	linux-crypto@vger.kernel.org, kexec@lists.infradead.org
Cc: iommu@lists.linux-foundation.org, ross.philipson@oracle.com,
	dpsmith@apertussolutions.com, tglx@linutronix.de,
	mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
	luto@amacapital.net, nivedita@alum.mit.edu,
	kanth.ghatraju@oracle.com, trenchboot-devel@googlegroups.com
Subject: [PATCH v5 10/12] reboot: Secure Launch SEXIT support on reboot paths
Date: Wed, 16 Feb 2022 22:54:43 -0500	[thread overview]
Message-ID: <1645070085-14255-11-git-send-email-ross.philipson@oracle.com> (raw)
In-Reply-To: <1645070085-14255-1-git-send-email-ross.philipson@oracle.com>

If the MLE kernel is being powered off, rebooted or halted,
then SEXIT must be called. Note that the SEXIT GETSEC leaf
can only be called after a machine_shutdown() has been done on
these paths. The machine_shutdown() is not called on a few paths
like when poweroff action does not have a poweroff callback (into
ACPI code) or when an emergency reset is done. In these cases,
just the TXT registers are finalized but SEXIT is skipped.

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 arch/x86/kernel/reboot.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index fa700b4..96d9c78 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/objtool.h>
 #include <linux/pgtable.h>
+#include <linux/slaunch.h>
 #include <acpi/reboot.h>
 #include <asm/io.h>
 #include <asm/apic.h>
@@ -724,6 +725,7 @@ static void native_machine_restart(char *__unused)
 
 	if (!reboot_force)
 		machine_shutdown();
+	slaunch_finalize(!reboot_force);
 	__machine_emergency_restart(0);
 }
 
@@ -734,6 +736,9 @@ static void native_machine_halt(void)
 
 	tboot_shutdown(TB_SHUTDOWN_HALT);
 
+	/* SEXIT done after machine_shutdown() to meet TXT requirements */
+	slaunch_finalize(1);
+
 	stop_this_cpu(NULL);
 }
 
@@ -742,8 +747,12 @@ static void native_machine_power_off(void)
 	if (pm_power_off) {
 		if (!reboot_force)
 			machine_shutdown();
+		slaunch_finalize(!reboot_force);
 		pm_power_off();
+	} else {
+		slaunch_finalize(0);
 	}
+
 	/* A fallback in case there is no PM info available */
 	tboot_shutdown(TB_SHUTDOWN_HALT);
 }
@@ -771,6 +780,7 @@ void machine_shutdown(void)
 
 void machine_emergency_restart(void)
 {
+	slaunch_finalize(0);
 	__machine_emergency_restart(1);
 }
 
-- 
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,
	linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org,
	linux-crypto@vger.kernel.org, kexec@lists.infradead.org
Cc: dpsmith@apertussolutions.com, ross.philipson@oracle.com,
	nivedita@alum.mit.edu, luto@amacapital.net,
	iommu@lists.linux-foundation.org, mingo@redhat.com, bp@alien8.de,
	hpa@zytor.com, kanth.ghatraju@oracle.com, tglx@linutronix.de,
	trenchboot-devel@googlegroups.com
Subject: [PATCH v5 10/12] reboot: Secure Launch SEXIT support on reboot paths
Date: Wed, 16 Feb 2022 22:54:43 -0500	[thread overview]
Message-ID: <1645070085-14255-11-git-send-email-ross.philipson@oracle.com> (raw)
In-Reply-To: <1645070085-14255-1-git-send-email-ross.philipson@oracle.com>

If the MLE kernel is being powered off, rebooted or halted,
then SEXIT must be called. Note that the SEXIT GETSEC leaf
can only be called after a machine_shutdown() has been done on
these paths. The machine_shutdown() is not called on a few paths
like when poweroff action does not have a poweroff callback (into
ACPI code) or when an emergency reset is done. In these cases,
just the TXT registers are finalized but SEXIT is skipped.

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 arch/x86/kernel/reboot.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index fa700b4..96d9c78 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/objtool.h>
 #include <linux/pgtable.h>
+#include <linux/slaunch.h>
 #include <acpi/reboot.h>
 #include <asm/io.h>
 #include <asm/apic.h>
@@ -724,6 +725,7 @@ static void native_machine_restart(char *__unused)
 
 	if (!reboot_force)
 		machine_shutdown();
+	slaunch_finalize(!reboot_force);
 	__machine_emergency_restart(0);
 }
 
@@ -734,6 +736,9 @@ static void native_machine_halt(void)
 
 	tboot_shutdown(TB_SHUTDOWN_HALT);
 
+	/* SEXIT done after machine_shutdown() to meet TXT requirements */
+	slaunch_finalize(1);
+
 	stop_this_cpu(NULL);
 }
 
@@ -742,8 +747,12 @@ static void native_machine_power_off(void)
 	if (pm_power_off) {
 		if (!reboot_force)
 			machine_shutdown();
+		slaunch_finalize(!reboot_force);
 		pm_power_off();
+	} else {
+		slaunch_finalize(0);
 	}
+
 	/* A fallback in case there is no PM info available */
 	tboot_shutdown(TB_SHUTDOWN_HALT);
 }
@@ -771,6 +780,7 @@ void machine_shutdown(void)
 
 void machine_emergency_restart(void)
 {
+	slaunch_finalize(0);
 	__machine_emergency_restart(1);
 }
 
-- 
1.8.3.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

WARNING: multiple messages have this Message-ID (diff)
From: Ross Philipson <ross.philipson@oracle.com>
To: kexec@lists.infradead.org
Subject: [PATCH v5 10/12] reboot: Secure Launch SEXIT support on reboot paths
Date: Wed, 16 Feb 2022 22:54:43 -0500	[thread overview]
Message-ID: <1645070085-14255-11-git-send-email-ross.philipson@oracle.com> (raw)
In-Reply-To: <1645070085-14255-1-git-send-email-ross.philipson@oracle.com>

If the MLE kernel is being powered off, rebooted or halted,
then SEXIT must be called. Note that the SEXIT GETSEC leaf
can only be called after a machine_shutdown() has been done on
these paths. The machine_shutdown() is not called on a few paths
like when poweroff action does not have a poweroff callback (into
ACPI code) or when an emergency reset is done. In these cases,
just the TXT registers are finalized but SEXIT is skipped.

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 arch/x86/kernel/reboot.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index fa700b4..96d9c78 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/objtool.h>
 #include <linux/pgtable.h>
+#include <linux/slaunch.h>
 #include <acpi/reboot.h>
 #include <asm/io.h>
 #include <asm/apic.h>
@@ -724,6 +725,7 @@ static void native_machine_restart(char *__unused)
 
 	if (!reboot_force)
 		machine_shutdown();
+	slaunch_finalize(!reboot_force);
 	__machine_emergency_restart(0);
 }
 
@@ -734,6 +736,9 @@ static void native_machine_halt(void)
 
 	tboot_shutdown(TB_SHUTDOWN_HALT);
 
+	/* SEXIT done after machine_shutdown() to meet TXT requirements */
+	slaunch_finalize(1);
+
 	stop_this_cpu(NULL);
 }
 
@@ -742,8 +747,12 @@ static void native_machine_power_off(void)
 	if (pm_power_off) {
 		if (!reboot_force)
 			machine_shutdown();
+		slaunch_finalize(!reboot_force);
 		pm_power_off();
+	} else {
+		slaunch_finalize(0);
 	}
+
 	/* A fallback in case there is no PM info available */
 	tboot_shutdown(TB_SHUTDOWN_HALT);
 }
@@ -771,6 +780,7 @@ void machine_shutdown(void)
 
 void machine_emergency_restart(void)
 {
+	slaunch_finalize(0);
 	__machine_emergency_restart(1);
 }
 
-- 
1.8.3.1



  parent reply	other threads:[~2022-02-18 15:59 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17  3:54 [PATCH v5 00/12] x86: Trenchboot secure dynamic launch Linux kernel support Ross Philipson
2022-02-17  3:54 ` Ross Philipson
2022-02-17  3:54 ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 01/12] x86/boot: Place kernel_info at a fixed offset Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 02/12] Documentation/x86: Secure Launch kernel documentation Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 03/12] x86: Secure Launch Kconfig Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 04/12] x86: Secure Launch main header file Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 05/12] x86: Add early SHA support for Secure Launch early measurements Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 06/12] x86: Secure Launch kernel early boot stub Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 07/12] x86: Secure Launch kernel late " Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 08/12] x86: Secure Launch SMP bringup support Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 09/12] kexec: Secure Launch kexec SEXIT support Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` Ross Philipson [this message]
2022-02-17  3:54   ` [PATCH v5 10/12] reboot: Secure Launch SEXIT support on reboot paths Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 11/12] x86: Secure Launch late initcall platform module Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54 ` [PATCH v5 12/12] tpm: Allow locality 2 to be set when initializing the TPM for Secure Launch Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-17  3:54   ` Ross Philipson
2022-02-23 17:45 ` [PATCH v5 00/12] x86: Trenchboot secure dynamic launch Linux kernel support Dave Hansen
2022-02-23 17:45   ` Dave Hansen
2022-02-23 17:45   ` Dave Hansen
2022-02-25 18:57   ` Daniel P. Smith
2022-02-25 18:57     ` Daniel P. Smith
2022-02-25 18:57     ` Daniel P. Smith

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=1645070085-14255-11-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=kanth.ghatraju@oracle.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-crypto@vger.kernel.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=nivedita@alum.mit.edu \
    --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: link
Be 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.