From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752532AbdJDNPo (ORCPT ); Wed, 4 Oct 2017 09:15:44 -0400 Received: from mail-cys01nam02on0059.outbound.protection.outlook.com ([104.47.37.59]:3808 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752494AbdJDNPj (ORCPT ); Wed, 4 Oct 2017 09:15:39 -0400 From: Brijesh Singh To: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Brijesh Singh , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Borislav Petkov , Tom Lendacky Subject: [Part2 PATCH v5 29/31] KVM: SVM: Clear C-bit from the page fault address Date: Wed, 4 Oct 2017 08:14:10 -0500 Message-Id: <20171004131412.13038-30-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171004131412.13038-1-brijesh.singh@amd.com> References: <20171004131412.13038-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR2201CA0056.namprd22.prod.outlook.com (10.172.59.30) To SN1PR12MB0160.namprd12.prod.outlook.com (10.162.3.147) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b923059-2c7d-4d83-ab9e-08d50b29fef9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR12MB0160; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;3:p6olfP0KYaBumQoIadrXcNMz+ODuVl5yZDNa4vwJFC9F3FfS4r999VZ9Hc5axLJwAjkzTe+Ol8u88w+JpFPBGZ1niaKV/NOJhqWhNs9zR/JCE6qi18UIyQUSV1sGTgJlV6XL9b5aNEXUHtSpg5mfc3SWlcn62ahew+/7XMU+T3eb3vMjWK9Wig34Ew8Kc5yczcOzw5rn/nROT2UCd2AycSpZN1T1nZlU2MhCZGNVJ2HJKqfuZP6brZDMyxtymFYP;25:zXU0Uig98JkVSkdJEsZYMgU680kBJbsLBvVDkBSDL9E/V+hnj/5mnyzs3cgl615iIvAgB4bWxSYDKuAFSRbs3QUmIYiSjHFoQ0CMe4MROJN2S60KAahYcf4NTqCIg3qvs6Tgsw23OhMQQ8Hr2I009yBie3WzZaLv7qWJie2Qs3DStsYRJzj8LwdAEYnqCcQd2k+6dEiS7EL4tSTYvRAErMJOEdPmP/QPmaClE2nJ7SiqxnpumZBAJhMetqrHfh39hCOZIJGNSyXJI/lppIiCrHyJnN7Fb4BPKEaesuQdJqlpR2BqBrfgjnui+s0Gvfn6rVLu1CKz5n7x6G9I1XBrsw==;31:J3zbPfMKdS6C5xCT7btKaYYgHEhbhvATqzsQBGlyWPIasNj9oQ1wpHM8mgS5JzwOBPyl//XD4wx/DSJm1UjOu5FwiKe6xow8sFFoSuCO2lWgPbdbFIL3OGnWvZW1g8BylMRL4OWOF3BAMJ3fnsKJKBJdMCJmBb2tLp6I/raNafh67MyGe+stoFlwJgFIo3zwjd1f/v2cFHQLqHOkzqaqNDxicPDuBU/qZmoZi56SLjw= X-MS-TrafficTypeDiagnostic: SN1PR12MB0160: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:oYTJnYtnSa9KV1607BKz/BlawjoKQ/5AxmFye8dddX6U6UJgc6wUOLgBGyoEmzHa1XShqn9B/3cSBNzLUJlhAkH1ZjWWDrO8DAwedJGmPAkNNAeZAMMJ6ajLdgX9xzQMZ/T7UUWKGfKrCBJo7M1vqQuCfEQ5trsfJkF7ljZMahYSfrP91muX4L9jyFAV+sN4b8yTixaDGt5wXBQuD5eqN/ULQzpis6dBQHq04ZgLq7n2OdPBKAcJZWHYDLKhe4JFIkI12tL4F7gc/mEAKjXDQra78TJOtRTwujO+Y2seIohtAEPBj7aBiBekC4r1lPH6gpZY/fxwkvu2lr/760pgiCJ4tvgkP985mvrUUx5l4LlvIqgjmCCb5WWwGsCd/ubr8GuLflaD3xMH+WNppKxAlDAQGmvfIRGRTXHtXtR4EMUiZfY35rC76vgECy5ImGDLujjEFOtzh/d+hDq+ijdbhzoRWtLfjc5Ec06pkCXWfN2Acr39U/hu1OGZMlr/WBuj;4:pYUQIVWA2WcgYuek2HWNLFHX+esC7lKDGlB6X95cnLhMuies0KIU40VGBMqDOzev4OdZJUOHg5HUzup325jDwcXVDd+NF3Sivaz5HNk/FMPq0UMLunzakEjYq9YX63uvsRscX/1hUQAu+XpMFzsh4Pht/eiTrmB3mfh3v1nNi+fFfUF36lNQhhrMu/Q8U9ijeipE/ugVB8JKCV4T6Q4PmANeBX3tc/CZvWUVkKJg4kn9F400bo6od9W+jGhJjoPsVpOB/FoDV0oNjk0loTA2TW2xQv7OiVYvJ49aFd81xelzeH4h03RSoSTvM96mUDUP X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(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)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123555025)(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: 0450A714CB X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(189002)(97736004)(86362001)(23676002)(76176999)(53936002)(50986999)(1076002)(6116002)(3846002)(478600001)(36756003)(47776003)(101416001)(33646002)(6486002)(66066001)(189998001)(68736007)(105586002)(53416004)(50466002)(4326008)(54906003)(8936002)(305945005)(6666003)(2870700001)(81166006)(5660300001)(81156014)(25786009)(2906002)(8676002)(7736002)(2950100002)(7416002)(50226002)(106356001)(316002)(16526018);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0160;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwMTYwOzIzOjY1d3p5RnJtVFpkSzRKR0V6Q2QrQ1dMUk1p?= =?utf-8?B?NzlGd09GbmhDeWRNZDdqWU5xczdFNHZxUjFrVVM4ZTRVWjNFWllncWhWalNZ?= =?utf-8?B?U2ppbDVWUXo4NVRqZ2k0RUhUbVlISlE4aVUydVdDWWJKZENkdEdqcUFCdkhj?= =?utf-8?B?MmJYQlB5RVBxU05hK2FmLzhrVlh2REVjMitNeWhCU3ZYZDg3K2lzRUpEQVJm?= =?utf-8?B?eHhkK1RNWEErZitjMUZaUkN2WE5DMitRSUY0QXV5akcrbWVscnhtOTRTekp1?= =?utf-8?B?RlI3Y3hES2krSlRYQmRrVjBtdTRlTklzSFE0d1Y5dmlKaEFOUTIzT0J1VXd1?= =?utf-8?B?dDhuVWZQTjVJSHBOako0eG5kaUUwRmFQWS8rUkFWdUVFbG5GS1ZLMDVqckp3?= =?utf-8?B?aXZ2UDltSVB0dnQyTFpLTU1VV2NmelJuSGhVcllKUjJZcmxVMnFhU0x6RVZJ?= =?utf-8?B?V1dUSlAwRVBSeWVPamNvRDBSTzRMSlNsOVlWd1YzdkRuR0taVmwzenNCVnZk?= =?utf-8?B?a3VPK1RIQU1GNEdRQ09sdWM1M3FDZE9CZWN4eGhNSzdRRVRsRXZhUTl0OFQz?= =?utf-8?B?aVM2MVYzTWJJd3FpYVhWRnJsVnN1SGdYMzBXUHlFdmJpb0RwMTFJcmZkek1s?= =?utf-8?B?cHNyamRuU1JKZHhOVytxYUFjU1dVd0tSS1JHYjJPWG82b29oUXBTb2g1K1R0?= =?utf-8?B?bDQweG9PMERTT0JZYlV4S1cwa0U2TVRSNVhMbjhJeWpLam5sYTU5bC9qVjdL?= =?utf-8?B?UGQvRWdSNXd0ZmwvK1U0MTNVWWp6b2hYeTBWZ2pScnhNUi9ZbWFqZWdmL1RF?= =?utf-8?B?dVhiUnk0WkUyTGhMbG5MenF2RWhPZkdXeHdMaHVWUC8yaUlVN3JvbHdqM21p?= =?utf-8?B?L1hRdDIyYlBhcFJHMFZibFI4SzI5dHRxR01JcjVqRDVrdjd2dHk2YjZ0MStJ?= =?utf-8?B?SHh2Q1dqSVpadWVPY0dMdENHSHZjeFNHTDRrU281aGY2VEFpd2lra1F4Z1Ux?= =?utf-8?B?R2xCNGc0M2daQTk0NkVrcXFjVTlxL0d0OTdoTjIzMjBvUEZTQ1ZBcTU5TnJi?= =?utf-8?B?K05iTTFXMi9qNWtqMVJ3OC9FaVRqcUFxaGNqaDVPTSs5VUIrdnFBUGRBSVpV?= =?utf-8?B?cEJhMEs0a0xESmhvZmpmZjBDcW5xdlErUHNLVFp2N3Qxd0hGc1BMOHh4Zm9H?= =?utf-8?B?eW1QTE5KNDU0dTA4WEhIUUJuczYwWTM3aDZrUGJoYlpTS0pvOWY4RG1WZzZK?= =?utf-8?B?dlNWRmEvSUl3VEIyV2V2azJmMmgxUll3SjZXUTVuajJuYmFpQzdvWHA2M1or?= =?utf-8?B?RmM5djhRemoxdmtpa01yK1hXTnk2bjI4TmdJTFJ2TzVxcjNWNVR1MDFvc3do?= =?utf-8?B?dlVnOFE2cWdiK3Q1RWYrRXhUYndUOU9RNFFldHFRaThWcHdPMU5CdFVjRFJa?= =?utf-8?Q?mhSKQuLih79tFlYXO/sHPPj1hby?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;6:yY+7X2kDdslozVpHScL1noT0gk83HTYWi7H2mpiG6KcaxII2yfDfmEFLfqb7ttJisPrmhvjyT7VU/7v23FUGSXWGyYoKo7RE5rC4w4UQJSqPbj4kjYNDyJ2V+cVbwC+Au1fqdP8dayO/AchjpONmI4ixn3wHFTdHal/ONiE1x2T/29C8In7wYjDT9re6ZjN5CqFDgOAy6IbNEHI9RnK8SmlhgkE5zWsP7vO76zVZ5i0S/1x26NolRHJoRjQwZk+jrQYhjc9SW5bI8QKYH/FB1j7l9KukQaNnR6Crde0KJhCwmLfqvdNYPK4XA5zvJwww/GX2qErupnFYyW7FETyaaA==;5:JJV8E0H5wp/+XFMXJnUPLJVyL8n9ILHZDMRpsjVRoByw+0gtjejGEumpXDpT66py5m5euaoAvXas1I0cgyNx23xZhf+aM81O6UnUzhGq89seAsrhzpdX5wymed5/eCwKoJ2jQlBVfBHMLmT9EIqhtA==;24:JLCTdv30I9cRnueViIIuwfRFpaE87lgoj47SkE0Di6ZDeZzn0aZE9jVOzDEJaytnWSLTrM3MinyfWhUwAVfsWSrIJmRupSYah3DLFiflMck=;7:ExlkwVinUMQ4Q0BcYQHGt4Aq3FOHbdLXBXw/TZvpAahm2gS7iqWtVcZ4ubIOIyOfl1eyARpGOe7ZnEluFb53As5omZVmMS6Q8anyL5t92y/6pIBCU2VRYKI/FUwXFK364FI/IJk4llHKF0vA0TddrrUtlnY6pjfSyu2HvXo/5CjNLOiSKVSAIQKAn0hLCxleMDWKKN0xaVS8+CWIJ3OkdomNT4oYMdLaOROeEYyw5mU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:nJCqMV6kEp9WgTqpQ74O6o4N/PWT0aXaReLz6FYGjMA4rp+tp2VP2mlglki27cBQX1y2TPpDMOHuN/U64TQSrHuADA0LMeVhTlC5ZJYn/FmCa1nUN0SzVf15xs34eEdAADHaUbkOqWwUpgKiY2kLfDKdwfjEQHAgXaO1xU4gfdbVPHycKhHJ/ElUu3aGORN5JX09sXOW25n04UkMx1MHCXHYWOArqN+TF79qAO0xk8JvOov9E5tTKbYpBYRwXCDc X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 13:15:32.6352 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0160 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When SEV is active, on #NPF the page fault address will contain the C-bit. We must clear the C-bit before handling the fault. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: "Radim Krčmář" Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Borislav Petkov Signed-off-by: Brijesh Singh --- arch/x86/kvm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 5c2f5b15886c..a47981714433 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2439,7 +2439,7 @@ static void svm_set_dr7(struct kvm_vcpu *vcpu, unsigned long value) static int pf_interception(struct vcpu_svm *svm) { - u64 fault_address = svm->vmcb->control.exit_info_2; + u64 fault_address = __sme_clr(svm->vmcb->control.exit_info_2); u64 error_code = svm->vmcb->control.exit_info_1; return kvm_handle_page_fault(&svm->vcpu, error_code, fault_address, -- 2.9.5