From patchwork Mon Aug 22 23:26:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 9294785 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91874607FF for ; Mon, 22 Aug 2016 23:59:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 821A828A51 for ; Mon, 22 Aug 2016 23:59:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75B5A28A9B; Mon, 22 Aug 2016 23:59:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F88E28A51 for ; Mon, 22 Aug 2016 23:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755801AbcHVX7P (ORCPT ); Mon, 22 Aug 2016 19:59:15 -0400 Received: from mail-cys01nam02on0046.outbound.protection.outlook.com ([104.47.37.46]:37218 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932424AbcHVX7K (ORCPT ); Mon, 22 Aug 2016 19:59:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=cD3ZV9wbuIfGVrTdnnAyebqR3TUOME+hkvuGl9jsuJs=; b=zeTgEk51z6P6QElYSNWmWZc+r8rOj1od4iBpHvDX16V/Oq+n9PmhSbz/A71nvx14jq90llQ+EmWesiQzQ5p0zS6oA9fVcNmqA6wUN3f3cNm1sIsZ0TPXwPUH+oNLQStFWRD5i5I9vQwvfsY0/swVBY/70DPYBHrcsD50MbXDfDA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from [127.0.1.1] (165.204.77.1) by SN1PR12MB0669.namprd12.prod.outlook.com (10.163.208.27) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.13; Mon, 22 Aug 2016 23:26:32 +0000 Subject: [RFC PATCH v1 14/28] x86: Don't set the SME MSR bit when SEV is active From: Brijesh Singh To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Mon, 22 Aug 2016 19:26:28 -0400 Message-ID: <147190838870.9523.7536164067495140361.stgit@brijesh-build-machine> In-Reply-To: <147190820782.9523.4967724730957229273.stgit@brijesh-build-machine> References: <147190820782.9523.4967724730957229273.stgit@brijesh-build-machine> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR17CA0037.namprd17.prod.outlook.com (10.175.189.23) To SN1PR12MB0669.namprd12.prod.outlook.com (10.163.208.27) X-MS-Office365-Filtering-Correlation-Id: c37e72d3-c5f1-4b5c-f100-08d3cae3c24f X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0669; 2:0rTaYKmAGhV6EM4WMtXBEheSzIcpJbdTgqZPytotvMS/tKHJMG9NhwWmVYAU1fSa8yZSCNnTZkaHHFyQwaSLv2hixPUONgkFj8bJPIS6FA9M/Xvjk1EUwTMZX6lpGVpe/kt63XepmJ1J3yWyouTNKYg138ElltHqmyt5T0frx/vi534qqYIdmeBD0Ub5j+zb; 3:EEZ71DbTrVbKOAx3fgn66pgLBeqQ0bHQ7w1RK+jjnWU40QrFV43MmoFx6wbnO+oGb/hV/qOTAIZrhht80Ujd9+l1vJChkPy2+h5Bhs2K4MzcuJr8UYBa7gghBobjAv2x; 25:EKCZqpugaCwYPYSMY2YjI8MX+5oLsGynhLxiEfbXABAwBof3tEAoNed+dfWhUNVweKibV2fDct17Ao/AjQpbDON9BN+8bRoQQc6ToIbT+5EF20ddbLXcXpZ/31j6MWcjAJdahjX+/jfu7rP+40/4Wd6UeY59CpGj7jtJNw591mFAwnSQ8OI/RGaRwt68tCh1X3E+ieRyTuOxI7+iYCN8QG02hYYLiqRB/bg0NHAvk7E+mQzXFaEmjkkczbCuSuUfJ7BBjq5o81NlmuW1TGTuE8Owwtzh65M2ucxHkzB64a3OQ5u4BX+EJrnefo0VqYHxgcAcLRKUdVkSGaF0VQVBryHYpe/9amrKxiJFdufCeu68m0Z7p1mZk48p+jDR1T3RJO1EHt+BthmIb4jtJXqRuVFJJYc3fdID6KBOyZQomZU= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0669; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0669; 31:YCf8Ba2OcDmK0Ymx+GxNZ0VdagMkExZdSvYcbPKXKZb36EVLe0dSJncQYjaZjV+6uq9DfEm6Kn1dyP6CXEWN3N8R11LIC7S/g1Y7MgqstbpsKrWeO0NcwmCwiwyTdFrs+VqSCne9liwQMLLkoluWKOGi5wzHiejpZjEfNoI9nZr2wgjRVfi6GtysmJiWWZ0zcKyfJj6u2Y8oAKJOhaSw1Fjtm/ayd8GmaiumdDZoY2Y=; 20:SrI9G+SxzODmSN4nPEjMxT2S4XcPS90x7rDMlEg0KGw5HMuo+XE4xX3My0jT+msOifJh9t3hshsg/OzuCQOtb9tpTsjidtdT2eZsFUR7aGE1n4LbEis/cm4BlK57GGP478YfYuPGTju9N6iPV1CUNZ+0JI6tmaCsfaP6NVzgYro8/vNisIIJyLY/dXcgToXf9DR+JRQdRUCLES+BrT55aYI8CCeQuFl7EysHTqzb6Nis5cr/HnsNMf4AE+DKAcLbSleNHk0GTBR9Uq6dvsKphy1nlvvu3vJ6Tv69zg7ZA0gNjGjA4/iLxLz7bo0SqvrtS+K8PUP70E/cTc5qNYLPz0BXFjPk+19n3rXvSDeBGHr1mllvcu9dCiaUztSjcLKsdWiy5k4I0FRUM2OQvMVuJS9EglZWlsGK2pPWjDmm8k6iN1l7CHlJj6uLMiApcGTszNL2ST+DSgfOVQxwGUz6n+0Rbu8B1hLkfxXqZ1DHIIrJcuzSpifzVVSv79g8hOmf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SN1PR12MB0669; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0669; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0669; 4:t1g0iUwPM/SY6VhfhnNP2AVH5YtBgMPAAXAMAEoKEj2SX7zECf7P9FKbCeXkJiVYBjznNaTqoD16MHXCbvMt8ybTnHtYIN0uGEJ2tHtf81sLAjDEobzDbKgICIvuCje5+UrxWUZjByO5bG5xO3hy7MTZzbcLkJE+3qYtgcuE/WSVQ3i2pnM5Ve4aVdgi0CKLuPnbcMmAyMIprDctTAeE24qKplbsam+KYzIXbLNnHaQcm9npyYK1AkVVBBKiiwaRRfCzR/ntBKepUa9GOojXPrR8axmNA/WHUZ4NWsV+tEqJuqodSH+EMGB9zH7okzeArAlbKakznVBVpd+fYyONPxETGkkdA6jY+eeURiP9u+p1sCtM7fnCfnfC7TbU21v7TJMvCf+vRdEjmzPBGlkSG/BZ7E7PHaZhAQMCDa7jPX+PcriJyUKB/yZyfLY+EYnn X-Forefront-PRVS: 00429279BA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6049001)(6009001)(7916002)(199003)(189002)(586003)(68736007)(50986999)(76176999)(23676002)(189998001)(47776003)(54356999)(107886002)(50466002)(6116002)(3846002)(229853001)(97736004)(5001770100001)(7406005)(7416002)(19580395003)(4001350100001)(77096005)(103116003)(2950100001)(101416001)(9686002)(83506001)(305945005)(105586002)(7736002)(2906002)(7846002)(19580405001)(92566002)(66066001)(33716001)(2201001)(86362001)(33646002)(81166006)(81156014)(8676002)(230700001)(5660300001)(42186005)(106356001)(921003)(217873001)(1121003)(2101003)(83996005); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0669; H:[127.0.1.1]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwNjY5OzIzOmF1aURHVUI3VW9PWWlvQjZPN1RHMnlhQVhm?= =?utf-8?B?Y1FueGNrNWJ2ZlR3RXlHYXM3S2h1L2FDRDdRSk9ocjVoQm9zV0R5MHRTTDk1?= =?utf-8?B?bkRycmZDdEZLSzVsM1g1cFNsSUlkQS9lcU5DOEhJdGw0NmYvNUMyY2dOaUNr?= =?utf-8?B?Y3M2d2lIb0VlbkVrMGN0RHdublUyQnR5aHhtNU11dm5PTmZmZ1ZyUjI5Zkxq?= =?utf-8?B?TjBLSUJ6ZHJ2YTNibllKbXJTeGNqVGJoVGp3L0U2Y0lUcnFsY3plYjlMSm9Q?= =?utf-8?B?VFdNMzROc094b2EvNDM0SHVGUUc1eXhKMExKN2cxMzk1NGVnc2JtS0VaMnI4?= =?utf-8?B?MjJCd1hPczhIclRBZjFidUZWVlhYWmo5MzNheFd2enhrcHJXQ1hZUVo4SlFI?= =?utf-8?B?NjlKUHNzS1kyOVhCbzVKVGtjZG50djJHUkVkMm1HU0FUVm9nUnVLa0szNHUw?= =?utf-8?B?RGhVSUthcXFDdVlXa3lKeW5IbWFDZ0kxUnc1MENodGpISUgxM2VSV3ZKc1Vm?= =?utf-8?B?MnJ3Zk5HQVppWTRzNGRNMm95SkVXblBHRDB2V3h4REdqV0Nhb3I0SnA5b1Bl?= =?utf-8?B?STcyTmEwS3pWZE1MNFNzWUVsclROUVgvNjZJZlc0bFRKRGVlQ3J5K3huS0dK?= =?utf-8?B?cG12MVgvTDRoS08zV05IMElnODBGdzhpKzdSNENmalNyY2VLR0tQWG90TjJs?= =?utf-8?B?MTlZa2paU1RwN3RBV05xa3phZnRBOWlRWkI4ZmlQY0RmWU55MG0veG1DbmhP?= =?utf-8?B?M2hFdE1oNkE5LzljNUJYLzh1NVA3bUNMWEh0WXB1U3AzaFFrWi9xd0EvcXV6?= =?utf-8?B?ZlRqenIvRXhxT3dORWtGTHU0UngvUFlCWFFtSVRKMnVIREhlbnpvNlgyTWNj?= =?utf-8?B?ZWlZRjUwcnNVR05rVFRrcmxMZHFHZzBqRk5xWHVROXFES2tzQTRFbngyRVk0?= =?utf-8?B?QmdMamp6aHdnZWlBdWlwdVJURWIzTU9rZ0lmenhGU2VsUUcyOFRPR3ZqajRa?= =?utf-8?B?SFYraUhzT2tOWEk3bWEzVVc3ZTJXSXoxV2RHWFlheFpGZWhSSUxxOHpscW00?= =?utf-8?B?aGk3YXl5YVhmUGxDZjIwdDBPUG85Vk1IUllLVlEzeThSK0UxMWZJdXk3Y3kx?= =?utf-8?B?YS9hbDlTamJyUk1SdXNGajlSdnpXd0pVcE5nTEI5dXdtQ1NLZ2JTQXVRVS9S?= =?utf-8?B?T3hFTUJDVGQzNUxxbmpvd2pjZ2V5VkN6ZU04U0s0U1ZKUGJLL2l4Q01WeFht?= =?utf-8?B?UlJ2OUlDZjAxTjZCTmNkUDRWT0lHNTNuSnpYeDhTN3VpOExZM1M2cmI3N051?= =?utf-8?B?TUVCOUpiRmpKNWVlZTFOZjB5cEMxNUpNelFxalk4dHBjTTZybGM0NFYzczV3?= =?utf-8?B?MEdWMDBnNThTTFNLQUNzcHNHK0Nzb05vSHdENS9OTUx6V3FnREkreGlucDAw?= =?utf-8?B?OWphbm83M1ZKd0duNTVFY1UvUEhvdTdTWGwxdmtvQmg0UHFRYzlTdXNTYzVx?= =?utf-8?B?S0dEYkl0ZkY4anh6UTZScHlWZE5LN1BnZkNxcEdkeWtiK3FHeFcremU3YTJC?= =?utf-8?B?c0xUQVNwckFIRjRhYmk0eTFmVGgycG9MZHZIKzdoZmJGdnBkMkVyVWJYWmc3?= =?utf-8?B?TGNSdlBrMk82UnZ4L0dXYnd6ai91U2tUdTBPV0s2dTlZYzIyOVJYMnVRR0cx?= =?utf-8?B?ak9sU2htRHlJVHZ2MG94YVBXK0hvYVM4Y0ZucVUzbEN6c2EyTHpEb2RrQ2to?= =?utf-8?B?NkRSZjVDK3FYOGw0djhmSmpDamM0bVR2SkhoRThTaTR1d1gySlMxazkwMTlG?= =?utf-8?Q?VvwRKE1nkeidL?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0669; 6:irC6aUdc5gXdSZ+LNfIPf30vU5JQC2oml+FmkUZYyk0LbN5mMynX/FQMn0CjQYCJUKLfTBbSB4gOM3ClykJXAzxDGkM7/G3aDXL6EPiyoEChG/eHXVAeI6JQkW7HY42UWx9tB6igs6TuHjlfn64v8s65wSCI76Fo0IJn5CF6pcq2K9WwKd2Gkq+6gIO+h3Js8tQvZZb1N44lk1aflO876iXqLHl+B8y/vU1jp/PrEAm9D62xgfv/nXfjR9kake0xO3DmY3N3ivyn49d1tBIFVlwj1/l95HvgvLs5n/SR52rThTTSimwqkRLCY5GIZ+7USkWXCZ0b4epnz99VKiHJhQ==; 5:B37lsHVNPq2WyHcTgAM0kZVw+FkP9CQcQQhj11/un0y3isAV3VvwAS4sCzzoXwDqoYn1y9OpZC+ZMRgT6YzbPmgYy9ziK72CpNoXlCahvVV5nCkOXoZ8BftZm4mZpZ+hE5Z0dl1jSwf7JbGymD5JDg==; 24:U/gEwD1fUe+riXfDR4ZRHlFdzWINXoxfb0AMgvU+DoZ1xqrkJ2MjslqwjDoLjv4NVtnrGC0rhyi/LnfPCx93excfaqrPs9BOY/6zXIrJf5w=; 7:dwS8VwuXoclIpSTZ9T4ruLUIwFbHokWx/rBbLcMN2omQATT9Nqyk8i4cixQoPCbpARhWzEBJ/oFRlF2+HyD7inQKMdHfozGi1wuZ1x2SdVtesfb7UILVuHsjJC1c4h7C7SLtm5ItQ9hIgR7gTLvIU4ZvJ+NRf6j/j22/v0boWcJJzvaoVmoWyDx+oAql8jh6v1A8YLjovAag2R8NtrPNSu9fvK4gG4+1elsNASYWu1pWCw/RIxCi9u9kP1GAAAxN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0669; 20:1GJEGcvf5w8GA7IVznVwflFz79TsEyjPYsAqdwh2g/NLT1fiEUu96HVf832HQXfrV73C5OQUmvthRcZFnUdnrDYG0s3P8AMOQKoo2WCLmKWshcLVnhDcxQzvQaFNqPyL3mPznc93jeY1nK1VBqgWXM35G8Pgw7hVYlOx53HH13oDwUSFwp4u8ormW0nudN20eKg/TX9l1uATG5amUXQCdZkQYOELtPLryISHBwxbPoLPUr2MIZ4h891gkr+/6ZKN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2016 23:26:32.4081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0669 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom Lendacky When SEV is active the virtual machine cannot set the MSR for SME, so don't set the trampoline flag for SME. Signed-off-by: Tom Lendacky --- arch/x86/realmode/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index f3207e5..391d8ba 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -102,7 +102,7 @@ static void __init setup_real_mode(void) *trampoline_cr4_features = mmu_cr4_features; trampoline_header->flags = 0; - if (sme_me_mask) + if (sme_me_mask && !sev_active) trampoline_header->flags |= TH_FLAGS_SME_ENABLE; trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);