From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751215AbdEaNNN (ORCPT ); Wed, 31 May 2017 09:13:13 -0400 Received: from mail-co1nam03on0049.outbound.protection.outlook.com ([104.47.40.49]:49380 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751056AbdEaNNG (ORCPT ); Wed, 31 May 2017 09:13:06 -0400 Authentication-Results: google.com; dkim=none (message not signed) header.d=none;google.com; dmarc=none action=none header.from=amd.com; Subject: Re: [PATCH v5 29/32] x86/mm: Add support to encrypt the kernel in-place To: Borislav Petkov CC: , , , , , , , , , , Rik van Riel , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Toshimitsu Kani , Arnd Bergmann , Jonathan Corbet , Matt Fleming , "Michael S. Tsirkin" , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Larry Woodman , Brijesh Singh , Ingo Molnar , Andy Lutomirski , "H. Peter Anvin" , Andrey Ryabinin , Alexander Potapenko , Dave Young , Thomas Gleixner , Dmitry Vyukov References: <20170418211612.10190.82788.stgit@tlendack-t1.amdoffice.net> <20170418212149.10190.70894.stgit@tlendack-t1.amdoffice.net> <20170518124626.hqyqqbjpy7hmlpqc@pd.tnic> <7e2ae014-525c-76f2-9fce-2124596db2d2@amd.com> <20170526162522.p7prrqqalx2ivfxl@pd.tnic> <33c075b1-71f6-b5d0-b1fa-d742d0659d38@amd.com> <20170531095148.pba6ju6im4qxbwfg@pd.tnic> From: Tom Lendacky Message-ID: <17394b27-d693-4ff9-9dbd-11b5237fcf6a@amd.com> Date: Wed, 31 May 2017 08:12:56 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170531095148.pba6ju6im4qxbwfg@pd.tnic> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM5PR18CA0017.namprd18.prod.outlook.com (10.175.218.155) To BN6PR12MB1137.namprd12.prod.outlook.com (10.168.226.139) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN6PR12MB1137: X-MS-Office365-Filtering-Correlation-Id: 979771da-748d-4389-2825-08d4a826c447 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(201703131423075)(201703031133081);SRVR:BN6PR12MB1137; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1137;3:gCoNrQihDBjUiPUrS7QmAfRCW9273+BSvztiTbGYtUxekj9bX3JrHrsxaM4ot2DrDeVKzMOdXCdowsChxZyka6GfG+xVhaH7XxwijLEUaSmDITWAU1p+TGCaQX8RYaiHJ9MrAAm7dGxC74lOh2EfLwOWaWdAxZFn+qNdv1S+bZP3HBkDrD3UnzMjkSpWhtgWxDJ9a2oIQAH3n1vHc+1oBccOTTd+YJcu1sVyLr5yisv/KgfeCKDPfQbFUgUJJv0tpNV1AkGJ7tmYE9PG1HBZwasoKt9FC8AduKbtV6ckUYJLrDjOVd1wO+eoxNz7cjJg5zJaOd+kIB2OnhZxhe8G+aS/6lgLJW/J5fzgoKakbgs=;25:XKvLXwAwQTqt5cK9af2QCb9aZTfQTf1xMRug8AuhkSAJJKeT2vFJJuqFsG10zTa7MpkzOuh4IFWMS76lKPwcHL2egHixp520GilQgFFY08RgqED5Q11Rx/n3hMlJ8cfh4ThB4RcW48EiktLSirgaK1mVuk0xsO9lO9QdmDiLIwZVtYhvvCXCO3kjHo5RXfD7J3H65r5ugVhrvTDx6qjbLL7aZMb2c/keJz7G57SDbrpPdd0tWY751QtF1vCtrFh+qxuvZuWklxToMGo2xGbGdgaL3sp8D814aBRYifowwmwaEYizyzgPpzn6rCQCyOgtHbsMYKuehvUGWx2/B5bbfffAhKNo9Qd7w6MdrtSwpd9iEtAn7YslO1pF355KDaj5J1X52J8cWrtrToddhY7x9PVT2O06UwZoFEnBc7OJXcGSo5ew/Oc5/DVdjNPCAJZZcTM8A9ClE3Do/ZUhYEkWgdoiOP5WU9Um9bC3127vpyk= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1137;31:VR+ggADRl5xW3ggMFa0VmZrd8+tJKHdfEHii58pDNTDccr078MAJBJgotgjlgJH+VHIr3gSzbwCncpmbtJpHEzY3PQBG4QeXgNZxc0bBOgV/L+XzeXy5u7L11bSsAoRCLSYPeJ/3QIBD353B5aM2AA7I7KxJnQKmXBPkyFB+ANhwfENViSaUycdSNpI/nsgqtRxNmkqh/NZhV397jWnJ00kAdvA278aO1JlrI7B0+CA=;20:rlSSGS1kWrqAmthrCqKBrG15COX8mKl4wkRLsCY2D9Ut+wKpcBHs3ps4oQOW9lXPrpptUftljqK0zFd+fWiD6J7bDglr0Ltu5YpaJjURe2NTLZK0rLnf33LGXPuiTLKKig3K+V+5OdAy1+nvZhq6aKKHGoZyxKIfBfrLhR7jFwn8xSMgyybI1XP9oGrcrSaL3lmqqwdyqH5RfMXpUBcdETnaolC2jTvnVGjbeZoV+Xvt3ZgJbeP1c98RBBRA0dcYuhC14Sn4vqDQ0SO8QY+aO0abEswSeSfYqK/2d/CDic6foVhNVt4Jaw0mY6SG3eY57TYS29SXW5vLneeU11Acnl+b2DnSQMUsW9ppZQBZQnfuuhG1s0E3RNqBrdxQL4sFbhRYum3+HybybAs5QPtzv74e6YsFnEu+N6ewyWjRGCMbiwJnaWcO5JURoVOaf6kNKxBlgm1hlZJqNwH4Vh7l1UtWAEnHL8am+plbuxMY1aWzeHFco9pYZ+TiOhj7MGAx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700073)(100105000095)(100000701073)(100105300095)(100000702073)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(100000703073)(100105400095)(6055026)(6041248)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123564025)(6072148)(100000704073)(100105200095)(100000705073)(100105500095);SRVR:BN6PR12MB1137;BCL:0;PCL:0;RULEID:(100000800073)(100110000095)(100000801073)(100110300095)(100000802073)(100110100095)(100000803073)(100110400095)(100000804073)(100110200095)(100000805073)(100110500095);SRVR:BN6PR12MB1137; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM3OzQ6WFZ4Tko2OFpxZ3hxWEEzRFYyQ25yN0pFa1hF?= =?utf-8?B?Sllsa1BkOWZvNHZUQ0xZRGQwQ3hib0RhVjVlaC9rbGhSLzJGeTYrOFl2UzBC?= =?utf-8?B?NWVvWFpXSS9Delg2c1UyQVg2ZjlXOGdMK0ZJRW83MndQOCswa2k2WTdXb0M3?= =?utf-8?B?VFlraVhpR29pcUhEWG9pVG8wVm1jRkNBZ3ZJaER0M0F5cGMwOFNJYWN2ZUFl?= =?utf-8?B?RDBEOVBqVko0aGZqcjl2M0I1eXVxTHVxL2hoN29xczlQNDg1OE8rWEEvY3p6?= =?utf-8?B?bkVXdEJsazRod25nMGVIVUc5elpocXhweGdYRTRKbjJuTk1EMlJrWksxWks1?= =?utf-8?B?ZllybVd2Lys1N2hiWFJoSHg1NjNkVG5ENDQySkhWZ1pyUzVyRHl3WjRrWGFK?= =?utf-8?B?U2Y0REx0UndvODZyK09lZWlVK1RGaTVMYVcyZU4rTlM4bEYxR2pUL0t6K1dt?= =?utf-8?B?dVB6a2RyM05reS9Nc3BncnhPaXM1V0NYaUxvbklRVG80ZHN5Tk9uQ093UFdj?= =?utf-8?B?YWRRWU02bkJUYSs0Y1FmcGJXbGVDNzVuektuci9tR1RDa0NkSEVxMnJ4YVcr?= =?utf-8?B?Z05nSDdxeC9vL1pXNHM4ckY2ME0zUWI2MHg0UHlySGVSUVlncmpyaDVaUmJo?= =?utf-8?B?SFF4elpkVVBVdFNwV0Y2WTJIYVp3YXg2L2YxTDhlZ3crbnZueEhrWVVIK1JJ?= =?utf-8?B?VTd0U0dQQlJNQXFvY0xBcXpPbU15UFVaMjlGZWJzWUxUUDU1MWNrUTBJY0Z5?= =?utf-8?B?SStBdkRUUVhpV3p1WkxNdmdzekpPNCswOXBiS29rS1ZPQllQS2c5VDQ4d0oz?= =?utf-8?B?VkRYOHRGazh5UDJVazhGL3BMS2xOZkFJWVU2RmlpS3Z0YU96ZkZpeXVja2Q2?= =?utf-8?B?MjMyM1VmbzdFOUJnRlV3TndDQjlQUW41a2s0TDc1UGJQOHF5WjJSOThiQmJN?= =?utf-8?B?T1JQMHh5WWl5OUp4M0FCMFVpV0J0S0xDWDN5c1lDRUxpQnU0djd0RDJPUkJn?= =?utf-8?B?VFhPd2dMMTBzd0FGUFJxbHBTV1ZIN2taeWF4cGIrUkNRV2xoL2JiSW5iNnps?= =?utf-8?B?MWxheXhkazhuSzZMYkxSOUdrZS9sT0c4MUNQZWJVbWRDb0VNb1JyWk9TYVh2?= =?utf-8?B?TmRRVk43VjJLR2Uxd2VncXVUaUNlMCt3bzhqb3N6UlZkWldoR0hFR1RBMWh5?= =?utf-8?B?czkySlJiUXRESm1zdDdqWmRhUFJKWG5FTUp2UXNNLzZmblFBQkNnTUF3UFZG?= =?utf-8?B?TERqMXJFTU5SYzExa0hUMGovNC9MV1BwV1U3dlhTVWR6dmdsY05uamJzYVlV?= =?utf-8?B?NkJwQmpDc3BpenhxamNXQnBiSjY0WXZaRGNWV2NUUS9pU3lrTE5GWnpLeUlu?= =?utf-8?B?RWVjL2cwTlFmb2h5N3IvbVJ0YnZpRGlKRDlTS3gvMXZvQW42Wit5YXZNYmV6?= =?utf-8?B?bHZwN3FwWmJ0VTlrUFp5WUd2TE10TjBWYWVYV0lJcUk3N25xdWZ1QWpNdlRn?= =?utf-8?B?UWcybW1UQjNDV0l2dzB1S3ZsdGZXbURJYW5CaWlpTlBZMDdFbFBmak96ZWJO?= =?utf-8?B?NHBEZEhHakhLWUxEUkhCUjN1U3VjQT09?= X-Forefront-PRVS: 0324C2C0E2 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6049001)(39410400002)(39850400002)(39400400002)(39860400002)(39840400002)(39450400003)(24454002)(377454003)(7416002)(65956001)(7406005)(2906002)(230700001)(50466002)(47776003)(53546009)(25786009)(66066001)(305945005)(7736002)(6486002)(65826007)(77096006)(189998001)(83506001)(4326008)(6116002)(3846002)(81166006)(72206003)(54906002)(8676002)(90366009)(33646002)(2950100002)(6916009)(36756003)(54356999)(53936002)(31696002)(50986999)(5660300001)(23676002)(478600001)(86362001)(6666003)(76176999)(31686004)(42186005)(229853002)(93886004)(110136004)(38730400002)(6246003)(4001350100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1137;H:[10.236.64.250];FPR:;SPF:None;MLV:sfv;LANG:; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM3OzIzOkMzUlZna0llN3Rqa0ZxL3VLUDcrV1JGQWFj?= =?utf-8?B?My9lcXNJdHRsZ0FzdmtmM0tYbWtFYm9yQSsyWHpjRWs3VUxsSXhOdlNHK3BZ?= =?utf-8?B?L3FLZVRDanYyaDFIdlJONVZCQjNlSUVuWDVzYjRNTG5SYnl3cEZIb0JXVDFx?= =?utf-8?B?TGxPekJrV3ZZT3Y4MzZmNmtNUVMzam5tQlNYZ0FDUDdEOG15N1ljaUxIMlBI?= =?utf-8?B?dThNUy9RK25UaUN5V085L0FtbmhFQVM5a1JCMnNhSEg2ZW9ZNnJWM2c1SHpN?= =?utf-8?B?ZmJyZUFjY1ErVHNZalpxQjZqZFFHK0ozQXhTN3hrQjMvd1lFR0NDRkxoZnhE?= =?utf-8?B?ZjJLaFI5VG1tYmpPbzJMU0pqYUFZZE1PRFpnUEdhM3lJMFRydDd6VVpWTkFW?= =?utf-8?B?VDhQNkJjZTZYNFR1NWQyVWlDc2p6S1p1RWpLd1MvOW1MSXNxMzlvZFlaZVUr?= =?utf-8?B?NUZuZVdJZnhvZ2dLWHpDZzlaVXVqRStJUFJoUVRmYk43VEVocUFBRVRsZE1E?= =?utf-8?B?Z2M2dWt0Z2VicWZ2ejdYV043ai9hbHZoM0FVRUM0aDRLTUwzb2hLdjlzTVZD?= =?utf-8?B?MWsrL2lEcDkrcWFRV1M0dXF2azlRdDlXd2dKV2dKcVlsT05GRGpic0MrRGhN?= =?utf-8?B?Y0hDMm5HMHBtUXUwSGcwSlRDMVlXZDQxY1ZPM1VWNUtPRUYzY21uYjliTXFs?= =?utf-8?B?aDBHbVJobmpPMlZFSWpmNHdDNkpUZm0xMFh0UkprYU9UcHZ6QjJTOHprK1RF?= =?utf-8?B?VDI2NmVUOVNZWDBZUEZoZHRRWStBTWVFR08vajBXNXNHZitQS2c2NFNwQXBa?= =?utf-8?B?akhqNGIvOUN4TDJncm1rNHd2cUFFUTdXck9SaFZlZVZPWlBSeHJuZ1FtQ1hu?= =?utf-8?B?VE0relFVMDdkVzZ1a0Fhb2RQcXgvTmFDdDB2WHkyMlZ4TmNFR0hLcW5mMlVz?= =?utf-8?B?bS93MHZjWGpEU2ozMHp3Q2dyRVNBN3RGVkorWVY5STk4djY0YnprNDRJQjB0?= =?utf-8?B?cERmVnkwVE9yK2h5VFVqSjNuNTJBd3A1VklwNTF4TkNSdDc1NFNiTk9PWjA3?= =?utf-8?B?K2p5eVMzRDVacytTMnhLbUJqT1oyV01sOHJVTzZnOHZlSk5EVnE3U01rZmNO?= =?utf-8?B?aFQ1Nkl0c3ltRnJINWtlQWtjZ1d4bVdlM2dLV29jbHpKWklSS2tVK2kxMUNU?= =?utf-8?B?N3QxazVsT0pNamNLWW1Da3kvcE5FZjhGNjlQa0JEL2dEMFY2VTJqV2N5WFVa?= =?utf-8?B?dE9nNFRSQ2JZemk1SU1nZmpRVG5tMTc4bGd4WUFUSmRzdzYxYlkyblR5dU1j?= =?utf-8?B?TkFvVjQvL2EzeFlGUk4ycmEreXlrUzFZL2VyTVlnN2M1cy85TVI2WlNpMlZB?= =?utf-8?B?OXduZWd2MWRiQ1UvcmNnK0ZqYVlTU0ZXWFRSTHBLcCs1aXo1VWZtdHlhT2hl?= =?utf-8?B?NDBEbFZOcjVpT2I5cE1ndFRwa0NJRDhtMnJXZktRUjF2dDVhaG9rUmNMVXV2?= =?utf-8?B?YUNUT2tEY3YyODMxc0l3a3l6RWt4eG5ISlRJOHg1aTRhaUE3MXJHaG5IeVZp?= =?utf-8?B?UjI2N1duK3gzYkpnb0VtTFZiZVYxWWFteERGeGQzRVhieGswb2l0ZmNHU3NT?= =?utf-8?B?MTYzelR2eWNXOUF4S0tNemxwZDRvU3p4UGZmdmQwYkpKMnhVZHJxOW5mNDNF?= =?utf-8?B?c2Q5d0lmWFVWNUppMG90eDk5MG5oRnpHMzRyNU13ZTVJQ1QyeEcwNjhGcEtK?= =?utf-8?B?dVBWWGFXMXV4M0hiUEhvOTNER0lhdG5CVVY4WmNDWTV0dVBlVzJZekNQd1Vr?= =?utf-8?B?dlZTUWlmVWJkdDBvdjBTVXUweUFWM3djK2dQSDF5R05hUDgvL2FRcU1kTUds?= =?utf-8?B?dFh4Lys0cEdHcWNvaUdkeVFxSXVkeDNwMWZOaUxSNUdFejVwN245V1V4MjlT?= =?utf-8?B?djE5cEwxUjR3PT0=?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1137;6:cmeSgzXqmgEQto6oTzVQUbPKCx/FlfvWSB/t/uO+MztROj3FGnV0beKOAEd9BLZbuXTq18Kh4/vnC+anIh3OYGCocK+PKT6fvceWi1+SqfsmFrHwD3yqY/uUpfDZGBwVZ/8q+eRznOAj1xotP4yRM9LrKXU4pcqh+oiaL3xnzCfSUHGtu7clhe82X63vJaXA71V4KY6sOKYowLIV3nXOTPkVMNIdGBnFE8ixZxf36IAmmMCLT7nfhVTGeNjdO3v0Ny6Xf8OakKy3WHrqIgvOeSURW6gISxjM4S1f0mumTEN9IVWspRjLOK6BTEBQY2lxNb//3cDscVXhgdKTkdMogsPCkGbsSGHoypedcD9CNe2RRCw/F+ygh7yjiAmnxibfPAvzSngx+x/Z1V1PdapTmXWCgci2svTuxzMINuF3KWD/6pxDEAN8FjvdzQgbey3ZAlWIkG9sd+qCibvNSqMorg4sLRpkY+C3kI5ZvRpBpTF8Gba9W1cwQ44mRYi9Fhp1ZfWIdlp/FLdz/AvUgahfIZP1gzYMcvfybeUAep6odVg= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1137;5:RKfa7VVfgVa5Nn8Sio9cUU9qFjZigzTln4f3+Cs+ihNPFbkxuOA4FEoCf3UALu5IVcJFgqjewI7jmVv5MpGrZhbNVdXxmU1wrFnuiCskbZdbd9sDb/65f6c4pAONceL2BSBRKVVmky4ePyaVyjQN1hk1XB0to4LSLyuDdnq7aQAGAKW1DM1YxFJ0VWmdmkJYUGyjE9hB2JBKnAJPO56hNe/78mq4k8XZagpt4oX7xQXRtklamgU0SGNuO9pxjKaKY3ZghyO25+U7i2VMqlj+DeBgC++lFBw04u7cdUlYcAFh/dr9RrIPqQTd47WRnjQjbWnC5MaCjJTrky5wo7uhosKZE/kk0AJfGGxVVqOOo9BK9xLNZjfIdD7hbbagJaCiV2TVijCey4vA94vWy9YEOnmiUqTZaAk0nT1+30tIi8l/ZZOmJncLqVoNV4LeiRSUIxhqg1xQQN7N+LEpSdof/VuwIlao0QNEXq2nN5ufM8tMvw2WfHXx/ej8IalLUioU;24:xB3QkfT10GjW7W5R7FqmUjy9bUE9xsGih7bnAXXF3758b47rL4g0xdF9JQoNlKKcjvKxCEA29gy8pcq1dewkh3rOKM5KnHoB56sep+nNu/A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1137;7:a/DD0sl584aumXUke8cncqbK3Zd5hkdCrzyfqI8caZPLMwcEHdSDgmdv4oq3dQmeoQ9Ozp6iKLvL7AsplRhNABYs7RV2D4aqXrUd9hzCUR2z902PglO9h2dIgCV5fZqiiSXnFqmljkRp2S0sVzOW7xrpd13DZywotY0a2RGDWiGSCUpQkYQiRDdvz9eAZXS7EeHmegQrXnL9wxne6pqIATBJ4pGAvo0rmIMUmOy02CMbZB4eeKAOCzc28xIs91ZqrLoCMvl499D/aqb5Vyu6cX+7N+1QJwl1T3l4qIZQwouZ0Rua9dWcjXQYWjozafHu3ENP2qeXYjAwmCLVQnX12Q==;20:9frNQanL0DPs6t8ZbUTqwU+eYFfUHoO96ObcPHlH7nSIfB2FI5lyzSsNL9nqtyNIZZcGl8EWm3Y4IFX+iT8hn9Y3mk56jEq3C4vq+LFBHG7zOTBdgnwiWKhFu1SDh/Ultvown9DeIhIuz1b2DvKjoR/Zw7JIuQ1H+T7szrpt2K+ABiLz0XPRYViFoPTC4LxXUAX2ewGI43hnImv+t0MPRbjAmvuaKqxb7/1es+CFihIm0RGnc4L7QirrSjwoEo8x X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2017 13:12:59.8945 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1137 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/31/2017 4:51 AM, Borislav Petkov wrote: > On Tue, May 30, 2017 at 11:39:07AM -0500, Tom Lendacky wrote: >> Yes, it's from objtool: >> >> arch/x86/mm/mem_encrypt_boot.o: warning: objtool: .text+0xd2: return >> instruction outside of a callable function > > Oh, well, let's make it a global symbol then. Who knows, we might have > to live-patch it someday :-) Can do. Thanks, Tom > > --- > diff --git a/arch/x86/mm/mem_encrypt_boot.S b/arch/x86/mm/mem_encrypt_boot.S > index fb58f9f953e3..7720b0050840 100644 > --- a/arch/x86/mm/mem_encrypt_boot.S > +++ b/arch/x86/mm/mem_encrypt_boot.S > @@ -47,9 +47,9 @@ ENTRY(sme_encrypt_execute) > movq %rdx, %r12 /* Kernel length */ > > /* Copy encryption routine into the workarea */ > - movq %rax, %rdi /* Workarea encryption routine */ > - leaq .Lenc_start(%rip), %rsi /* Encryption routine */ > - movq $(.Lenc_stop - .Lenc_start), %rcx /* Encryption routine length */ > + movq %rax, %rdi /* Workarea encryption routine */ > + leaq __enc_copy(%rip), %rsi /* Encryption routine */ > + movq $(.L__enc_copy_end - __enc_copy), %rcx /* Encryption routine length */ > rep movsb > > /* Setup registers for call */ > @@ -70,8 +70,7 @@ ENTRY(sme_encrypt_execute) > ret > ENDPROC(sme_encrypt_execute) > > -.Lenc_start: > -ENTRY(sme_enc_routine) > +ENTRY(__enc_copy) > /* > * Routine used to encrypt kernel. > * This routine must be run outside of the kernel proper since > @@ -147,5 +146,5 @@ ENTRY(sme_enc_routine) > wrmsr > > ret > -ENDPROC(sme_enc_routine) > -.Lenc_stop: > +.L__enc_copy_end: > +ENDPROC(__enc_copy) >