From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753848AbeAJT0K (ORCPT + 1 other); Wed, 10 Jan 2018 14:26:10 -0500 Received: from mail-sn1nam01on0055.outbound.protection.outlook.com ([104.47.32.55]:40576 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753807AbeAJT0D (ORCPT ); Wed, 10 Jan 2018 14:26:03 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; From: Tom Lendacky Subject: [PATCH v3 1/5] x86/mm: Cleanup register saving in mem_encrypt_boot.S To: x86@kernel.org Cc: Brijesh Singh , linux-kernel@vger.kernel.org, Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Thomas Gleixner Date: Wed, 10 Jan 2018 13:25:56 -0600 Message-ID: <20180110192556.6026.74187.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20180110192544.6026.17285.stgit@tlendack-t1.amdoffice.net> References: <20180110192544.6026.17285.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: DM5PR21CA0043.namprd21.prod.outlook.com (10.172.92.157) To MWHPR12MB1152.namprd12.prod.outlook.com (10.169.204.16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06f57392-c3ce-41a1-4c90-08d5585ffb0d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7153060)(7193020);SRVR:MWHPR12MB1152; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1152;3:OhLCdmmajiNwJ0TkogWgrXoJ4aHK6ibFSBT0+eUADPzJnadgzWJirX+sP3thO6z+PnBwoTOngsWpOdrSHkohhHWsFMbD9I4WGHAMf7DtZoLt/eSuFb7Fg9g0jl874JMCzRG3RA49BFcmzPJk/G1doZktS9JAu/9xT916d7Iyye1iELOVH65KAgDR378q1WY1h+6S64m6YZzxC19vKTIEtg3NtGDYZ1KueCs1qgMwoYKGWmmW+g2qY5ExdvloaIMj;25:VOdUV5n11M5DG7utoyXEpp+G3GlNGGYXYjWTIWqmSwe1Lt5J+xfmi4t5+IJva0d2XecVYpPd25XT98ptDlrg/Dxea5FgUcYowsyWLtMNN+DPig0hmdhROfv6XuRVhZ2dmokhZRLo57K5kT+S6/9m5XYRSiI6pInIsx7djFbyeZscva1taIHCsNuTEANqaOUvQDUtBuRQmso4EN0cCLiM3/zH+mM9ndzMyQOB8NfMV5iO3/pEUu/bIPc2mZ7cREIMPBke5TCoVZlnMo2rvUbvtw/RrTGbvYLv2Wdi4J2ir9TVHxkT+YHfzQ3/uQ0MpzplNuf2Pw2HxHyhfLJl2aXwtQ==;31:W2wH5DsFdvaEffJy0dtUmvXEWkrgWEJ8IXZiN5RQm5OkkuqGA3Th6XeEvmsNGBkUuK1/EPYYYG6nuuMI3oVQwufQqBJoKhFPQFwzJrab+iMFE2DTGY1CqJtQTiNUBE5XZ2en40OV6oyXGCgwkKveheNArExloqPXPU2JIdqLPuIHo8LBRszFomhpO2uwXFmI8o8xJrlvcE1EY8sEJfPwCmsJGRBtOGvKvxGVtdroScs= X-MS-TrafficTypeDiagnostic: MWHPR12MB1152: X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1152;20:M2KBRef6LIT9V3neS4oOJupOaNfGbf9iDln93mTjdoBiwk9EoxpY3AszTYQq4y6dSEqv7DEjh54JiZk8enxbCrE3IL6ugsUqjGSgfgRI64+ExxAquz0vdoy2XkiYSN7dKbnbnieS+ixbv1W24CMTauaqDYr1atQp9HzsKCOkl46/VZ3QnuZ0i5XRt8NHqdMqxNEt85k+SR5nHscCoBCU5jA3B7Y8JUlYVBFnReiLy3ev0robadsr8xqOh+fqlMbwT8nMUXp0DfWdIyS/gL8xQq//eq2eMutvP5yePF9caDTsggB1AL6YmhwYJ29Yeuabt+y7Sapk6qFUeWHaUCNKvMqIN/BfjQvscYm+MdfiOphu9U3uK33XWBXab4WJXvz+1x3n9Pe0ndzuB0hpXcsqveXZq1KsKCliTPzugXW386WraoLZDWgJ2vJiHtWWOqjpqDb1w3fTIvhdzniUWpRB0uYeg/1cVcIXN6ktoQYJsKPVwiBSnJa1/UpVd6MwSZji;4:2dVksMHlQhx3gj/FtXIJl+NjtoOeN+Ql6IBR5clwr+4aMyQCNc/4+csVDxWL4CoRBLwWzKEMHxMelBkW+/MNQg4FbFxyEXkcJ7+6fWgVkjT7mYG/sTzlhlxca3xC144bIcCnOiE3l/RyDNb/sSDbedFtb23rOgFv6hlVUQVunMu/fEGTzUYv8ltHeotXDuxlPPfsEfEw7kPGbKHVhTRGpSVEBvoDiXSKK5Vwyh3+/2tXInh+X3udla+M5yZonmU/z9oOUMEymMiL/24UHgLmRJJJHAw1dA8Fe/YGm9ou4OG/ii5jOwkYbiYKUjD9Vgux X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040470)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231023)(944501075)(3002001)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011);SRVR:MWHPR12MB1152;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:MWHPR12MB1152; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(396003)(346002)(366004)(39860400002)(376002)(39380400002)(189003)(199004)(2361001)(58126008)(55016002)(316002)(53936002)(9686003)(4326008)(54906003)(25786009)(69596002)(83506002)(103116003)(2906002)(16526018)(106356001)(50466002)(230700001)(5660300001)(59450400001)(2486003)(23676004)(7696005)(76176011)(52116002)(105586002)(2351001)(8676002)(81166006)(6666003)(8936002)(47776003)(2950100002)(53416004)(6916009)(86362001)(68736007)(66066001)(97736004)(305945005)(7736002)(97746001)(72206003)(1076002)(478600001)(386003)(81156014)(6506007)(3846002)(6116002);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1152;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;PTR:InfoNoRecords;MX:3;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTUyOzIzOk1sTlBFZkdEUXdhUXBqZEdMV1pQLzlKa1hj?= =?utf-8?B?NW1rSWZLeFVQQzVBVS95SkJWdlFTUGtwaW5wbmF2K3RWbkFBN3dLYU5vOTJF?= =?utf-8?B?YmxUWjI0MTlteTQxMWxEYU00djFOai9IbXNTRUt0TnB2TXZpemVxRHBmSW41?= =?utf-8?B?aFJtWXZHT3EyTWFZL1dBQmV3V2k5d25xL0lkUE95MW01bFZDTmUzakh3d3lv?= =?utf-8?B?bzZYMEZnYUdLQkcvNzgzT2YvdVE5SWZZaWVsUVdjWWhWWnYrUmVUbzBOcjNU?= =?utf-8?B?RDU5anlyTUw1bTlOMGQvSWxwSWJIbTRXT0NLNjlhVndpOWgycVBZc25NcjRW?= =?utf-8?B?RWRCTkh3WkpLUjVmYm1EVzVjRGpuenF2SFRXT1NPSExlQ1phNlpQanBhd2lk?= =?utf-8?B?WVJZY0RTV3dvZVJsQm42ckp0cWRERDlNWFFtVGdhUmZWand2d00zMzYwM0tv?= =?utf-8?B?MDBPSVkrTlZUWGtOV1lVdms2aERFdGZJUjRSaDJ6WHZiVHpnRVBiUnVkbVBa?= =?utf-8?B?UmhCZWJoVTJKc1hObTBQU2IvY05WYXJGc3k5dVVWNlFsZWRzdEZ0cTd5aHpC?= =?utf-8?B?MWdBMzNoZzJXYWpBSWU1NnYwMkhSK2tZZFlDR3hTekpkZFBuOHBYTlZ2dFdv?= =?utf-8?B?bWYra0pnMnczei9nYzNJeXlqMzhtZWhtRVRBZ1NuL0UrNGNXaTlrczdkd3Rr?= =?utf-8?B?cTZkUTU2ZkVTWVdvdnVzYlBLemZxZGZRTmloeUs1TkNoWTMrWGdGVHJ5VGQx?= =?utf-8?B?Q2tEMVFGSGtHUXZLeTBtdVNYYjNLQ1l6Uk9GbnhjMkpSb0hUSDd3ZTE1WUhh?= =?utf-8?B?dVlVbytZMmpySnVMWVZhNExMWXh2aTJrTTlCODJZZWhDN0pPNDRRUnV3Ull4?= =?utf-8?B?Q00xdEIzaUhLaXE2M2xJa2w3dDJIeVN5bkxqem5ZMXJwczVySW9FcXdlaGlZ?= =?utf-8?B?YnFBU0lVVnlJVkJtWVFPNHdQN3RXZUN0Nnd3bldlbU5CdEkzNkFDalkyS01o?= =?utf-8?B?cWFEVUpjeURPNWVZNzBxWTcwOS85NTBtTEh2YXkrdmE3aU04ZmpWc2xEd2di?= =?utf-8?B?S09tNWtnei9ZemppZVZHZkVXaHRUUFNaWmhaZmZFdVdHQXdHWGdhdWw2Qkk1?= =?utf-8?B?UnVKeHhYbDlNQ1dwZCs3bEU5MGtiVEVsbDcvSWJlMnZhTkREQ3AzU2tNK1J5?= =?utf-8?B?bHpkQkxKQVBZNStqdGJSb2pMYSs2dWVqaWJrdEJaM2NQcVZxd2F2aE40L25n?= =?utf-8?B?S0VZM2ZJdG05cDg4QWYrRzFYaXNJYjJPZDQvWnZpQmsycSs0UVM5cVhPTkYr?= =?utf-8?B?NUJrOHBjcHA3bjJnNTFpbmpJUWdZWEg2aTZMMTNESDJ3a3hxSEliUllqbFRh?= =?utf-8?B?L0xWQ1RodEJIeVpmS0ZTU0x4VGlLTitsWmFJdU40eFBheTNmOHB1SmpVN0ll?= =?utf-8?B?TkhMRkpLN1gySm9mVG5VK2h0Q3UxNlN0Z3pWNXRKYXVlSXU4aGxzU2dZZzhh?= =?utf-8?B?MWtkY3h5bVNReUNIQTE1UlZLY3pQSmxRUS9uaXZqSkRwMzVpcWsvanZuNmRt?= =?utf-8?B?V2IvN05rcGZPeVpaSnFDVi9CblRqb2NkR25ncFAxZmhlb2FEOCtna25Hbm1X?= =?utf-8?B?cEhLMldYZDZxVmZoQkhBVXFHbjhKcXRhSjQ1QzdWaVJwZzBkQjJ4Uy9IdDRM?= =?utf-8?B?dnNyejJKK3E5Q240VkdGLzdIT2liTUxoa25vNmY1UmdnQVI2OUJxOGRSRllT?= =?utf-8?Q?DwqSjhJqKgGTnBQ2oD41GggTqFdVllXgoRg2s=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1152;6:CvAed93Cr7cMDjJKXTrCWNPpE9rv5vnePJD6TKHXkJN4nudAmue5OTfD3fXeYTqJS5KOYY4L5SikFtFpnp3wqufEbeICDcxo3P8nWDf+uQceFZBROCN5u43LrDLEOJCRBBPbaTrP1iApqyNLP0bwTn54Nbqe1c3phkbqgLWUrjKT77kr9s4XBrv+jB3VQSBDbWdOiz0cUvDRsFbHsYLcUG/Pcn3FAPke951eaD6f87I6peErckrntQE4do2jy2ddUeQ+nO7zbZrSPQI9mEcnRtzYpC4eSb7qbswss8See9zq6BOnEo7IIdqIWUNqzoaNCZhsIyDX/t4g7EeoqTYbsHy7DwhSy7O6DtAXtwoTLTM=;5:KgdBHXb95jgjdFbf8J1VkEyXLxlhY+JxiUFlCBbxLVR4mRTdltM3P0Xah/9awxp8Zsq/ovmc4TdZ12UXU4JMmyQp/WNDy3Ego76k/cYIUXv+vHhsDvY+zAv++bA3AQdEq2/pEfeBNLFlbIBK4FpXIx9JGBhg0kI8vj7HseApktM=;24:oGUlp1lwct30UOlQCUrgv1MpAP9TiaoC+qYyE4dOBQli8dCxhksoA7fFSeZPPZg0e5umHS6+MgNALCJBgOR/MK4joOyHewYktdeQHoL3J7U=;7:MaDI6IY8ay759iJ9wZ7D7xw3TlgADbkOq1pLHJHr0rf1w02bM3yWHGjgm9gMzlMT2DgYcKhCKNOHwn5W8rNV/Bwk2NK8eTYSV3K3jBVBSIFgOBBJjgdrQxPqyYCmgFZ9C3XHhl2QDj2QAGGGf9qQi+YIw6gKGDzo21ppozlyO/J91y60NyeoDq85Nk486F2offjo9Ww1VJPjO7GChleG1LXDwjout6ElPL3EmLGRXSztmUNGA9Gh7FUPMERkHNAj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1152;20:WPlgfJHcszRPJj4oq6w2fDY93EWNH/b3YjMGY98L8uJIi3/nFVVKjbZpgCa4x+Sk2kUdsbD+R1DOnNEJwqZZJ6gtABKCYE2ji+FiBc+bIAHoBN6heuZBHx515TW8YA8lT9gh0g9ASLdVT+QqC/2YdlmDyg8z2656n6yItC9DAHMWWYisF0wB9thy1oLI6uX1Op2+QKlETp53/nQRXV3+KVR3PBwHYRzSv5f2Z/kuAYW0SWUSJdkaDbfUv5XIxBAv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 19:25:59.4258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06f57392-c3ce-41a1-4c90-08d5585ffb0d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1152 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Cleanup the use of push and pop and when registers are saved in the mem_encrypt_boot.S file in order to improve the readability of the code. Move parameter register saving into general purpose registers earlier in the code and move all the pushes to the beginning of the function with corresponding pops at the end. Signed-off-by: Tom Lendacky --- arch/x86/mm/mem_encrypt_boot.S | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/mem_encrypt_boot.S b/arch/x86/mm/mem_encrypt_boot.S index 730e6d5..de36884 100644 --- a/arch/x86/mm/mem_encrypt_boot.S +++ b/arch/x86/mm/mem_encrypt_boot.S @@ -103,20 +103,19 @@ ENTRY(__enc_copy) orq $X86_CR4_PGE, %rdx mov %rdx, %cr4 + push %r15 + + movq %rcx, %r9 /* Save kernel length */ + movq %rdi, %r10 /* Save encrypted kernel address */ + movq %rsi, %r11 /* Save decrypted kernel address */ + /* Set the PAT register PA5 entry to write-protect */ - push %rcx movl $MSR_IA32_CR_PAT, %ecx rdmsr - push %rdx /* Save original PAT value */ + mov %rdx, %r15 /* Save original PAT value */ andl $0xffff00ff, %edx /* Clear PA5 */ orl $0x00000500, %edx /* Set PA5 to WP */ wrmsr - pop %rdx /* RDX contains original PAT value */ - pop %rcx - - movq %rcx, %r9 /* Save kernel length */ - movq %rdi, %r10 /* Save encrypted kernel address */ - movq %rsi, %r11 /* Save decrypted kernel address */ wbinvd /* Invalidate any cache entries */ @@ -138,12 +137,13 @@ ENTRY(__enc_copy) jnz 1b /* Kernel length not zero? */ /* Restore PAT register */ - push %rdx /* Save original PAT value */ movl $MSR_IA32_CR_PAT, %ecx rdmsr - pop %rdx /* Restore original PAT value */ + mov %r15, %rdx /* Restore original PAT value */ wrmsr + pop %r15 + ret .L__enc_copy_end: ENDPROC(__enc_copy)