From nobody Sun Feb 8 21:46:26 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2057.outbound.protection.outlook.com [40.107.237.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37CC813A41A for ; Thu, 4 Apr 2024 23:11:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272277; cv=fail; b=faTktIMooOTaoV2CUisCv0ZCrhGxSZX2VyAb7o8Cuhb2JjbLx027ysxjbdLxnSUz/AVMu7X1WUh8Tn9tW5kUbDx41LnxXUMBur7fRcdail+o9c8u7fQY3PC7uHKgxmKjD4jENTXFx4Rka1VmNCF77lhNqkI1wZ75j69TAxo1TCQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272277; c=relaxed/simple; bh=Gjxon9CWAl1E5KONmZ4XO223NbadHZMJVryA/SxMQQ4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=REjxdL5Ui6WI1kMy4v8xfn5ESjsMU1tXvtwUaCOsHBr7rziIIK9YWHxWGfY9mkXedK0Mn3y3JKCi1zpQvRCq3t3XsgDpofQfGaJVC/C2eEZSoxaPN1C2WwFugvjM5gAxA6Cv3YqzoShQk0FTdY4FqW4e8BTdhdhzZHDHu1jVCxg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=KXj4ZEdQ; arc=fail smtp.client-ip=40.107.237.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="KXj4ZEdQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TB4qIXfHrBc2x/FTnH7mVknfdiSoe2viSgKcxtLG2La7hmsJVd4hO/HMIiaOpLNZOHZ/NgGIC8eVh4d8Y1VBa2LKR2ps/8nbo2fu9MwDanhOdGTME1Qvm0fwIdgMOGL24Cssa/9MGajgVDvB3DgtebMNm7LBgkxEjUW0CcRJl2vRjaf4QbGR0TsXnfZ4dLWqmc1S18Xw5V1FVisn0UcwuTNwJ3pMgUBwlXd1yxVOMVxyFeHv3MF2daNG3mwE4u1JlP+BlqyE7C2CBDidSQiePPwNpYUv1ppmzxsnva293FakLqaAgKooYhiB0LJAMjJMui+z9LUtmiNO6eO4e8DIzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ynAjWB7gpOag9jprnm17/CfhdBBqZy7DoD35EXOrrdk=; b=dmS3MvYEjAppB0RlMo1yXz2qobnCn7I3B+jB0alg0TA0YoZkWGzDBZjr2c9eGFbaiP8/E21BYiU0xqJaFuUiyeh5tkdte3qJVGL6JeOo2uURTVcT4yRjeeP6f24RkEpXu4uW8n3H+CDOCAws8YCsOoBD8LDfGAJNw3MHaHZliHi5/Rm1rcxRtVaWdk/yiJzfw5Py1v1MprJcFUnJ4nDrKmhM9//njZ2f0HrCD28RqFtZdpzHC/780oUSV1LsL8fREq7ta7QssYfup0ez7c+RMf6XepzQglOccBzAi8UOxeODCDvizAx/WX5MtXxtLRFCidxB8SHSzG+HFI0hzSEaug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ynAjWB7gpOag9jprnm17/CfhdBBqZy7DoD35EXOrrdk=; b=KXj4ZEdQjzjHWWIw3hS5LqlthcSMo+naOb4QrRjFQxGgHyi+cEclu9kK5Ycqb2yuL5FU0eVBd4AI7DJPOaESS+GsMsJz6GI8YNxvkYYC5dDyKdvaM/OvlptyTbsG6l9o1Xaon85gob+PFd1BDwunys3F5u7V73F10zcqoFokX0U= Received: from SJ0PR05CA0063.namprd05.prod.outlook.com (2603:10b6:a03:332::8) by IA1PR12MB8222.namprd12.prod.outlook.com (2603:10b6:208:3f2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 23:11:13 +0000 Received: from CO1PEPF000066E7.namprd05.prod.outlook.com (2603:10b6:a03:332:cafe::43) by SJ0PR05CA0063.outlook.office365.com (2603:10b6:a03:332::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.27 via Frontend Transport; Thu, 4 Apr 2024 23:11:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000066E7.mail.protection.outlook.com (10.167.249.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Thu, 4 Apr 2024 23:11:12 +0000 Received: from ethanolx7e2ehost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 4 Apr 2024 18:11:10 -0500 From: Ashish Kalra To: , , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 1/4] efi/x86: skip efi_arch_mem_reserve() in case of kexec. Date: Thu, 4 Apr 2024 23:11:02 +0000 Message-ID: <7ca8179d7671a149f2808d8d081b6e736eea4394.1712270976.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: <20240325103911.2651793-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E7:EE_|IA1PR12MB8222:EE_ X-MS-Office365-Filtering-Correlation-Id: 12b75396-7eb0-4a75-c2ac-08dc54fc856b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7AbpBgcW/J/53Svp3WQMND/H03elYhI/XKSN/zgMsN5+CoiuCNVa4IaKk2irsF4lf7ZAPBRAn7gyNK9UsumUzlqWVIiz1WhTPblGjK4pCY8dzAffb6gjl0RQ6qNlTED6dF/lTKnjRR3CFomBQ2PAOtnxOxsvYIR6ptHWWG9sfuFZYCu0i/wPjbDRs5a0l+g794DK8PVIMmcppNhcw8nemBqReMHLbiCMfeHjqcwzUOxr+X9+rvt+634iQSZOkQWiUGbMBO7UiMd5b3/PFoh6mBgft/I3Hlq2JC66w8evvQQSBCBN31K3VtY6ZQZL4xT071MVDHmTE1XkUW6PPqObDs6FamES06M89yUZFY5gVA2W28o37cJJzMg4yCX/OFv4roU0q9UUINxLTTLl/rTDEQ2jcGX1AutCYVBA+e8Q75bWNuPMQKIPRhxvRUReE2U7tU/DyjXaVS3U1nX6Agol1mGHq+BwAWf77Kh1238L3glymZ6fhsZCI7njGKzSuMzDITl78EGWdB3Mekw9gAGpwqbQlUKLIGXaiRHa8bqA6JDDDDWnfwfheztYdAaP1s/6N6WiIRh4kuQL7oYOY9IAa2WwueCuoN0AkWd/r0LihbaMgTl3SUBWMa8gXv4K1K6MDVJIiiU+sr2p0QyqQb+Wd9PXaueLFtzSxajiWTkpOdmuFkpsK0mHaKxiBZqmcakBoUdD7lfIEFemW5i1WvXAmPqYYjFJ8E7w0hjS+XStrQQvVQcU4smNdcPQ7BBVAhwb X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(36860700004)(82310400014)(376005)(1800799015)(7416005);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 23:11:12.4503 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12b75396-7eb0-4a75-c2ac-08dc54fc856b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000066E7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8222 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra For kexec use case, need to use and stick to the EFI memmap passed from the first kernel via boot-params/setup data, hence, skip efi_arch_mem_reserve() during kexec. Additionally during SNP guest kexec testing discovered that EFI memmap is corrupted during chained kexec. kexec_enter_virtual_mode() during late init will remap the efi_memmap physical pages allocated in efi_arch_mem_reserve() via memblock & then subsequently cause random EFI memmap corruption once memblock is freed/teared-down. Suggested-by: Dave Young [Dave Young: checking the md attribute instead of checking the efi_setup] Signed-off-by: Ashish Kalra --- arch/x86/platform/efi/quirks.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index f0cc00032751..2b65b3863912 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -255,15 +255,32 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u6= 4 size) struct efi_memory_map_data data =3D { 0 }; struct efi_mem_range mr; efi_memory_desc_t md; - int num_entries; + int num_entries, ret; void *new; =20 - if (efi_mem_desc_lookup(addr, &md) || - md.type !=3D EFI_BOOT_SERVICES_DATA) { + /* + * For kexec use case, we need to use the EFI memmap passed from the first + * kernel via setup data, so we need to skip this. + * Additionally kexec_enter_virtual_mode() during late init will remap + * the efi_memmap physical pages allocated here via memboot & then + * subsequently cause random EFI memmap corruption once memblock is freed. + */ + + ret =3D efi_mem_desc_lookup(addr, &md); + if (ret) { pr_err("Failed to lookup EFI memory descriptor for %pa\n", &addr); return; } =20 + if (md.type !=3D EFI_BOOT_SERVICES_DATA) { + pr_err("Skip reserving non EFI Boot Service Data memory for %pa\n", &add= r); + return; + } + + /* Kexec copied the efi memmap from the first kernel, thus skip the case = */ + if (md.attribute & EFI_MEMORY_RUNTIME) + return; + if (addr + size > md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT)) { pr_err("Region spans EFI memory descriptors, %pa\n", &addr); return; --=20 2.34.1 From nobody Sun Feb 8 21:46:26 2026 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2081.outbound.protection.outlook.com [40.107.92.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5666D130E57 for ; Thu, 4 Apr 2024 23:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272293; cv=fail; b=bR+cxd4JzsG1g2jjJPE5Tip8wdT3KpzL9sIkusfBwtVYbMel6MoFk4uHDPhTKrvvZpMBkjiiFjpI18DbeOjqA1XTXwjCVnuFsI2dykGD8y7Q1rMC8RkGuz5RuzOjPTb4IjqpDZrlNzQHyHNfa7TGgITDwPiQIpKY6BmTmJdaepA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272293; c=relaxed/simple; bh=javswomMKGUnes2sdJx1dC6Hd6IH0VTdyfzDGABVfjw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bvXPDzxe6B+ObVYUExE1/vvbxYMHEh1oOx04pP3Ho6muu64U2MpMn/L3T0rh8/xVP3U1dcAHipHX6isZ+UlJo3ScPefLPYOFsn/Qzxsxpo1wWCXm+iicj0e7ALZ/s+1bVv9vMznxD/OwOxiE7CfIjlYmAU61D/TZvRcB7z9+OXA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=xa8pWMm+; arc=fail smtp.client-ip=40.107.92.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="xa8pWMm+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UaIh5fyQjEfd2NXuJqVTgNkP7xCEwa7XAfPcMsHcSmvVyq/uukEvgRls8p1zFJ8a7za3H1QapFL7zamu9Z4oAh5LWzAtgQekfM7mxF7gDqELM/rElGLjoX11LGpJgXpTx9iYnzUW0FCVlRBPmOXe9z2lwsGIyNER04/j626lpn9084Ctc6cv8UpK8kI/Z5CIgEZryuLXGfHbKBXsFaIQYtMIPCytlk7sZ7+mfVt7ZGX0eMtPbkIKanKjEuv/4aBC7FwCHAODg5/bsfvbBSj0XFNDcQjnYSseuAMDnLzYrevG8tuPVWqKuIdB4Yd6X7lUxCosnGTnFxLFhSxVmGe4RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=trvYSFLaRPdH8VKwEKLxjJFoGOzAtIS45QiGq0D9va4=; b=UQFEJQZl5PP2yC6tg1kvCIqqkd4DKvqSFJJyYAcJ7dnfvDpckRZSWrrbq38chfuhTP1otNavRWh6HFBeXx7gEBIvsLtW60nHVlRhsW53EK+/z8ClHvu9mqx0oG+2Sh6YKcqMR5NdQdCmAZQUM/y/ashYVWsMJIMIDzaq1UB3CBs9e/LAABDN5gvukLwfdrjkJIwF0Ip5mNGlanf+g1ys8N8M/UwfiZcZQjIcH+12UCkjNFOBZLaOGCsD4+oH73VI74cgmDgfZad4zfLjB3QI5n9AP4rvhKMWf1XoMsJxQjEwb83IFNlOJe6ahdzYbuqNgXyB6v7XvoH/C6+FXjCqwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=trvYSFLaRPdH8VKwEKLxjJFoGOzAtIS45QiGq0D9va4=; b=xa8pWMm+qfEXfdgqbKVrYUM2RsKlWPDrb21/f/fJnt8eONE4LrpLLlpJPTAy7RLQ3TlytZ3z20pjOXNzuIFsJiYT1n2F198OwoVimRMExe3Y8C2fbhpzh2XMx+EjTW7OoYwjqnNc3KyseqPEc7R2X3Ufz4aGKHLN1aJn7S9+GdI= Received: from MW4P222CA0022.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::27) by IA1PR12MB6386.namprd12.prod.outlook.com (2603:10b6:208:38a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 23:11:29 +0000 Received: from CO1PEPF000066E9.namprd05.prod.outlook.com (2603:10b6:303:114:cafe::5a) by MW4P222CA0022.outlook.office365.com (2603:10b6:303:114::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46 via Frontend Transport; Thu, 4 Apr 2024 23:11:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000066E9.mail.protection.outlook.com (10.167.249.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Thu, 4 Apr 2024 23:11:28 +0000 Received: from ethanolx7e2ehost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 4 Apr 2024 18:11:26 -0500 From: Ashish Kalra To: , , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 2/4] x86/sev: add sev_es_enabled() function. Date: Thu, 4 Apr 2024 23:11:16 +0000 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: <20240325103911.2651793-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E9:EE_|IA1PR12MB6386:EE_ X-MS-Office365-Filtering-Correlation-Id: c3c5147e-08b5-4796-a974-08dc54fc8f2c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qhjRTfJXajoxvffyErRYbX8tZa6wcQ7F4I9JOB+XLYW54ZOj67QnLAnFcCQoaLbtNQ4XGb2FFPN3Xkf1FlaknGjc1OU5ujwj6GxvQhfUnSxL3RxBlymdGUuF/JcVdyK2AsDNE9XyHLGyektsXkIgst97FCA4ze8oOu41d77+CuOE42nHqkzJ7tyvYE/uTeeOAHwPdnLkujFBjmwdxHvMroXFzTEWbCapubOoghdZ/baVa8IEGYhfRICU9v22IUnFcd2AWT2ZvGeDgap+BNDnMbD90x6wbpPYNJkoAHnRISrgLux3UVQTMBiq5kW4Ui++v6CLnVg31/Fju5PX+S7uPOfu2mLgXJxE3SuVPNFPMF8zjpnYxzbF+t+ubQENqflpZl40CVhV8CcMkssf1zglvmbmfaR/dnkoOWzc4E3TM8VNuaX9xhjAQP/2R0NxBFsns+lf3s9P1AYPb/L1DrPps876haoCavYLf22T2/Y5dJDDYBoh1ioo69WVCDu7FXxyMSNlfl2sZ/4IYbVQM5mjAzv991Jk8Ltrt+MGS3gnILWk3/RKG0Xd3q+8DGt8EE1JNXbD0g0+Wfuw28MXsdvycydHREQ0x3vAtzwP08Sy0FfcKLTy3TnybFjSYJjrAa1I/hD53HFZYpS5KEGqzGcpWfVG4JKwoNvVQILLLyU5mvwvmyiaVnQxwqm8N5YYU6FnU07j6znKBj9wM2R4+JBZhb04RBCTY9iw5sjCgoA8LfIsN7/y80TgnnzYClWVFqYj X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(1800799015)(82310400014)(7416005)(36860700004)(376005);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 23:11:28.8140 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c3c5147e-08b5-4796-a974-08dc54fc8f2c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000066E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6386 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Add sev_es_enabled() function to detect if SEV-ES support is enabled. Signed-off-by: Ashish Kalra Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/boot/compressed/sev.c | 5 +++++ arch/x86/boot/compressed/sev.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index ec71846d28c9..4ae4cc51e6b8 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -134,6 +134,11 @@ bool sev_snp_enabled(void) return sev_status & MSR_AMD64_SEV_SNP_ENABLED; } =20 +bool sev_es_enabled(void) +{ + return sev_status & MSR_AMD64_SEV_ES_ENABLED; +} + static void __page_state_change(unsigned long paddr, enum psc_op op) { u64 val; diff --git a/arch/x86/boot/compressed/sev.h b/arch/x86/boot/compressed/sev.h index fc725a981b09..5008c80e66e6 100644 --- a/arch/x86/boot/compressed/sev.h +++ b/arch/x86/boot/compressed/sev.h @@ -11,11 +11,13 @@ #ifdef CONFIG_AMD_MEM_ENCRYPT =20 bool sev_snp_enabled(void); +bool sev_es_enabled(void); void snp_accept_memory(phys_addr_t start, phys_addr_t end); =20 #else =20 static inline bool sev_snp_enabled(void) { return false; } +static inline bool sev_es_enabled(void) { return false; } static inline void snp_accept_memory(phys_addr_t start, phys_addr_t end) {= } =20 #endif --=20 2.34.1 From nobody Sun Feb 8 21:46:26 2026 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2071.outbound.protection.outlook.com [40.107.212.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C622413BC17 for ; Thu, 4 Apr 2024 23:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272308; cv=fail; b=i2tbsoI3vOC7jeifdBDIsjiMH0VPqohoSU+jeg/tXPwzUJsUf5/1O1R/Kb5dZdp1UCwgXLqY86bCNPJM3xVAEEsXZ0fHlZdu1DaJoWLLqBJ+hP5pwLi73nrouggG+iUFUk6ygukRqtKBaqkNMCtzlwCDoHo7JkDjXbFywGq/1SA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272308; c=relaxed/simple; bh=MRj2zmUHpM6p0uyHC/3LxPtBekYflln1xF+RfYY33nw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bmfd5AZBAyQDTTNgRDeJk02vfwnldeXwI0LPmAAqsGdZEnnaz0e76PLM0mQoSGB4C/4VNyparUaOS2euUJ2VydPuwkVeYleu71qw2JtoY5lR4i+XJtwFD46DEWWLpQQbnjGPf+lXhW0dikZSb02aXEnEapIHKyye+LwdFTigg9U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=olgq5bH5; arc=fail smtp.client-ip=40.107.212.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="olgq5bH5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nk7YTyPwagNLY87Ne0bpZu/1hpXeAvL3sHk21OZx8ugXe3kPEqFsCrZmMK8mPOfyhwRpaIzV5SAwHzGGnUisGk4dVHxvaYqS/zlUWjXB9RJ+u7RMpBCzujl1xJWSvylIkSW+yRplsgHoc9Kgd9AC/5utbrntpGGUrfWeFRSlxkFBfUQA5tC2V8sckBnBhN/LuePER8W5XOsZLJJzrkIPtseOupKUfcgoiW2VQKXysC7v7NijhaWZa0i7ie0kcaD+zT9OcX3IMxLKx89MYXSQalc4vHF/HNartPknSES8OO3+S+Z6TLnqykBKo/CtI+y0HyQC9kIlZgfkXzG0H/5I2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LuJLmiJCuKYv3wZ3trwzzFudM6kzyFcz8ixqVB+ZMHw=; b=jLlqjGQselHMj+wxLBLzizlJAPvxG8x3Bp06A/QyDTN8/kDN1RzD87gl9RxZM+shmJJR3F16XK9vA6d07XMZ4HSRNjhf9FmTzSLFH2JxBDz5l1RvNyR8tdL8aE00jaySMhm6o+5UmDkWnmnDgFaIluGXLpiW1vZu9Vy+JI1ZpYUXQKLdV5QopHfSSG7q4sHzHvOCLvRGjWO//AMZHC7NNuaby+invnMIG3w8ICxAoylZkSP8Ea2tH1oLBibyr6wGgaSBmsL8pPdqeay0R08QQnUa1W7q5+39BvGBzsP0YTXu2hdHbLvxraDCgtClDJgs0IilhZFLo6lknXxnl1jqaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LuJLmiJCuKYv3wZ3trwzzFudM6kzyFcz8ixqVB+ZMHw=; b=olgq5bH5P+EsfZI4m4NKOF9a6qOK0rxbVxishCXBn3X7ERv1+mLO+mfvGaGIH5ZHHIa77tTwVSf2nDUQ3PCcsM5TpjELc3jy6F3tz1HbkeE+rPoUDPdfeW+Fo9pYva5P/R93q7dOPoZQr2LqCPNpNjCUiDALvKgWpHyiPm0pL2s= Received: from MW3PR05CA0003.namprd05.prod.outlook.com (2603:10b6:303:2b::8) by MW3PR12MB4412.namprd12.prod.outlook.com (2603:10b6:303:58::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 23:11:43 +0000 Received: from CO1PEPF000066EC.namprd05.prod.outlook.com (2603:10b6:303:2b:cafe::de) by MW3PR05CA0003.outlook.office365.com (2603:10b6:303:2b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.10 via Frontend Transport; Thu, 4 Apr 2024 23:11:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000066EC.mail.protection.outlook.com (10.167.249.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Thu, 4 Apr 2024 23:11:43 +0000 Received: from ethanolx7e2ehost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 4 Apr 2024 18:11:41 -0500 From: Ashish Kalra To: , , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 3/4] x86/boot/compressed: Skip Video Memory access in Decompressor for SEV-ES/SNP. Date: Thu, 4 Apr 2024 23:11:32 +0000 Message-ID: <1027427fafa350a41234f5061c8c48fc77c58326.1712270976.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: <20240325103911.2651793-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066EC:EE_|MW3PR12MB4412:EE_ X-MS-Office365-Filtering-Correlation-Id: ea5a8799-0c0b-4058-4d26-08dc54fc97d2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XmZXZHfXzY9AugVggxEAWz2PF33czLQQUOBnw3Yihz4Dl5XF7PXADSSdI9Ut1Cb7hn9bfswpjXp0Mq/R6godFX3lcRqYU8h5VgVFp/f/7VMexvlIMeKbzE1Dpywcj5y4IYjVJwfqvfLtbeB23RmUyvQ1EjnD+kjTykjQe7QDErodwXVuC1XXqDFh0Psb7jYKR6lei6gUh05Ouxzg/0F/LzVHgk9L3PAMbTVu07evIrR9kM5GZicpgm2CpjfRv3S22aPlo9kJR5Yc8KUQ8iw8+m8X5hidEHUlXZmIII463L61NJo9xWZCdKnDGq9di4ptSlMnObIZze8Zoh4pYsqbJcCGW2cZcTUXpW/onrSzr8Ve88iLxUpHAD9w3F5EHhCkkPiRx/SNjwCS/sfELJN0RThVO2djXYRIqOoRo0EFEjOQ6pkcROlwWD63KP7GtJaju4tkrRfDbjFwjcS9uLQGJYknWCcQyKqv7aYlPrERSf73Jy1MwFjLhAyxhEnIiUS58XRGTDqyS51IyPsIfOscYYfUj0XN3tHp1FJFENNqqQdGs3/CvMlaXWgOwBdnBDM0TsVSRUgm47b9K2LyVwNSllSt+rAKw5RbTls7bPd+knmzws8egIchG+ZE5kF6/Oor+KOIfJp6UlA345XKbxQsqmP3gdLGx31ymPbl8gk4EY3jnaV0HS9IxKKO8cczoKRpqI2oQy3nb3+fNSQRHpFN820c8fJnkBBic2+1eXWHgAw9/LUrnQfXp1aA7Kss8F4x X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(376005)(36860700004)(82310400014)(1800799015)(7416005);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 23:11:43.3526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea5a8799-0c0b-4058-4d26-08dc54fc97d2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000066EC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4412 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Accessing guest video memory/RAM during kernel decompressor causes guest termination as boot stage2 #VC handler for SEV-ES/SNP systems does not support MMIO handling. This issue is observed with SEV-ES/SNP guest kexec as kexec -c adds screen_info to the boot parameters passed to the kexec kernel, which causes console output to be dumped to both video and serial. As the decompressor output gets cleared really fast, it is preferable to get the console output only on serial, hence, skip accessing video RAM during decompressor stage to prevent guest termination. Serial console output during decompressor stage works as boot stage2 #VC handler already supports handling port I/O. Suggested-by: Thomas Lendacy Signed-off-by: Ashish Kalra Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/boot/compressed/misc.c | 6 ++++-- arch/x86/boot/compressed/misc.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/mis= c.c index b70e4a21c15f..47b4db200e1f 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -427,8 +427,10 @@ asmlinkage __visible void *extract_kernel(void *rmode,= unsigned char *output) vidport =3D 0x3d4; } =20 - lines =3D boot_params_ptr->screen_info.orig_video_lines; - cols =3D boot_params_ptr->screen_info.orig_video_cols; + if (!sev_es_enabled()) { + lines =3D boot_params_ptr->screen_info.orig_video_lines; + cols =3D boot_params_ptr->screen_info.orig_video_cols; + } =20 init_default_io_ops(); =20 diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/mis= c.h index b353a7be380c..3c12ca987554 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -37,6 +37,7 @@ #include =20 #include "tdx.h" +#include "sev.h" =20 #define BOOT_CTYPE_H #include --=20 2.34.1 From nobody Sun Feb 8 21:46:26 2026 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2050.outbound.protection.outlook.com [40.107.236.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6A4F13C3DE for ; Thu, 4 Apr 2024 23:12:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272326; cv=fail; b=Zd5Kd6tb/BGl7ubTHQM63XeYXlm/gWz+gtLyz1gDr6I2BchjtU13U2rRV3w/jVyakipc0/lOg28XQrZYDn/hvAAYfo9eJHzr/JgC5Y4moG1ATI2NLe6cAyQJhkwy0Je0GsBDJ1VnytbCU0omlx1V77t2hejxsU0xACZskNI3NFE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712272326; c=relaxed/simple; bh=HvRoEvMt9q4SQ1X5XXjunFIDo/QQ+DGe+1yndyurXBg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CZtnWzIuG2tyWExp2RXF/lmRqAfMhQri5JbjEtFHiK3b6Vu7QVSBdbd9D4/SEGRysav/akcAtczNj+tDrLooFcvBELihDDI/PuJscPpHk1xVtrPbhvDRhJluG2Tb+QCzQzFnqCn6yCCmd0qBhatW5ic4ELbDRd5OdIvSwdtmtPs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=NpGmvf3G; arc=fail smtp.client-ip=40.107.236.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="NpGmvf3G" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EimUzGdSRhqMRjhTVkugdrjIVi1HVnqB3VoceaYGqADNUo3s6vQxMNp9snaCkDGzSchEA4laPA02+zv2Mu05WhMjBWPIzHmvuMEmtSbcjTtwAo5Z6EescBSO1TzAIki7Sls995BvEAXp+8gpz7jmRj0gk54+MxQ+7zv5FdzSJqWcXeKDDAak1jYkKnzDShigpzc+WBfhEH8GAWSWr5rF3V4vrN0aydfqHMPU9tuVRNSbD7AGUE8sxoOtD7DxiSg5lcSoFw/UWUrP0pbVv2ew7Tai5s5H5FTyn+rq3K5i+BrRzn/kqMC9KWD9W25N4w+VuaRjniWvy5fW3+elO7I0/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WHSodj0GqwZea2cUnOdZNuVerpQ0f8rgFAq1UqU6UlI=; b=nS0TnBbuyoyHYNEjYt3HQlMrWkUjRi6KbEanzaIRndI2sYB1PQ2Fol4TpTFg6r6zPj275JrTBfe1HtJ7mV9NT5Swn7MhigdyE4UJjL3N+8s+AMq20VWZuKGqUgE84c26w/ANIxzCqEfLpwDnvXhtAvI2ajI7YeWyxRl9UWheaArfK0HhwXkCKyJI0UB/2ceqZh1L8XE55TLAaidMdNFUGItnlsmk6ooDuZq3wQbDnqfnX3+zgmQwev8if3hjpPlbk5sYAdfzVeZFDZ05ObykR+3SYrn09U9p5lC2cbzQ4Uv8z1T174zEHaHY+BzWyCWJdTm4cnW/f+fnWNQ/UrfQJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WHSodj0GqwZea2cUnOdZNuVerpQ0f8rgFAq1UqU6UlI=; b=NpGmvf3G6aYrpQX4f5zNwyzEhSpBxm2DkO7Sp+DtzZQyikvNbjgpx+uDbYC9R9SCOF9ghOVthWc4mZ9qRqhoFqY5v8ZTgc5G38UqMvAMYY9/KsH44aAWHoezbt3p67Ib3PkPIryLBBIjQhkOz1FFxPLugLivUotLU/2H0kZbYm4= Received: from BYAPR11CA0079.namprd11.prod.outlook.com (2603:10b6:a03:f4::20) by BY5PR12MB4260.namprd12.prod.outlook.com (2603:10b6:a03:206::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 23:11:59 +0000 Received: from CO1PEPF000066E9.namprd05.prod.outlook.com (2603:10b6:a03:f4:cafe::b3) by BYAPR11CA0079.outlook.office365.com (2603:10b6:a03:f4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46 via Frontend Transport; Thu, 4 Apr 2024 23:11:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000066E9.mail.protection.outlook.com (10.167.249.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Thu, 4 Apr 2024 23:11:58 +0000 Received: from ethanolx7e2ehost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 4 Apr 2024 18:11:57 -0500 From: Ashish Kalra To: , , , , CC: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 4/4] x86/snp: Convert shared memory back to private on kexec Date: Thu, 4 Apr 2024 23:11:48 +0000 Message-ID: <41db1ebbe58fb082dbe848f1c666ed23e83f1752.1712270976.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: <20240325103911.2651793-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E9:EE_|BY5PR12MB4260:EE_ X-MS-Office365-Filtering-Correlation-Id: 11199496-6a8d-4ab7-3c3b-08dc54fca0fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SSgSFktirR2Hh8E2oEOfkxi4BTd7x3DnpFJD4azYr8dus83TXhwOayO2AWtK6GaDOI8Yd6/e0kgOLp4pgmR4v13g5rSw9UNPMkuQ/8pu7uxwaJMXlpsYBI5mSxEB2C+0Gb3ORtmcm5oWHDYEfBU9jTLKFDCExt/+0u+JoNUHnkqD0Bzz18ulM0QSVbI0KGNCXQYZ20QdCyNf3i1tgcaaotRRw8UOPqlW18fPaFoATGPYagTxNerzNZAgI4XtLjohiUmyuzG3PTcx1xw2xvnqlVOc17Y7NE4cSTTjjL5QIpMtNZwycZIhokuH2c6gdXfh0dUbUhJ0GwG13j3y/QxXeOeF+fSkrkq8sDv6dA7RpgSSAJMwNhQaYpmGgGxukx4zbkDQWIhuzWfxo+dyNh7KdCf8M8JIZbiSw6eLks09xbsGnGnlzmlHph7RGRYK1kcQlR5l7yiUvd/I7fHydtNO83JXf3qm2tXxq31ZbwzlazqDzrgOs7OzCpsGZar/KXn0/7BTNq9JlfNFqLBas6Wt2J1Fe1CYp9u27FKqN8BXEfAhjYOZ749SkqNZLos2XYYqAZAwuQsOMY01+Tx3oqnKOrurMONCoDFa1AarIW2NJRfeR1yJrMA60EBBv99F71cayYRnEwYcy09KDR8n00MqouQC//5bkD5WmEaIqs4TKckZAJ+ybeHkQzVMax6NR2ILH0sl2SJ7hEgOkXyt4zJBpFPtmrYD/MgPAYEVKyjqPgscya/eN/k3FAj8y0P49oMh X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(36860700004)(376005)(1800799015)(82310400014)(7416005);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 23:11:58.7360 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11199496-6a8d-4ab7-3c3b-08dc54fca0fb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000066E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4260 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra SNP guests allocate shared buffers to perform I/O. It is done by allocating pages normally from the buddy allocator and converting them to shared with set_memory_decrypted(). The second kernel has no idea what memory is converted this way. It only sees E820_TYPE_RAM. Accessing shared memory via private mapping will cause unrecoverable RMP page-faults. On kexec walk direct mapping and convert all shared memory back to private. It makes all RAM private again and second kernel may use it normally. Additionally for SNP guests convert all bss decrypted section pages back to private and switch back ROM regions to shared so that their revalidation does not fail during kexec kernel boot. The conversion occurs in two steps: stopping new conversions and unsharing all memory. In the case of normal kexec, the stopping of conversions takes place while scheduling is still functioning. This allows for waiting until any ongoing conversions are finished. The second step is carried out when all CPUs except one are inactive and interrupts are disabled. This prevents any conflicts with code that may access shared memory. Signed-off-by: Ashish Kalra --- arch/x86/include/asm/probe_roms.h | 1 + arch/x86/include/asm/sev.h | 4 + arch/x86/kernel/probe_roms.c | 16 +++ arch/x86/kernel/sev.c | 169 ++++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt_amd.c | 3 + 5 files changed, 193 insertions(+) diff --git a/arch/x86/include/asm/probe_roms.h b/arch/x86/include/asm/probe= _roms.h index 1c7f3815bbd6..d50b67dbff33 100644 --- a/arch/x86/include/asm/probe_roms.h +++ b/arch/x86/include/asm/probe_roms.h @@ -6,4 +6,5 @@ struct pci_dev; extern void __iomem *pci_map_biosrom(struct pci_dev *pdev); extern void pci_unmap_biosrom(void __iomem *rom); extern size_t pci_biosrom_size(struct pci_dev *pdev); +extern void snp_kexec_unprep_rom_memory(void); #endif diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 9477b4053bce..51197a544693 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -230,6 +230,8 @@ u64 snp_get_unsupported_features(u64 status); u64 sev_get_status(void); void kdump_sev_callback(void); void sev_show_status(void); +void snp_kexec_unshare_mem(void); +void snp_kexec_stop_conversion(bool crash); #else static inline void sev_es_ist_enter(struct pt_regs *regs) { } static inline void sev_es_ist_exit(void) { } @@ -260,6 +262,8 @@ static inline u64 snp_get_unsupported_features(u64 stat= us) { return 0; } static inline u64 sev_get_status(void) { return 0; } static inline void kdump_sev_callback(void) { } static inline void sev_show_status(void) { } +void snp_kexec_unshare_mem(void) {} +static void snp_kexec_stop_conversion(bool crash) {} #endif =20 #ifdef CONFIG_KVM_AMD_SEV diff --git a/arch/x86/kernel/probe_roms.c b/arch/x86/kernel/probe_roms.c index 319fef37d9dc..457f1e5c8d00 100644 --- a/arch/x86/kernel/probe_roms.c +++ b/arch/x86/kernel/probe_roms.c @@ -177,6 +177,22 @@ size_t pci_biosrom_size(struct pci_dev *pdev) } EXPORT_SYMBOL(pci_biosrom_size); =20 +void snp_kexec_unprep_rom_memory(void) +{ + unsigned long vaddr, npages, sz; + + /* + * Switch back ROM regions to shared so that their validation + * does not fail during kexec kernel boot. + */ + vaddr =3D (unsigned long)__va(video_rom_resource.start); + sz =3D (system_rom_resource.end + 1) - video_rom_resource.start; + npages =3D PAGE_ALIGN(sz) >> PAGE_SHIFT; + + snp_set_memory_shared(vaddr, npages); +} +EXPORT_SYMBOL(snp_kexec_unprep_rom_memory); + #define ROMSIGNATURE 0xaa55 =20 static int __init romsignature(const unsigned char *rom) diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index b59b09c2f284..1395c9f0fae4 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -41,6 +41,7 @@ #include #include #include +#include =20 #define DR7_RESET_VALUE 0x400 =20 @@ -91,6 +92,9 @@ static struct ghcb *boot_ghcb __section(".data"); /* Bitmap of SEV features supported by the hypervisor */ static u64 sev_hv_features __ro_after_init; =20 +/* Last address to be switched to private during kexec */ +static unsigned long kexec_last_addr_to_make_private; + /* #VC handler runtime per-CPU data */ struct sev_es_runtime_data { struct ghcb ghcb_page; @@ -927,6 +931,171 @@ void snp_accept_memory(phys_addr_t start, phys_addr_t= end) set_pages_state(vaddr, npages, SNP_PAGE_STATE_PRIVATE); } =20 +static bool set_pte_enc(pte_t *kpte, int level, void *va) +{ + pte_t new_pte; + + if (pte_none(*kpte)) + return false; + + /* + * Change the physical page attribute from C=3D0 to C=3D1. Flush the + * caches to ensure that data gets accessed with the correct C-bit. + */ + if (pte_present(*kpte)) + clflush_cache_range(va, page_level_size(level)); + + new_pte =3D __pte(cc_mkenc(pte_val(*kpte))); + set_pte_atomic(kpte, new_pte); + + return true; +} + +static bool make_pte_private(pte_t *pte, unsigned long addr, int pages, in= t level) +{ + struct sev_es_runtime_data *data; + struct ghcb *ghcb; + + data =3D this_cpu_read(runtime_data); + ghcb =3D &data->ghcb_page; + + /* Check for GHCB for being part of a PMD range. */ + if ((unsigned long)ghcb >=3D addr && + (unsigned long)ghcb <=3D (addr + (pages * PAGE_SIZE))) { + /* + * Ensure that the current cpu's GHCB is made private + * at the end of unshared loop so that we continue to use the + * optimized GHCB protocol and not force the switch to + * MSR protocol till the very end. + */ + pr_debug("setting boot_ghcb to NULL for this cpu ghcb\n"); + kexec_last_addr_to_make_private =3D addr; + return true; + } + + if (!set_pte_enc(pte, level, (void *)addr)) + return false; + + snp_set_memory_private(addr, pages); + + return true; +} + +static void unshare_all_memory(void) +{ + unsigned long addr, end; + + /* + * Walk direct mapping and convert all shared memory back to private, + */ + + addr =3D PAGE_OFFSET; + end =3D PAGE_OFFSET + get_max_mapped(); + + while (addr < end) { + unsigned long size; + unsigned int level; + pte_t *pte; + + pte =3D lookup_address(addr, &level); + size =3D page_level_size(level); + + /* + * pte_none() check is required to skip physical memory holes in direct = mapped. + */ + if (pte && pte_decrypted(*pte) && !pte_none(*pte)) { + int pages =3D size / PAGE_SIZE; + + if (!make_pte_private(pte, addr, pages, level)) { + pr_err("Failed to unshare range %#lx-%#lx\n", + addr, addr + size); + } + + } + + addr +=3D size; + } + __flush_tlb_all(); + +} + +static void unshare_all_bss_decrypted_memory(void) +{ + unsigned long vaddr, vaddr_end; + unsigned long size; + unsigned int level; + unsigned int npages; + pte_t *pte; + + vaddr =3D (unsigned long)__start_bss_decrypted; + vaddr_end =3D (unsigned long)__start_bss_decrypted_unused; + npages =3D (vaddr_end - vaddr) >> PAGE_SHIFT; + for (; vaddr < vaddr_end; vaddr +=3D PAGE_SIZE) { + pte =3D lookup_address(vaddr, &level); + if (!pte || !pte_decrypted(*pte) || pte_none(*pte)) + continue; + + size =3D page_level_size(level); + set_pte_enc(pte, level, (void *)vaddr); + } + vaddr =3D (unsigned long)__start_bss_decrypted; + snp_set_memory_private(vaddr, npages); +} + +/* Stop new private<->shared conversions */ +void snp_kexec_stop_conversion(bool crash) +{ + /* + * Crash kernel reaches here with interrupts disabled: can't wait for + * conversions to finish. + * + * If race happened, just report and proceed. + */ + bool wait_for_lock =3D !crash; + + if (!stop_memory_enc_conversion(wait_for_lock)) + pr_warn("Failed to finish shared<->private conversions\n"); +} + +void snp_kexec_unshare_mem(void) +{ + if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) + return; + + /* + * Switch back any specific memory regions such as option + * ROM regions back to shared so that (re)validation does + * not fail when kexec kernel boots. + */ + snp_kexec_unprep_rom_memory(); + + unshare_all_memory(); + + unshare_all_bss_decrypted_memory(); + + if (kexec_last_addr_to_make_private) { + unsigned long size; + unsigned int level; + pte_t *pte; + + /* + * Switch to using the MSR protocol to change this cpu's + * GHCB to private. + * All the per-cpu GHCBs have been switched back to private, + * so can't do any more GHCB calls to the hypervisor beyond + * this point till the kexec kernel starts running. + */ + boot_ghcb =3D NULL; + sev_cfg.ghcbs_initialized =3D false; + + pr_debug("boot ghcb 0x%lx\n", kexec_last_addr_to_make_private); + pte =3D lookup_address(kexec_last_addr_to_make_private, &level); + size =3D page_level_size(level); + set_pte_enc(pte, level, (void *)kexec_last_addr_to_make_private); + snp_set_memory_private(kexec_last_addr_to_make_private, (size / PAGE_SIZ= E)); + } +} + static int snp_set_vmsa(void *va, bool vmsa) { u64 attrs; diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index d314e577836d..dab2dc2207fb 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -468,6 +468,9 @@ void __init sme_early_init(void) x86_platform.guest.enc_tlb_flush_required =3D amd_enc_tlb_flush_requir= ed; x86_platform.guest.enc_cache_flush_required =3D amd_enc_cache_flush_requ= ired; =20 + x86_platform.guest.enc_kexec_stop_conversion =3D snp_kexec_stop_conversio= n; + x86_platform.guest.enc_kexec_unshare_mem =3D snp_kexec_unshare_mem; + /* * AMD-SEV-ES intercepts the RDMSR to read the X2APIC ID in the * parallel bringup low level code. That raises #VC which cannot be --=20 2.34.1