From patchwork Fri Oct 20 14:30:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10020421 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 2B0D260211 for ; Fri, 20 Oct 2017 14:38:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F36228E19 for ; Fri, 20 Oct 2017 14:38:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A2D2528E78; Fri, 20 Oct 2017 14:38:51 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable 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 2C22728E74 for ; Fri, 20 Oct 2017 14:38:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753193AbdJTOid (ORCPT ); Fri, 20 Oct 2017 10:38:33 -0400 Received: from mail-dm3nam03on0088.outbound.protection.outlook.com ([104.47.41.88]:47104 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752523AbdJTObX (ORCPT ); Fri, 20 Oct 2017 10:31:23 -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=wBHZ6ATQeUcLOEBgc1TqiMXyEmZKtT5IcMCqYnHN0EQ=; b=ymbw9ENE0Vwafxu3UkSS13HqKr9WPBDL6raTAHQZ+a9X/VOUJWxrtoevcBdrNjPN+1pwbUnG9/SbM681EFZynJsaiwOX6M0xLaRZZMuCvW70DDfMUzGwRK/f6j5ZUTfPqTiGUC83P+W1EOQ33EbwKSb4GsLPv73Hcidn3ySUJXY= Received: from ubuntu-010236106000.amd.com (165.204.78.1) by SN1PR12MB0160.namprd12.prod.outlook.com (10.162.3.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4; Fri, 20 Oct 2017 14:31:17 +0000 From: Brijesh Singh To: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Borislav Petkov , Tom Lendacky , Brijesh Singh , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , Laura Abbott , "Kirill A. Shutemov" Subject: [Part1 PATCH v7 04/17] x86/realmode: Don't decrypt trampoline area under SEV Date: Fri, 20 Oct 2017 09:30:46 -0500 Message-Id: <20171020143059.3291-5-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171020143059.3291-1-brijesh.singh@amd.com> References: <20171020143059.3291-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0029.namprd14.prod.outlook.com (10.171.172.143) To SN1PR12MB0160.namprd12.prod.outlook.com (10.162.3.147) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e514214-463f-440e-a653-08d517c73a41 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603229); SRVR:SN1PR12MB0160; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0160; 3:WUPeMBTuM5hVP9in1NjroWKTCwdyUwUBq/I5iJyNZF6OZ9lSlKSwFNGJvCdO0q4/z80DuHzPGjLeLkfttxRk7pD5v6yzNJbQpNHopTQC2FvAPGNnvQb9F7cEGTpE+S7xXmpEuiQm24DhFsznIWXEulLOY1CP/SB9YcXnEppUHP3zpINGvziijFnWoraVTuT+o5Vkj9HDEO3fYDkyIk2W1JsDcyWFBoNW3yHYeu+xTHRLPr/b51sVqICwNsS9D8iz; 25:o6MDN8uSiWgexjikUjCZYiyVFmWLBANr6HYscLQV+kpzBYnfp+mqkwoLH39wmm0vGOPf/57/Tqw9bRPx1xrWMTmy/+w1+3yxguYMZSKdiah1EOqfdCgNSfvb9+uGYVRsW2N2+Vpsjrpe3IFI4hkZaFLyw6CY8YzgqpcmyInY+BBHylXVsm3c1yhD2ykYdAn8k2xLJWJ82YtsKd84sazByN6ISHnYBTuQREKW9iVYB3f8RjBciRn4lKWDljqzvh8jOBeMhskV3qPf1giDTskcme4ERNdcoAXldpqyv7VUCPw4DGwiD2tySQFPO3Ne3qTGyxJlTKLnBSCFpFtCmhpeHQ==; 31:c1OemgDn/ph1h9qypBml/i3kBVdCtsRcqbqIjSRBgbYsyWo5jQSE1IJragLeX18FFTj838jkEXqHZtjBIIh05MP6KMk70DdhjwsfoRkDbuQqmIQvoOs70eyQXTsetRvm8BPnUaa8TJ01CmFiAYUK7KuWBwjIE71px7+Hpa1lV74izrMJaQ8CWazN2dTwreZPRnaoAr0/mq+S3lRi+gQXQioWI81mu3LKL+i1JBJGn/Y= X-MS-TrafficTypeDiagnostic: SN1PR12MB0160: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0160; 20:YkQ6opQdyHgGEVbG3v3u5NqYDvbOZ+/mBLYXsqLfxCbZpdWIOlr3qVLrCznKB3u9OYA8qEE1FvcKhqv2hMRroyvs8FKZ//JMtcjn9dMYNNK41r0fknHXxlJSdVIVKxcN6+4+Wj/3UxpfRw7s0ccDkZh2M9Fvy5tSoTMJuRFuDkxtdBwOOkI5GjszyU5aJCnZywvhBuC+fhEHqc3nJPibVfTPZqJlmIJWuvi/KUT31XkdaZWiQ+wI1VSmwi3/vb1MZNcsaDUZ+HDLdE9UMQGMxDibDyPiv8YED2xl0jLclmtlgyV5I/TO8ToWlgQNOWP8w1DLH8tmVuYqq6W9HnvL821gKkcGQH7z1HkphfLiWkKeHOokTFHzpThaca5lgZmOKFqRDhAIuSML58xxOlMnNV8BfgnZHG0Zp/tFJjGqlYAzZZOKf7fPJ9r2QcRqWBgT/asyMHBqOy/tnWu9obMq2cpEJl1J6tq0QeROYwi+29JOwjvnBmmm419S6mlTZLmh; 4:6iio8jVbf2GW7+QWjNpoHzlT+QFgBCH24itBW6s1mzQNCmAk8kb/bMGsBuGqIdFp38qOZynULb6MhkPl0wlc7zDpoq2zN0vKTrvnvPjrN95+JpzV7mU1lRxfbRvEONzCt3KCiDr60gzylnWms4bndhlm6Nwx2VCJhHjaHAsOnkI4jrTIhagslYM7CzAwLEBU38brlVV86T7vVMmDfjGh26LzKkTkTQ15q0EKvi7SqwttdWlnmxg+8Ns/i1TOyuReBG+MunQGqkkM9iFEztEtaJB2632/d9aUZayUVKr7zgTOefiOLWHGFvpZE/qyzzJY9ZeDbZdFgi/Pc8RIl4/j1JuQ8XeXBFcQN/vJosdbnBE= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(3231020)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR12MB0160; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR12MB0160; X-Forefront-PRVS: 0466CA5A45 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(199003)(189002)(54906003)(1076002)(6666003)(189998001)(68736007)(8676002)(305945005)(50226002)(7736002)(101416001)(76176999)(8936002)(97736004)(25786009)(81166006)(81156014)(16526018)(6486002)(478600001)(48376002)(2906002)(50466002)(4326008)(7416002)(47776003)(66066001)(5660300001)(2950100002)(53936002)(106356001)(3846002)(50986999)(16586007)(53416004)(6116002)(5003940100001)(36756003)(33646002)(86362001)(105586002)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0160; H:ubuntu-010236106000.amd.com; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0160; 23:AnnJ1l0JgMFY4KFZZ1ypLlmOMPO3BzfNEHO8U3Ymu?= =?us-ascii?Q?PcjEsMFnZvuVW9FesNZK0T2BDK88i9NblCnHyrC6WhRsPPoQSamEg+i4BVlt?= =?us-ascii?Q?A8WCp2Okq87wbhTj0L5tFNjBYtVoc4BtRVhTW32l0v28+MloGriT0tAnIspK?= =?us-ascii?Q?s7NTz23/KKXFA/eHlcYIjHDCc62BNNUgFb4Wub46BR3wxpPT/O6cBeTRB2MH?= =?us-ascii?Q?pE0q99cLKDEhCMDxEib1m7bIyzetQui5eMw20dO7RhwXUi2SxbnHsY0tBKBX?= =?us-ascii?Q?ZFpYN9lYCCBZUSzUHgg6ndu2FAzDCQ0+gHV2M2WSyQhRXQ/wzYS2/MpEnMnN?= =?us-ascii?Q?ZEK1oyQIN/h9qSU1pDTffus51SKt+1G0zklFLzev90nSwWwvtziSFce+YvnZ?= =?us-ascii?Q?gfhvI70zBVbuoh07CJWafbIj878vIeRWZ1x6SMH3G20BMcMUYZ6W+n/KQUVM?= =?us-ascii?Q?cfdI8wim5bowGA5E6NP4RQLH1SNDFWoBp6CLqllIiBLr98BUx5rOzusz/2dK?= =?us-ascii?Q?0mcFCQiIrubLP2Npju04QIqllX1+4X8J9aTIX+Vu3qoV/hZu6JInGBx1ih3H?= =?us-ascii?Q?VNw7XHycYbmKUAA+bkEpuU6QcASfo+E8SsJkYfKAnLWIQIlt9I9hkJCrlrae?= =?us-ascii?Q?DGTHksUhbwEIXeIz4tKvg4jTSEctWEko6DVfNQE+bUgSXPTWEylnDYyJhA4e?= =?us-ascii?Q?GOb3gJQhPuOUfBb+2vZ7bwJs8fxGf9/vd6MqUyeGv7dTu62X96QDDwsGiNQy?= =?us-ascii?Q?zfB3BlFSFYNtNUcjDfaqYFhjhiIBbqHSTsjPD+IMemwIbX2ygaNfxojv4azv?= =?us-ascii?Q?mClf3mB38T9lnUzJ25qPP6V68jdDsVIZBEwMi79az4d1Vj1R5AgHlughhZZ1?= =?us-ascii?Q?v+yH49M4uu9+B5U8yPSRPHwR7EkdTWdW83kb/S7SfJyMz0DtD8PqEMVQtS3X?= =?us-ascii?Q?TQIcj0xc3bcFnXReoDwSXAwqeklPXrc/eMqxldTolm8xQeU35xEBcsEqRfrL?= =?us-ascii?Q?rIezB9HFCkZEqZR/uP/UjyaXIAWhcNuJ7D0qjDm4iJnYV2xss1xk50YpX6m+?= =?us-ascii?Q?trgD9sDsfn3VZtFoOzxGbLoZ11UsyR5v5wBvRI8wMs+63BoRuN4hMEFdESte?= =?us-ascii?Q?sxMxTL7jDo=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0160; 6:2XTK/Pjt/n5sIaFM/L7TuMnjrYGlJ+1984ykPKOetut/d0g0htkXBk6uYA8qg+9IMW92PZQLb1sJBhs09EjAQHOCrWTtPvLrHWKascnie2myeupPXt1Lr13qa2dDQLLegXhUXZAJ/swgqSsToCzFKp74CHSyf7uf0TPFzaAPs3eHFKqMnJNGTNliFX331urybNB39G7k+mx6XAArzFyxJ4BONWJ5dFnjUeiZznh0kM0l9Y8WCFqK0WtZ6PlYXacYdhOtVRIfErdNowT0EeYNoPLfplyTt3Hy+YCaJ9FhAuircu5LQpAV1SQ4pIQ6Z9RRK18/rHhCMZWHm8Uu41DZKw==; 5:3FgsDyvIdXr5+PsHL8Lh986Ih66xm80guCrmkXIlG+4xDqou2VEJqY1KRhs9ndj+z2AMribyluNCyebc2+4z2fk4hRp1PRrz7jc8NEx+5cDOqBKvGGnsJ8utj68EJUG7SVNcyrDUqLSFkgrRBm7l6Q==; 24:N10oMkcKMigJvRQIgUtadvQr7mV+cMj+IxNd+b5G9b7YAu2Dljx4tAfkVVhEO+b3kciMfVm06It+FIf0z36kjmaI1VEgtVzufKcn8YU7FdE=; 7:CTrJWrz3X11+BYems/pwk2PqNgQkZkK3gB08dNCu/Ho+EDGheIZ8c4wqY3GF4rx/+FgYMjFT4wvbMJTF6K6XwjiJTGfz4xNcGalXDcPiW/frmmFul8voSCyEgFVHgzViRAGA+g/UXTEksFxgAq7T0tO/IvFJlEkE1RARU6DG90kmhsS74d2LVBZg9OkcNVHIS0kAjE8GFJIhK2Yp88LEudbQ1G9379hZv+hR4FEw590= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0160; 20:wS1a4fbF+/YOlzi6M+s+cbCt0qTgHvxJXQ4bBuvEzfYGFn8CMkH4ejVpnJb/xhRHMs2oXxo5INoUR1Eu643JqPN18miILKeDf0VF7chtTqm6XJfOuKpRW/yC7Vu7Rdb5jSMpPqE6+8q5xb4h+c3DEGOnVIsCUVIpeUfSZXEgMzvVGw17WfsAddx1nILq9EpLgr67aGS/cefEiXk3S1deUywtNJMnuyv0qUtbkob683pj1IOI3UNthou3HgFnMd8M X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 14:31:17.5792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e514214-463f-440e-a653-08d517c73a41 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0160 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom Lendacky When SEV is active the trampoline area will need to be in encrypted memory so only mark the area decrypted if SME is active. Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Reviewed-by: Borislav Petkov Tested-by: Borislav Petkov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Andy Lutomirski Cc: Laura Abbott Cc: "Kirill A. Shutemov" Cc: linux-kernel@vger.kernel.org Cc: x86@kernel.org --- arch/x86/realmode/init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index 1f71980fc5e0..d03125c2b73b 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -63,9 +63,10 @@ static void __init setup_real_mode(void) /* * If SME is active, the trampoline area will need to be in * decrypted memory in order to bring up other processors - * successfully. + * successfully. This is not needed for SEV. */ - set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT); + if (sme_active()) + set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT); memcpy(base, real_mode_blob, size);