Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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, kanth.ghatraju@oracle.com,
        trenchboot-devel@googlegroups.com
Subject: [PATCH v3 12/14] reboot: Secure Launch SEXIT support on reboot paths
Date:   Mon,  9 Aug 2021 12:38:54 -0400
Message-Id: <1628527136-2478-13-git-send-email-ross.philipson@oracle.com>
In-Reply-To: <1628527136-2478-1-git-send-email-ross.philipson@oracle.com>
References: <1628527136-2478-1-git-send-email-ross.philipson@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from lateralus.us.oracle.com (209.17.40.43) by SA9PR10CA0021.namprd10.prod.outlook.com (2603:10b6:806:a7::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Mon, 9 Aug 2021 16:31:00 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 2840464e-0ef2-4294-f1b4-08d95b53136e
X-MS-TrafficTypeDiagnostic: BY5PR10MB3939:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BY5PR10MB3939D45652C950986854ECF9E6F69@BY5PR10MB3939.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:8882;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: UQhfvuSz4vwJ3hVhFTpQEhRoW+9cpUR+GqDLj19zh6W5D72uksfhIC/lV50bxhOzsTZ174T2qAEash9qCUghREtJ/wlEMqhnv/WucGS7UzWZmWTaagZ3LyvtNmNt4bYUCaoSouzmyTwd9PzHBKbfqKs1Jnp5S4DA7oHaVwPRPv9ngEzbXiFxr45oYykXrdPGSce1Cs5j7ki/h/+uwc3e0YoTCP0wyua9mwASt7Ojw/9CfpLuI+IUJZTimIemT1/qS9GtF27YqaiHwdPPbjTfz7rLO6U369Ty0pcfoFoJ5cr8tuNaMx4hIigcdYTfcWJY7i3H5khwS3mVv82raf3fJkBYoV4gT+L03Q/q5QLJMzT/592U81JJd2Vn90Qq5wbjrdU6hsWTTJIDcKhWPUjReSvtK7PF0P+jeVoiSpcIib01bQ1aZj2gTmXhg7jQEhoLvZE/XH1DxWtAnqsxh1pgPiMtN2j2eJGPHNvE/PFUoSVjQXs5FC3x0zWtSpieq1Z+3adjgAzJKQcfS/JisLDeAGwrizhObGI2DdfcU2j2E1/RdNbgEeDKdUzE2ndKN5iW818SZ7fMP/CAtixZa9pXCvA9WlE1YGokR20qNnlRz7LCljb5ABpHNTFPlbxECwtAcOuvit/uV8DxPOXCID3rnc4tW04ioU4sACxCbVA0v0LcK/ajKjJIY7DOHAc6Xy8vwpqHtIcfLYvA5W0F8wPy9w==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3793.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(39860400002)(346002)(376002)(136003)(366004)(38350700002)(478600001)(86362001)(316002)(38100700002)(52116002)(4326008)(7696005)(7416002)(2906002)(6666004)(8936002)(6486002)(186003)(5660300002)(8676002)(26005)(44832011)(2616005)(66946007)(66476007)(66556008)(956004)(36756003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YiGwWrx6HU0EM8M4paAQJt7IxPNqElcNgEkqnYfSLR7CGCSDq3+HvKYxKERP?=
 =?us-ascii?Q?HtGWgKyS5VRXVAac1AqohE2A+gIHeRz0dDi7VXM/d9082D6rgyMkf6nyhT+D?=
 =?us-ascii?Q?6O8fqw+rJQI1o6rnK5cD0qeTnUu3inhCQ8zNwRhZ1sH58ggkzAyU5WEvyaKX?=
 =?us-ascii?Q?yJe0CeetnILunA2Mv35MCbtqP4zZu7wb3J93aOdZXLnRAVvMt0e8Glj5hoUk?=
 =?us-ascii?Q?LJ7VFyuTuQjo1AHKNNiwQFOMcgSO3Sx+pCyOHRMSkuQl6XlZgVqnY3473f7O?=
 =?us-ascii?Q?/nxUEHjtfhirlOHLydxRzH+yPPX24jGFjmPCumgyXokGcyceGcUsa2KW+cXe?=
 =?us-ascii?Q?z4qPkSOyh9uYDjgvObfMf4dRs5+HzRpeDXhyCBnbRu/yZC9dgQOcRsV8D0YN?=
 =?us-ascii?Q?EbE9Prcib808utZx4O9Tse+0q6BVmJTAYctFHfT71qYjDX94vqCurcd94N+K?=
 =?us-ascii?Q?ZYosmNVByTDtreLIFlUx6GTf7ZpP0uzhnTd5M2ICOMbrOkZkEMWyjF+RrIl6?=
 =?us-ascii?Q?5CYrU7RiBLZRiTV5KH83ig9sPGBrRvrRxuociqeAUxN//PdHV7APdYM3aPQi?=
 =?us-ascii?Q?fk7nsvYkqx8SqNosudISX6zeUmTq7DaZy6O4O+QAM5gGU87KOvOFrzKDA8Qi?=
 =?us-ascii?Q?qDULWugS4O6neCkaC59gXbuop4sCk4I/Ba7PGKa/7jL9YY+jthMfrTmSamie?=
 =?us-ascii?Q?uf8LqghqRquYgkT1+s835C2d2KZ3GlSAK1r5EfxG9WYRRnOukzsuo2HoOrDH?=
 =?us-ascii?Q?bIYk/hKWfVK+WxwidhR1jDdOV0+wxuJSNRaHd3pr7B13gycxmCsJiHwx8ro+?=
 =?us-ascii?Q?n+kbXha04qYqVI8qi2zRs7Xk1FfIDDo3myXZF+n8uXz5Jts7e7iSUoMZjvG4?=
 =?us-ascii?Q?7C6UTvCqv2aQv3fSmJ7eKxM1goEzicbuqaocteVRn+l7LdH+/xlPZxmQnvOa?=
 =?us-ascii?Q?4XD81GUTV7AqJJetDX0KSKKJMO7wZmj84ZKKfcMwlI/pZVL5QuuGnyGdKFWb?=
 =?us-ascii?Q?OEwD0tWyotMzetSY+qYl6Eccoq1lKB54GNyuUZY06QlWjjDl0SQqoFvPXx6F?=
 =?us-ascii?Q?EXXmWQ4k4IcOqG6+qZpiV0zAui5NYl7SvCrQlIPwj3dJC5V9NsCqe8O9C42L?=
 =?us-ascii?Q?FWjy6ExfIp9IRhXnRUF4PUx6MY365abjYlAG+lEem5J3QLDp+gFQACM0Seu2?=
 =?us-ascii?Q?8nDb7FRucjSMjwlc3Os/Uc1dm7jVm6jf8Y2aQT6pu6tFGxMyyUdKxdOTRAcr?=
 =?us-ascii?Q?Gk88FWGV2BAGpicjR+Mgr6vTLfJEXrUeyKuVz9TUBmcUWeWEGBV1sxTW5gqp?=
 =?us-ascii?Q?g7sikQYsuqL/Pq4iAE9i77QH?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2840464e-0ef2-4294-f1b4-08d95b53136e
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2021 16:31:01.9534
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4SvucfwjTBdUuCKuJ6rvx4Da4wQ/SN46wPhw9O054sdfNhswMGqFSVsnKUrg3KQH/nyk46mln6EYwjJmUU44H6TFkMcPU+lrNorY42depf8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3939
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10071 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxscore=0
 phishscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000
 definitions=main-2108090119
X-Proofpoint-ORIG-GUID: LTYda43IXtiaIuVmX189xikNcYVdq6NJ
X-Proofpoint-GUID: LTYda43IXtiaIuVmX189xikNcYVdq6NJ
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 ebfb911..fe9d8cc 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>
@@ -731,6 +732,7 @@ static void native_machine_restart(char *__unused)
 
 	if (!reboot_force)
 		machine_shutdown();
+	slaunch_finalize(!reboot_force);
 	__machine_emergency_restart(0);
 }
 
@@ -741,6 +743,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);
 }
 
@@ -749,8 +754,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);
 }
@@ -778,6 +787,7 @@ void machine_shutdown(void)
 
 void machine_emergency_restart(void)
 {
+	slaunch_finalize(0);
 	__machine_emergency_restart(1);
 }
 
-- 
1.8.3.1