From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757985AbdDRVSd (ORCPT ); Tue, 18 Apr 2017 17:18:33 -0400 Received: from mail-bn3nam01on0079.outbound.protection.outlook.com ([104.47.33.79]:6720 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752866AbdDRVSU (ORCPT ); Tue, 18 Apr 2017 17:18:20 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Tom Lendacky Subject: [PATCH v5 11/32] x86/mm: Add support for early encrypt/decrypt of memory To: , , , , , , , , , CC: Rik van Riel , Radim =?utf-8?b?S3LEjW3DocWZ?= , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , "Michael S. Tsirkin" , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Larry Woodman , Brijesh Singh , Ingo Molnar , Borislav Petkov , Andy Lutomirski , "H. Peter Anvin" , Andrey Ryabinin , Alexander Potapenko , Dave Young , Thomas Gleixner , Dmitry Vyukov Date: Tue, 18 Apr 2017 16:18:14 -0500 Message-ID: <20170418211814.10190.45922.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170418211612.10190.82788.stgit@tlendack-t1.amdoffice.net> References: <20170418211612.10190.82788.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR19CA0022.namprd19.prod.outlook.com (10.175.226.160) To DM5PR12MB1146.namprd12.prod.outlook.com (10.168.236.141) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee21200b-2dab-4454-b003-08d486a06e72 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(201703131423075)(201703031133081);SRVR:DM5PR12MB1146; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;3:57Xv2nj6z0alXTjhVcjEoY0NLIoDZBzk6TZG8leGZWLfXMTziPKPbgBjNdN5J4oVuWE/K1BrRDw3BXTOk6bW4hjOhNeB65NAUWpefMlr97rMfXVA42Ka7Nn3VNPmK1Io6jks1E4aB9+72VErB0qhoxIoEhl7YWHvR4RCmWtr8SyLzuzCdJoBIIZYjEMK5Ekiz0vQyBUYxONtdDP295cTQzfy5rnVczX4ghho8gmbqUhY33QedtVxxFq+t849aZ/OT/1WVaX1+46GZlvKPnppgmKf8iS4fOFVjEErsL7pBdm0kOoQc+RSLUOLu+uaMyyjwKUnIPPyxx9VITufgBjBEluQvI3Iq8efWahVepc09b4=;25:6G5kPbaPdcKz3Q9mA/UYvivuwqApCXeCyf1J+jIykeh6wziEIkKGXqK2ZazcMKu3dzQEcJLUgi7H0I7MqbURpOzElcGsaI5Ans504iCAMVJHTjG4UkF6W6l9TpQFt4LqeaYyt42a7gavcIJdXMKG3zWaYXwL5Xaz+/WVelbNQweAkVabEiN5BJQMwYKX8XFSjVaXd1TPizSitFV3vMDhdpH8mfKFae2hdvcE3bKoBRYvBIn5tH+SgO4MGE+4a4ZVQopzQOgKWwAoUG1VbEDMsM5BSTZWz+EF9uX7XMLzMq1eHTpXbOuHJovln1Fbhb2hc1lTcwNzEgraRrRKG55fdqjaWk6AOzuoBD8LbmC2uKjMNzT+LNF0IX7qI6DYjjO7jIVvkkfZXY4IDZNbRjutPzRRkkMJuq9xkGMLkkMmxKIZMqDIUzyVudBphEub0WxrjIGvtYRKRLaFcev3p8HIVA== X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;31:Id0+ZBtMFlvP7KG5Vfudd2IJbEHYG9xvzZ+enLM6GLZ1Tbv53nivu3CtaISjXD2RxxsNumiquktLMyxjgmL4m5sttq7e8z65o71dl2hrtKBfMtlm/R69vIe9OVfrSjTZJsyRKC1pQ70M7mzyv5ym29drlfrrkuuwUTdqy7t/4xLsouPEqBIX1ggPrrREsAoUPo9ciFaLmWucWAX+zJXDBxsuMiYJ3/Srcs30aWydGjU=;20:ld/XUye2tNE9jn0HdwI++W4qywCc5K+dUtQD5/d9trS1fNa2ez8kgHtQBAEoTpKlFRoYsbcaYpHXzeLEH2UB6SeeQmzWKbn/qyN4ESnshMmdqS6AIZZ26CGy+da827APtUE8u9MnQ8cYtHIusfIzRmdRnAUkAPnSjoUxPe656TO91CTWdqy47ARhrShU3atyYF+NXCJPxyGlwoTW6e07uPr+UoDN+wWi17t0tpqB99xOdtprB+Hkl+Nbj3DEyRiPpqKb/oUsPMV4FhuH3Gjm7/7CD9kpy8rqEp0t8xsIiLfu9YXDlWEOlERz1ijrBZUNZOi5QUx69NuPcvQ9W1AsKPWkIUDdh3wtdXmosaZMbj0yJ26cmZYykxy84tkeALbz0qgjsXlkHTHs2k1hU1cNo+VRTlLdWOcajRAJmS2kdF5XC3jAbCCtjLZdi5g7iGoUefSusW48WqAtQDJM5u5EqX0LcUogzA8oOMdCjxc/VfvWoW8vlJ7DhZJRyqiEsa6t X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123555025)(20161123562025)(6072148);SRVR:DM5PR12MB1146;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1146; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;4:+p9DzFrsXYTxV7LAG2a7sBHtz41igqC24FJZ/9Lx5kdKX0uCu7hFyKLepcl9BpU1Jv3JowVyrNuS88ZQZMYKAK1pHlYUJV2uA3sWGn+XP9rQZK+sd5Y7uza2C/Hd0tVbwPAICB0nCugjt2qy4AstyZo0tGYwVZKUf7F+3sSjs+zrxbzDV0MlbIPwSMFA9O5RWioVFgIf7EMgapqcHDEdLh968mdIKR2cwIz50eJZnmpMFhecFKuAtYdo40c49y7i+VVb35khD5Agc6kemutnx03LDNG4rGarIi9ogWrhnB7jrVy20fN0dBmYvnm/jH3rwPhtneUaHrjZ8s0y1Zkzu+kb4+1F3u9bD6hEohgzCUh948rD/2ooQInKQv1Dp0EJ9RQ/7pHEbA9bw0RKZcSzlXBn9Ix0WvnMJzNdBE9eHL64LCvxa5anabcZ+uyqwm7tnG1DcbryDLnFAchC8uYQjjtq0dZ3Vd8bCjYsxpndqFYRQqSmCP/kTl2wY9aV7HDoT8owO7kx96rs1ymoRGa/nwX7xzTB1ukxC6JEIwLxhztRkOw0qsaWTpmK/c+P65wpOEOqsk+te7KfQJeDpMykobkAaILmfcBqmvkox8ni8/lDYTjEPVyaBbmAiJ3Y8qcP536D6OzlGkHukBH+KARRszUywbvu1iil1eZDVqqm9Xss26w7xYonAsQPzU5wyb8vcS5ED3yrRzTPWUrWJfhGQLAmfMtldrr0n/w7UkOC1kWFrHr1xnmbccio/W/wyaxkhykBOvA0wII4nTr0jPcP2g== X-Forefront-PRVS: 028166BF91 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39410400002)(39450400003)(39860400002)(39400400002)(39840400002)(39850400002)(97746001)(23676002)(47776003)(2906002)(1076002)(7416002)(189998001)(9686003)(54906002)(6506006)(7736002)(305945005)(76176999)(2201001)(54356999)(55016002)(4001350100001)(53936002)(50986999)(86362001)(7406005)(66066001)(8676002)(3846002)(25786009)(50466002)(5660300001)(4326008)(6116002)(83506001)(230700001)(2950100002)(81166006)(53416004)(103116003)(38730400002)(33646002)(42186005)(921003)(71626007)(1121003)(309714004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1146;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMTQ2OzIzOm03d0NiTmlwemZ4YWZTZFZabzhsNGR5UnZx?= =?utf-8?B?WnppTFB6TGZXRE45WDRHdDdIUUFad2ZOalBoNmRaQ2QyS1M5T1hXdy85S1ZL?= =?utf-8?B?N0pvSS9ZUGdLUEhhZ2IvYWhpSkF4aUhpVEltZnRMeW5rM3YvbzVsNlVqdktG?= =?utf-8?B?S01UUEZYU1RkUzdjemE4b1NNd0krWFpSUXRiWGVvODV4ZHZiUjRFSEoyQkdD?= =?utf-8?B?MG9CQkNkNklic3g1ZzRqSWlsWk1GUCt1OWFtTGhZUmllQUtSaG1MbzBIOTJs?= =?utf-8?B?V1FWY0pJcFlIRWtiQmR3eDhVQndUOU00ZU9pb1RqelFEWmdNcGs4Q2ZHa0dm?= =?utf-8?B?R2RwaWphUTl4cTc4Njl5MGRBRU55Y1BnZG83L2JHRVVHS2JKTUFTUnVVMEw5?= =?utf-8?B?NGtxOGQxV0M0eGpGWGdYc1B4RjFLRUhBeTExNG5FUXFzUUZRUVNHWWx2aCtv?= =?utf-8?B?QlR1NXJoaktudXl1RmlheWNva21UaW5zNGpPYjhIaFRVZkFBR3Z3Rk84Vm5v?= =?utf-8?B?T2lqeVpoL3l2T3htYzBNOFRXRlBKWWt0clZzNUZuVEg3eUpRZlRVRWM5ZHdU?= =?utf-8?B?cStmYXdRTWR1Q2xISGZQakFuY0dsNTFWQzJSRWNFc2ZyNG1NcWdXM0xOVm1l?= =?utf-8?B?eEpaL001S01MbVdXOXNkcVBqZHF2UXRKdUpvbFdLOWZJbnd0Z09ucEhzVXQ5?= =?utf-8?B?WXdzS2UzeUZOY2ZuL29OTVM5S1RnRktMTHFRKzk4YlBRSHNpT0g3RFpyVXFw?= =?utf-8?B?b2VvaG9jSWxOd2RNazhadWdyN0czcHc1OEhKdVdEMm5jRWlNQ3dyQkFkSlBI?= =?utf-8?B?K28yRlRmYUZZWXcvWklUWUdhN2prRm9vZGtlWjV6NHEvZjhlUVBLSXN2UzJP?= =?utf-8?B?WEN5Y0pWdldxa1RndW1saTZqWEpMNXY3bGlaL2E0aUtoL1Y3TDdhUmZLc2kv?= =?utf-8?B?SE50eC9OaWtqNmRhdFhsL0xCbUpvakZnTnVVQkFwZGN4eElSMS9QNEx1b0dE?= =?utf-8?B?TG1ZSXJOa202ZENkMEpMY2dkYThCQ2FsUGs5NXhOaHcrNkhHS0dDTUR2Titj?= =?utf-8?B?amJuRGdpMUN4SEdXbDhTbHNyQVZIRTJEME9SWlJ6OW5hU3FTVFhqRkpYRFYv?= =?utf-8?B?cWxJVjRXZ0xwbnByNGJmbGpmcERLZzNBRzFPUFdRWTZEZ0p3OVA1a3MrcS9C?= =?utf-8?B?UGR4cHZ6cmpWNTYySjhBcDRIQmcwYSs2bFpGWWJmZlpBRDZSalY1Y0x3bVRm?= =?utf-8?B?MSsrMzJJNktBYU44UWp3VFRqeEhpb3VQN1dtSFVIaGJ2cXdyam5pczE3dTRN?= =?utf-8?B?TUowczB3bEkzY1ZtQTFkQjM2ZUN5Wk9DZEJGS3U3aWM0SjNqUVJaMVliaWtB?= =?utf-8?B?cVNNV1lyeUFTTjhIWk0yNkdzSUVWNExJZ2NWU0ZKTEVkKys2Q1hqcnphZS9O?= =?utf-8?B?ZGxaV2I0bTZjRXNPRWN5dGRoTkFQKzYvZzgzVGF3TXZHekhwVGs2V29BQ3Fv?= =?utf-8?B?c0sweC9QOXlsWS82THFqUVpGNHNBcEdQdmE3TW1hZ3lCZEluYTRsT1c1ZmJi?= =?utf-8?B?TUN3TTYxSlRQMVdjTzNzbDdKV2N2TjFvSFFXeGRpM1dMMjFYV2lyOGkvTWwz?= =?utf-8?B?bERJZWNQYlJxVjhubVp1MHM4YXI5OG1HUkJsWk9NTlNvOG8wV3pVUC9nPT0=?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;6:cAc7zGm0AwlEzfvgO0yrtcfUNybuOPz+Tp3I1jTfzgN4p7BhQkhrrCdzadcfQrQ/owZNHig+v8MnfmBJirUXnFEy8howvqCa13o4uPJE+vt5tv/7vkkCvu/CUOi4JAVtGvpjAUbecBSKfKyRnU4iT8WQ6syNIJREwliKUprKKbZEhFGI+1Ojs1xYy9q4cBw6/K3cdOwIoo51EJisjQYNpk2gGkbjeAU3hm8ohrRet+FeaHYC8Izj1WsYVDk5tkjSu93vlf7l/7edIorUNil1NvyuE6+vSNAw3qee0F2I7gLXIm/gz5cOJr7PI3ndvxkrFMV5HLbVS+EFg9tHoBjUy3V4i0pDIZn80p8Sx8P/ycs4UzSjRoPWXVRHFLI7jMQxtFwHAfCuIG56ff7HXPDRntg8mx7+K+QjdCBNPigI1HTe/6BnqNelgCJ5JdbknyC/Zu/ZKxpuBD7A11NvgBmmk1VSyxFV6EQGxwERV6ii++ClEPEJ5RK+WETR6ZzYEIM0SM2MJOgDN6hvdJKfkFQfIi8Q8fJjditKTRrbOoRHUn4=;5:x2ip6K8iNxoUN82ovfCGFXNT0aUabpiG6aFHgO3HyBCgksKdH31valEuJAxe58txxXlwSwShyqRRm+JX+MIw7ET+692ymbErNMuAXyiySoxDk29P/BJpUsTrftceUuyfes7tfW+Jh0pk9Tj2/+12Dw==;24:uxYr2JBQUZJW99U3U43qQ5zA8volS/ub+i8tKHJktNRmPCSaIZOH+d+G92Nd/Qk5Lj3XQzsdwUPnkKxDzyyscZMNGr92Z+G2UooqmI0aox8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1146;7:rUhNNb68UJB8/F5rDa4pXHsssSrYPZDlw9mrFaESGQM4vYYDJtg3ht6cyBZECgTQcFcsMUizzk+M9HHT2HbTTK5Hepz+OiDbkpJHd3vP43Q6iTbc+w2y8EwIdqU0gxBD3l0fLG3JXaGhi+1P2Wunjv2jknAL2G1by8jX/t8vPU9bcittgQxGiqM4dLHzIiaZe/2ZirS5s3iCxUUuAXBFiPhBLp3uFHU8WngFRwfPgjjgUaxLlVLRdhp6p51qPlQvOzSi1i9OvI+Wn51NTJ2DrgPcfkvF2ONGO3C57VFMxJDP17iQUgWeEw+mUCEeIrSEr67NGlSb//WKQTMO2DCn6g==;20:lW+11Xq3yHBO0MfmNWySi3kBdCwq0D3zGRBYK8bmRRTPrZKNu3SwJppW5MXZVSKVOALZFwJVfEulPh4wQDFMV8R6et9rooEDwGd08Rw41Td+l+AsCzXRXYUJzB1uqAi/LP4HD4nOOIuvwhEuTZ3qzVP+tPo6+3u3ZRoz2VRu7qPI2rCEpUqdszH7hN5nMst93vICLd1Jr081MNKeun093ICSbnsY8DUlfc7QrhaaVogsiqX8V2vNr12/RIYzh2Na X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2017 21:18:16.4615 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1146 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support to be able to either encrypt or decrypt data in place during the early stages of booting the kernel. This does not change the memory encryption attribute - it is used for ensuring that data present in either an encrypted or decrypted memory area is in the proper state (for example the initrd will have been loaded by the boot loader and will not be encrypted, but the memory that it resides in is marked as encrypted). Signed-off-by: Tom Lendacky --- arch/x86/include/asm/mem_encrypt.h | 15 +++++++ arch/x86/mm/mem_encrypt.c | 76 ++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index 9fdbc53..4021203 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -26,6 +26,11 @@ static inline bool sme_active(void) return !!sme_me_mask; } +void __init sme_early_encrypt(resource_size_t paddr, + unsigned long size); +void __init sme_early_decrypt(resource_size_t paddr, + unsigned long size); + void __init sme_early_init(void); #else /* !CONFIG_AMD_MEM_ENCRYPT */ @@ -39,6 +44,16 @@ static inline bool sme_active(void) } #endif +static inline void __init sme_early_encrypt(resource_size_t paddr, + unsigned long size) +{ +} + +static inline void __init sme_early_decrypt(resource_size_t paddr, + unsigned long size) +{ +} + static inline void __init sme_early_init(void) { } diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index 8ca93e5..18c0887 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -17,6 +17,9 @@ #include +#include +#include + /* * Since SME related variables are set early in the boot process they must * reside in the .data section so as not to be zeroed out when the .bss @@ -25,6 +28,79 @@ unsigned long sme_me_mask __section(.data) = 0; EXPORT_SYMBOL_GPL(sme_me_mask); +/* Buffer used for early in-place encryption by BSP, no locking needed */ +static char sme_early_buffer[PAGE_SIZE] __aligned(PAGE_SIZE); + +/* + * This routine does not change the underlying encryption setting of the + * page(s) that map this memory. It assumes that eventually the memory is + * meant to be accessed as either encrypted or decrypted but the contents + * are currently not in the desired state. + * + * This routine follows the steps outlined in the AMD64 Architecture + * Programmer's Manual Volume 2, Section 7.10.8 Encrypt-in-Place. + */ +static void __init __sme_early_enc_dec(resource_size_t paddr, + unsigned long size, bool enc) +{ + void *src, *dst; + size_t len; + + if (!sme_me_mask) + return; + + local_flush_tlb(); + wbinvd(); + + /* + * There are limited number of early mapping slots, so map (at most) + * one page at time. + */ + while (size) { + len = min_t(size_t, sizeof(sme_early_buffer), size); + + /* + * Create mappings for the current and desired format of + * the memory. Use a write-protected mapping for the source. + */ + src = enc ? early_memremap_decrypted_wp(paddr, len) : + early_memremap_encrypted_wp(paddr, len); + + dst = enc ? early_memremap_encrypted(paddr, len) : + early_memremap_decrypted(paddr, len); + + /* + * If a mapping can't be obtained to perform the operation, + * then eventual access of that area in the desired mode + * will cause a crash. + */ + BUG_ON(!src || !dst); + + /* + * Use a temporary buffer, of cache-line multiple size, to + * avoid data corruption as documented in the APM. + */ + memcpy(sme_early_buffer, src, len); + memcpy(dst, sme_early_buffer, len); + + early_memunmap(dst, len); + early_memunmap(src, len); + + paddr += len; + size -= len; + } +} + +void __init sme_early_encrypt(resource_size_t paddr, unsigned long size) +{ + __sme_early_enc_dec(paddr, size, true); +} + +void __init sme_early_decrypt(resource_size_t paddr, unsigned long size) +{ + __sme_early_enc_dec(paddr, size, false); +} + void __init sme_early_init(void) { unsigned int i;