From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754152AbdJPPe6 (ORCPT ); Mon, 16 Oct 2017 11:34:58 -0400 Received: from mail-cys01nam02on0072.outbound.protection.outlook.com ([104.47.37.72]:39104 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754077AbdJPPev (ORCPT ); Mon, 16 Oct 2017 11:34:51 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: x86@kernel.org Cc: bp@alien8.de, Tom Lendacky , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , Laura Abbott , "Kirill A. Shutemov" , linux-kernel@vger.kernel.org, Brijesh Singh Subject: [Part1 PATCH v6 04/17] x86/realmode: Don't decrypt trampoline area under SEV Date: Mon, 16 Oct 2017 10:34:10 -0500 Message-Id: <20171016153423.2980-5-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171016153423.2980-1-brijesh.singh@amd.com> References: <20171016153423.2980-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR16CA0015.namprd16.prod.outlook.com (10.172.212.153) To SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c14c71c-5643-4397-1e5f-08d514ab6e1f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;3:yKiVlXnPMpOi2dfoOhXy40l9sQIwGtJgAUIrmDEE7LBK9B3QjOHv1jtfCzpBhb7DrFysBjKFEK/U7qA66BDxZ27NdPHUm4nwh5ni40//MNlMkTTkKWXVV1wH7xRix197xJpMdlp5rwFH9oBa04DIP0WgFrFOeM9YBSVrbDyOCksUCvq5DeM7MDKo1WUoFrwAp5FyCwa8YTDdQ4S9NubJZoDvPhNnsaomYReI0tMMNDl9ifMFKMCVQDRga768XAPt;25:pYlkckQlRMxkusGnLG2A/x1IQea1Pc1soYOIIZAYlg8MLjAfgqU8LPMA9U9jWsLvI8U2aMgooOWnT8LLFMpYP2RlVeTvUoMgTmkPxWovuZcjIXhdNYItn+bMWTVZf5eUYHYXBO46TRHHCEbuSuDo66GBsMlq79pRK27vBqAugRjKVYOzIB8abvr5IfI+zWMS+nFS82YQBtyILFHdgMMU2uBP7N1rgGBQDSFOfJxG3KCDd1Tbl22F0FlJRu8Rs+WO6v8ewT2lMkngYl4lr2e9dCtiB8gBevutFFwQI9xzq8b7yFzEty3kCf+6s6WaTB9jHejCv8tE/K+rfx6d9O9t2Q==;31:j8lpDXL82bxeskjj7tPU62VzvQkzHnTDtgml9P0SBE3ZCgvFwz7TL42OjbrEeKNUVfBx9YkN0G90Hkodz6tA0rqVcZ5Grw6GGiu9WLfcnkELglWZdHB2OcCRAyHw+K72mR81HszfDG0uOfY/oCicRIHeayxJ/S1RS91Vl5TLRy1kv3hRLbKwpPXha39RNtfKwozKKWo9OksfMVTCf7lwBx3TzFLCUk0soFgWzOnIxjU= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;20:bdJm5VgHYmt1QPkfx2NQdxrqeKk9/O5rkCUtmR06Bms7PWOQQPM5EJiHktHL+ZgqvXKixzAKc8kkpeysuYWcYheWAzfUzBXWgP489Z6YCvdn4kNG1LzE8knt0k7iRUnWfMasL5s2SjMEIgZ/cAsx7dhsk1k3A/YLQZDSItzopePR9Jw/rdGVhrYUeFElYk5vLCcUNZA0WkbDHCM8gEuN/+n8D7mD7f4g/OyqmIkF4ZpS5doUHEdmnUU4VdoBV6D7+7OhSyeknXTEWbVLrtHzBr4yiermZ97dPu4S7AbVj18AGrE4LHZ07ak7/COxkptqbd9trR6mjn1s9pkzG1XMUuVYRyikQzIlK6YhZGlh0eldxEsX16HxXFNQZ2+vCMokGsvYcN8EbUWbcpsgs9zFZlQ3Od7aYYaYPj38zpYC/duAnUbg1NN/rgPCeHGuv9FKOef6gWubuTThTmQTuggRosqFcPVbCl72UnkTjaoA8sg19KCIwF7gzKUsEVxDMGMj;4:Aenjv0eofnbb/+wNpzcPHlj0Aff23p07TR1c/xqD02s+bsbcPOynRjt3NfHCh+bJsD9pKhlcTvncsYplLYjHMT4xQ9ixl3qbaeBSWYYyKT5T+T5ddZEBZdVWeBSmLLDr1XhUhrpv/X2F/Wm5FC4SU4cjjHJDGyYZjS4D+/iZgGYPD1x0N8YTryZL9TnTlNYovdq9vbrsgA3L29nBnxtPY4zl3tpFLO4j1a7FnZrWLt9sJhcOiQhO4CaTdLaYThcMASozE+fVlbpF31U4SU2kINHcigI3NG1w6f+Q4DnODEZjLvE4zuwjRm0a8jxTZ3Y6cak8fgOvqEqNsh7q76equdiZTXEGNuJ1oFdk6AI8ulM= 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)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0158;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0158; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(199003)(189002)(54906003)(7416002)(1076002)(316002)(5660300001)(16586007)(68736007)(2906002)(4326008)(16526018)(7736002)(47776003)(305945005)(6666003)(53936002)(86362001)(33646002)(2950100002)(6916009)(66066001)(189998001)(97736004)(76176999)(106356001)(101416001)(8676002)(53416004)(105586002)(36756003)(3846002)(6486002)(6116002)(8936002)(50226002)(81166006)(81156014)(25786009)(48376002)(478600001)(50986999)(2351001)(5003940100001)(2361001)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0158;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0158;23:BFa7MFUx850dIeR/MD2aFjRn0f6829u67bO//9vpZ?= =?us-ascii?Q?xtnBsKF71fxRFKr53w5rhAaT1YDdZhTDv04V54zRI9kJZjvle1Zm89Gsr8kW?= =?us-ascii?Q?QIWE93ME1+Bv8AF1xYu54IL9FnnJWjslu0/ZYIwNhDZRvunAbcqNzpzeyZnU?= =?us-ascii?Q?kRWb9uHQlQPR6KDL93zUkpdiYi1DKRvN0jnTSFSih30C6DENwkMzgnYlS+pU?= =?us-ascii?Q?NenJuj5D68MyWe6UKIQur88fBX56WypcoQjcWXSGJNoGfQIGBDhqch1pALfm?= =?us-ascii?Q?N6iD6vPtkaqhTgwY3oXIvcwATjVAV950xgFn82j5UORftoOaLqtMVcG6mIBS?= =?us-ascii?Q?h+NUgoz93UXosRI+dwNThv9E4iDtCaRiXOg07sbfNmQKjAOxxZCQvpLkKnT0?= =?us-ascii?Q?FqhPsvx1L/Ag7K6qMwzivkKX4U+VABTlZ8NtG7J39eZuv+733RETywOlTTN2?= =?us-ascii?Q?7Z3EbyQ+1eh3wNJUA7CiZgO49/haZZsm8HZP1btGdgsZbpfGdGfAqaq2zaEQ?= =?us-ascii?Q?2WRWfBVUT8Mow2IKlmcYyGJFdavQjheJHiBeXEdXx4JK72+W7wtRW9/C3NLl?= =?us-ascii?Q?780ZMEemMjcIlMpc98k9fiUcaiErS0YovvwjxwG0b4TnqQjzDWraQwl/A7Qm?= =?us-ascii?Q?qxZZHiSfidQ8djHQI2mAjzQUIptUl3d08orgPdYOtEHlpdN0DJ8YEiWzAlMb?= =?us-ascii?Q?8f4H8aBIVZDRS41CVjMSuZKQtPEepQ+lU4vdWCMZB98T1M7Nlrfm/PvrXHhu?= =?us-ascii?Q?LF+2YcAlYijqkjfmKG3zHPUMh4OvKJXt5Uo83K1zDkqQOGbrW4h80rqYrWWD?= =?us-ascii?Q?mMNxEo5754sLH35eJ2OA1tO9NPFDvXyfZ8W6g/QtJn6zouKNIr442LAnF02d?= =?us-ascii?Q?dzO26BpanVHSxspM9XtYyNdxX6tX7fFFmhgcKM9dLP+ymd7n40QRaEPtMEHQ?= =?us-ascii?Q?7543Mbx70+BlvwRF8+vnT6uhT/ZQsN2SlmPRqep99Mvmt8Jro8fAHRRZJYv/?= =?us-ascii?Q?1kMSZ/M0SAqeJyEIOcBIY0jl4BdHfms7tAXWYzeS8hqGbNfxYPzyVazYeOtd?= =?us-ascii?Q?jVgFJ/8q8aciaU7BqcOUFeAHFYrGu2zPWk83sNQKAvE+CSHd5k0J5pcBfavi?= =?us-ascii?Q?p4NMa+glrXDV+9n92vjQMs7DPPgGgAl?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;6:uk92uZOyeMnB24CRWAxbRSUGqSc1lg4v+HRFnCHvW+qsYl7YD7BbjHCvhbf12+beOlxIJIqw47WsxpeNJfP2hWBhIinw3C8J44TG6qLSy6G40FhGycJHN/4mYef0ZaNnWtDKleJJ7Qsd0bioWxW0ej8kdh4oOExKWdg2a+qCsIOgCSsCNBYnh1qC0MxH6gcF3nRS5GsCkfwBeXy4vevMstBdDY5Wnj8BPipVGVGS6ROzqhBzhfmTm8YiaADlwNTCqFJx2bNzTGatFMLZTR0K8MqsHbnY6uodqD46K5dMxcdBqwWB+mQcEpeFFhGmdRJo/Om+UclIfNr6pelXTtVg9g==;5:88MEMRnx7Zk3m9VGDHF7aipFRDPgFFRsMefGecSZdDNwuSZILqI/IdF1Pb/jCDM/yPT9auWrhXoXF73Z//7x/VEC6RF6UEP0E2vu7zvDsD4XGwfbf/HSwbCd+srue+Mt2cy8kPHiFOPqhA9eI9k0jg==;24:gzq/9KEc6ZXFQljSn7zG1P12FRAJa2iqifsQkeTESwCGY0Fg/l4Do/P5bAbNgc6vKkYbbB8hTWUq7o9fBqtPQTb9pXeGN5YQRaAUT7H8vcg=;7:PY7Q4oJNttdqT5/sW8V5EcD7H+f5kGzBNBN2+0TYcpst3f8CqFmt5cax3X7A7vqkW1sbGF9xjihiYjyBBm+eQ4vJtOCM99CIKFo2l0l+5H0ypKr57/LQW658IBf7BBFwf93m/OCau7bcS9H3sfqeUxX5+FumYO8us9bwOHdyi/tgzuXKK+nAIqOTR1nhXZNgxqfEJWTSEyMA6oyr5i3vbmGksY5e7bKRANavVCd80nQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;20:1K1D18POgMe3N5eOqUJRbLkEX5961mH1dYID8onY5mkfmNLaPJb+EmCKDh/y/pTST+O4tCnbmqyVmQXfuXsDmhbWDJ9CkL2ttYnCv4DkbACAlcTFntoGGENVSmhFU95mmgia/e+qPEzvS50B65G4qEKcTImcVKPIyJgnYiZhvqgVxDuuLpxVWEZXrvbaybp0ODY0g99Ob0LXbaSDNxNhnlutUBJhDFNLq2bVZ87hExszrQPxJIK+T9hLGga0Ncn4 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2017 15:34:45.1039 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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 Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Reviewed-by: Borislav Petkov --- 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); -- 2.9.5