From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756579AbdJJTpM (ORCPT ); Tue, 10 Oct 2017 15:45:12 -0400 Received: from mail-cys01nam02on0075.outbound.protection.outlook.com ([104.47.37.75]:64096 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752099AbdJJTpK (ORCPT ); Tue, 10 Oct 2017 15:45:10 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; From: Tom Lendacky Subject: [PATCH] x86/mm: Disable various instrumentations of mem_encrypt.c To: x86@kernel.org Cc: Peter Zijlstra , linux-kernel@vger.kernel.org, Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Thomas Gleixner Date: Tue, 10 Oct 2017 14:45:04 -0500 Message-ID: <20171010194504.18887.38053.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: MWHPR04CA0045.namprd04.prod.outlook.com (10.172.163.31) To DM5PR12MB1148.namprd12.prod.outlook.com (10.168.236.143) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4c2fba6-1a7e-43f8-a842-08d5101769c2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:DM5PR12MB1148; X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1148;3:AlWuDPaNTau7LDTTPS3Hf3Z4OrXAZETyt3J59lY6lX3KdifnN1g5LPKFbojNC6SCoqdZ3qFcC0A86VYidUpOtixMzYYckbxtJZdX6mOaK6vQsF9Mr2UYH7H3RXeYD/UunADCwz+YnkqhVlmra+VSxTr08ZGwPnWnQFFEfFKRQPRyRDZAtWVBgPGKGKWB/DPxewqqEbe+la6s7LyxOqNQggi67x1pGP+ATN7MwQlShtvc6Q8onEeSUH/rEW/N8XLn;25:L78lfFycGa4JPVYssMtSknzd+5OA4Lr+gZl4O89ItjqLPgv4fOcobajoso0Gr/dfdXqEHVVULTfWGR5NPz8pYg7wYyHFaVaJEnvAWoWIeMNcqlwnl/K4DugTED0xy/sUqb8mv3/RNZv5VQLQxAcjzKQqhF7hURfRiT9R/mpKnapo3ZiJkT7BYALHIqOI1+zLu4zpQnBUVPkUeCmmEec2EEI8A2gJcoy0aEnzFErYTk+6SaYhzAKdOAkmIyty6B7hyrKeeWYzCmUlHuMVM3aP936K2kr7nLZmC4q+3kCGUznoiN8HoSYkbEi3XLjfadW8qwk22hAvEOaki5eK9DZiJQ==;31:7+QwXW3hQyWKiXIsR3CwiokvnsQWGBeGvqN7ZYLavGyV9KUeFyLk4hLa1MlRu0U/iJ9oy4duoGDfXIsH+fQcwESB5MdOFirU+dd3Oo+r4AjVCwHC4gjK6llvS8JuyqqvZHvHQjHe7b6KFgovMQ24ZAVjY3pTwKYaBsWhxtDaKYGSWfcgYvwkPvx55MTz7jpLj4uk0/MgaHxit/AqE2YINRjqPOSZ8cDMn7UQI9lshhk= X-MS-TrafficTypeDiagnostic: DM5PR12MB1148: X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1148;20:wTPjqaXVGUm8rdlywQFORXZFGQRlyBLgx3U2+chf2AWq7c0Uph+y/onQNjsUOgt5SsvZS9zuFWBtToLQAl4l9xuhqS5h1uLpPw6LCkBh1kzlYmQEXHv50nuMC6qvF2/9TNJIOI8i9iFkW1bUpBPBfQYbJIi6onaVLh7b1Wcv3JGve2PTpGfXMwtdNCDh47unLnNQa8BepRGpCwWXlJAHHFGMMu0ko5k5Ax8m3gfQj0NJ55jOVE3xTZJSMfi9EpZImqilFiX0JOYbVg6ulkg4QCNZqgYkjtqu39JCNEJbtQ7mwE7Q02naxq5HiCgvhx6Gcl2bwtcKSQ3OfCEkHQqTidu0ehNFZVoSHBWH9ANeAj4uo0B5GtK+hu5C3SBf9/GsSzrVyjZy1gz6Mn7M6DIIQB9FqwcTqDaCe4nTjFLVFxgNsM7GsPIJpWsvE8H1jFfVp3l0JajKP5Kz6Ob55XxZtEaQ2OCgOn4TAlIds/jR3n4dMRH7r0ACqqtCcTzVuyLM;4:ZYdbXCoX0FRJ+hUSehJRCMca4RIImfdLHUsACeBRzspmWQdpTr4sY3CbAXlzf0c17bo072b5L+JCnhGYsEEX3AUAvbLWYSBkIf75spQ2N9JxubcUmfKk091aTODqirpU+Y2qQyvO/c5nJxgu4OXEV0pHnpAtxxXpSV6qSmhFimv4RYbiBzpVluOEqOnUKiKlzragSwhfmFNja70vkM3cmmI7x2/X+wtcR8GmGiM4JKc9HEETpWV1HoyZs/RzCP36vVFa3tTb0UzQGt1xS2iE6Vivr+zec5t/oLBNfKORafQ= X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM5PR12MB1148;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM5PR12MB1148; X-Forefront-PRVS: 04569283F9 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(376002)(346002)(39860400002)(189002)(199003)(81156014)(9686003)(5660300001)(478600001)(8676002)(8936002)(81166006)(53936002)(101416001)(53416004)(316002)(4326008)(7736002)(33646002)(103116003)(106356001)(105586002)(2361001)(2351001)(305945005)(23676002)(69596002)(2906002)(230700001)(1076002)(55016002)(97736004)(3846002)(6116002)(6506006)(68736007)(66066001)(47776003)(86362001)(189998001)(50466002)(54906003)(97746001)(6916009)(50986999)(25786009)(83506001)(16526018)(6666003)(72206003)(58126008)(54356999);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1148;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMTQ4OzIzOm01SG1EQU1hQTJsSERvcVVDZ1N5Skh4UXdh?= =?utf-8?B?WHVScVRQdWZGL2FTQmg5ZW1acjhSWCtEWDdndUpIUGtpTUk5T2doeEFaOHJJ?= =?utf-8?B?UG4xanE4VytFOU5QTjN3UGlveGtseVNDL0VGczFRc2xLc1JGRVkyTmxDN1Fk?= =?utf-8?B?MlRlYlRKVDNUMjQvZmdIWFEwK0M5ZGtzc1BSOGpKNVF4RzBvUnFreTkzQzFp?= =?utf-8?B?QlNnUW5jTTM2UEEvUzJLQ1pkTkpVL3hEZkt2b3hBTHZwL3ZPYmNhbXNBMFky?= =?utf-8?B?dkdMWE9KTzMzMWpWMzdsV1lrNkZTNzVQRE1DV0tDVDFNRVE4QVhtREs4a1Vz?= =?utf-8?B?UE83UGJ4OEJuZjBTYm1oa3JXT2x1dmFmSUo5NFdHbXRjdEFBYmZMOHNUY3Y0?= =?utf-8?B?UUVJaFcxUVFPSTAxRElsUnVnUGF0YVhzMU5aQUF6MGUxQlNuSlB6RjNpaUFC?= =?utf-8?B?RkxLcWJGcERZdHM4bXV6anBYTmhDMEJEeU5KTVdsOERrdGRISmxabTdMTzAr?= =?utf-8?B?ODV6endDUnd0YnRxbFA5VXVoQ3JzQkZqUFFHWGJQdlZNSGNWcWhXV0RHNUUw?= =?utf-8?B?dWgvdXFvNnJHVTNOc1I0dGkraVdZMTUyQVZqMTFHR0JNMkE3L1pqL3ExUDJX?= =?utf-8?B?WEpLOU1EekFMcElhWUYvK2F6QW5rUnc2dzdUb0pPSG5YaE9TWmxOME1PZGxV?= =?utf-8?B?c1NycHUxMHc4MWM3M2V2Tll0eExVTlF5OTVjbVIvQ3JnZXBTMnRhc3RGbHBV?= =?utf-8?B?YlRFRGFBcHZ6Qk51WEdvNWxPZktubGJrV21BdVdHelMzQ09lMnRxMkVGTUxG?= =?utf-8?B?Z1dLY1ViZTdyakhlY3FJRjk4UTNkNU4xaGpHRGt6emlDY1RsQUlvUkduZW1M?= =?utf-8?B?eWwwWGV0M1VpQm1nMDl2VkdGUktHVWNuc3lLNit4U3lKZlZMWkh6OVlpWm9q?= =?utf-8?B?WWI1c0JKaThFMHJtTVdvUlRCaEVKbGFZL2NWWFk0NDN4QlJNZXBmcm0raTVW?= =?utf-8?B?bmhsZDJ1RXpqSHVySmlIdElmS0w3L2lXWDAwMXlVbUlvRGtzZ3ZLSUozcnFk?= =?utf-8?B?eVZVcEJYdkkwTEwxdlhQM0tPZGtpYUVtdGQ4eFlEaFpPS2JMbXlnMGxiUGVY?= =?utf-8?B?dWZOWHhGZ1hGeHdqRmdXYVhWdVI5UU5wcW5NZk1iM2xSSmFVSkhDRE9UZHRs?= =?utf-8?B?NnpWU1F1YjM4RjM4bWowNzVGcFRqQXAyNnVScnJvb1FqNld1Y21sZUlvamNI?= =?utf-8?B?VXpack5TWm95YU1KN0w5UzBSU2hTTHFpakxwc3lEVUZlL2g5MDF1M0tCNVNy?= =?utf-8?B?SmV1VmJUSkt0WDNNVFEwbCs4MmdwTmNnUUZabDN4eGNWakxDQmlEbzRNenla?= =?utf-8?B?QnM3dTRJdXVSK0RQeVB6WitrcnE0bUNkRDVoVG1CS2Z5L01tWU43K3dBK3VU?= =?utf-8?B?TDVFb3lKbVZ1RzNCSEs3aE1DR3J2ZStzUml0M0V1ZXhoYTBZcElickdMQWVu?= =?utf-8?B?Q0hjUXV4M29kVVNVMTNxcXZuRXgrT3BFdjU2Y2h6eHRETGZwekN4NUhTMnFQ?= =?utf-8?B?ejZDMk1wNFdkZyt1WnBHTG51RnZ2bjFQTXY5M2J0R3diVXY3bDFQZGczNFJX?= =?utf-8?B?eVhWdWRSbW9ka05MOUlZVDdQcWoycnF4OHRrWnFCdUFxdWtRT2dURk9nPT0=?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1148;6:SobF2m/TgmPpCWFZgryBRaLzuIUbmr5V0PMx4F2vXgRAK/ZhdPTrWc4wGJFz/KbAYZc78jh0LykRGHmcj73BPlGum/L7OmUR4TxiUfBFY7Kgt/qB8eRmrRJOm19HuF0t5KL/jYNAlmzo+YoqEFLrtBlU5HP2cd+oGh2PQrBsKHmeyGr5z3GbZcJp0YO+vJMf1m+wrIsKHu/hK1vKXXHXa/8N3Fud6VEvhgTaSRERcwGEv6QOvvdRSPX43t0nrD0QKuI8K2Rpl6ffdjHL6MRjnbeKiRNpVjFSOmoF10jOo86kbqh1Y1YIP8Pdkm8DBu/d7PiJpIpNieqkExs3Y90HyQ==;5:VpPvZJdyVCCoES8HWvrGW/hPalkZ2ORUXaM9cyadlNcR0H5yLoa+n65hAO7jFeIKZ3a2Q7AvM4fgqMGukyi9VVKDhaNwjrtCx3M2du/XVoty14+WP9J7UEnWUvF2Txs0DQF4XC88L/WlKMctWnL7Zw==;24:Gbqp6S0cnO1eH02LNq3ZoLGKbpENYrxbpfY1mozGb8xfnobYx7ec4rXYPgGHiieN9hczydcXWf6z0+covPrjXAVSlbuqJWAN/12xdjhPHWY=;7:TwdvrYzd0+cHoNNoAcNDy6mEwD3DJRJLJMwCh+dntC9TKC8gLYka0BRooEQnZv0H3N2nxhjGne07U2ErSYG/1JTU+c7MYOAEnNQtSDDSYPfXDOJ3dKFSE5WabDp2f/eUlmh4mydlPWv/gEST3h/cbil+X19WhUawWi84pDrVVbt1fDA5MDqXNiE+mjsusVcwi2UWVSjghPD+KFYM2Le2gs3frG9shUBWYsBDXU67qKc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR12MB1148;20:ZWRTk7nN9TbNnPjXooXaSOx5kGq/e/CPwVkA4hSW5YHZ15wihPlcm42cmhE2LLCLqSh9M700AZR8dbpz5bpBVMO23KTV6T7gX8Z8TiBt0degKqRpynxymFNQYMtK3NZI+YX72rdtasXf+TirddSOmCRMMygkVHIZH5GHBhjx9STG43Hr5J9yKSMG0dhH3/OamXntPWK3hs6iZBjwdzfAV5dP7AdJBxq5lO3HyeXDyW5zy4czk9PE8PTdgtWWLsUH X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2017 19:45:07.5887 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1148 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some routines in mem_encrypt.c are called very early in the boot process, e.g. sme_enable(). When CONFIG_KCOV is defined the resulting code added to sme_enable() (and others) for KCOV instrumentation results in a kernel crash. Disable the KCOV instrumentation for mem_encrypt.c by adding KCOV_INSTRUMENT_mem_encrypt.o := n to arch/x86/mm/Makefile. In order to avoid other possible early boot issues, model mem_encrypt.c after head64.c in regards to tools. In addition to disabling KCOV as stated above and a previous patch that disables branch profiling, also remove the "-pg" CFLAG if CONFIG_FUNCTION_TRACER is enabled and set KASAN_SANITIZE to "n", each of which are done on a file basis. Reported-by: kernel test robot Signed-off-by: Tom Lendacky --- arch/x86/mm/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 72bf8c0..e1f0958 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -1,5 +1,12 @@ -# Kernel does not boot with instrumentation of tlb.c. -KCOV_INSTRUMENT_tlb.o := n +# Kernel does not boot with instrumentation of tlb.c and mem_encrypt.c +KCOV_INSTRUMENT_tlb.o := n +KCOV_INSTRUMENT_mem_encrypt.o := n + +KASAN_SANITIZE_mem_encrypt.o := n + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_mem_encrypt.o = -pg +endif obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ pat.o pgtable.o physaddr.o setup_nx.o tlb.o