From patchwork Fri Oct 20 02:34:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10018629 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 2EF1860234 for ; Fri, 20 Oct 2017 02:37:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 170F228E6A for ; Fri, 20 Oct 2017 02:37:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC6128E89; Fri, 20 Oct 2017 02:37:10 +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 8FF4928E6A for ; Fri, 20 Oct 2017 02:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752490AbdJTCg5 (ORCPT ); Thu, 19 Oct 2017 22:36:57 -0400 Received: from mail-bl2nam02on0071.outbound.protection.outlook.com ([104.47.38.71]:59884 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752339AbdJTCf6 (ORCPT ); Thu, 19 Oct 2017 22:35:58 -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=mPLx6sl0YY6Cjv93yHctsggIsfWgubvKvDT6Gkj0P6g=; b=fbMh5l1vaU02oCxNc9XHEEXzHZ8I0ua+EAg/U5H5JXtJpHcQP1PHlb8JaKvSHILycFeTxHq5I3/GxSGsfoXGW4M4RYCoPYIrsYU0fkujeZr2Xdg8lizuAnW/c3FUIm0/17bARuITqKW7hgclGsWozsgLdmIvxadRluYzVGzAB2o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from ubuntu-010236106000.amd.com (165.204.78.1) by SN1PR12MB0157.namprd12.prod.outlook.com (10.162.3.144) 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 02:35:45 +0000 From: Brijesh Singh To: kvm@vger.kernel.org Cc: bp@alien8.de, 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 , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [Part2 PATCH v6 36/38] KVM: SVM: Clear C-bit from the page fault address Date: Thu, 19 Oct 2017 21:34:11 -0500 Message-Id: <20171020023413.122280-37-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171020023413.122280-1-brijesh.singh@amd.com> References: <20171020023413.122280-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR1701CA0020.namprd17.prod.outlook.com (10.172.58.30) To SN1PR12MB0157.namprd12.prod.outlook.com (10.162.3.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd05287f-bd14-4f97-e91c-08d517634541 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR12MB0157; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0157; 3:QuyS9WB/K0mI/LEMl74LwTYKrcQT9alNdp+DN8jisgHRlg0ryi0Wnvjw0lvq06s6GjR7cksVRZ1Q41fZIjAZOz+G8a7dEK77vRnFFsPC9+hRW6fEqpEkTPn8B7Q3VoWnGsRW7fWwkQRHCzaecbYgJn6REoLqeYk1JhGG6PoHktQxRfxAxtRcTnGsijlMBBa3rrwX2nuQT4/oTJbdHRzq4cQsnfeU8AmBmH98kmaNWyDgk/+ZtsbqXGCl3j2PeM8O; 25:Wl3uHiLTuApy3zo3Xf/c8KHSAfxpMJK+tnWWo9JjT9kJVPBoKe+30/QaxmymHHBCU6zjIjR+j/jzxZNfrBIaK+P4jG5snBmLAIdpgRr0t0ILcrPjRudWXVEHIxrJFZ7Hyk+N8YXsApVOLhSK7Ou4/DBTYwNXRRY9YS+TV1yT6Bjo8f88ap4RXxMcMu6D3Iesbe1EwT5bv2Zy4Q4JLhnk8iIFuOu0yNjrJRRgUoeXFFTRRibtZWj3BHRf05MsA9q6qFtfmmimuewfPt3b7Mg6SRNBGONHQP8h7SYveOk54Wy1L8AjM1wKCKxk4UyHy2uVcdtZJAY3FVkCHsL0oh2xwQ==; 31:aZjOPSoKfdtUYQvYmlbCgvwaQPIvozc3ox3cHozmNUr+zvg8ywR/UOAPjW4N1p12mo+KRdpZsPYdrf+4zIOvz4GsVAiuq1gIcWdKNCwdc5jSx+XL2SDpYGX4OpbNLWY1pRBeoLTT8q7MVaBjfEWhb+NKsEsbmA4Egy8+3PzZkrsqlEovlC8cEcYPGSni4X1U+CBpwZ6QdZR6l4COfoAmbRXKHF6J887vMvilSDZ7q6s= X-MS-TrafficTypeDiagnostic: SN1PR12MB0157: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0157; 20:fCfuWLZ/Mx4dznAEcgheEQAAw8fmIjcaOOF+rAv6r0g+oZwVizHmu5K5Bcmtd/cAsDOdh3/iazIwlgF+/0WizNRvUYAwxMUA8e4VZVd4K5HlPfBqe3To/zW2OU0JpECmta5KCwkUR3W1VYgrzuhfYFIucFsVuWH+4rQtvtYinHVC7YWLmORH4WmNmqCLskb1dLDnw5AZO2gzGZEUvG7lc7i9kbfjy39ykbPSQqOuUyilAbdrRwh6NtF1Cf8FqLCgsV8NHnZHpyPxzRvZrpu9IkCJz+3M1kkuAe9GWncEfNeilxieA4YIcQyg3vE8u/8trZEZWKK7LQ4OhrsvpLqHaZ4H9v4kSaaxBxsNENp/DCn7z26uhFl0U1kEXmr4ABr65Waf8HcJHoREjQlKVXsv9Q2z7JfBburBu4RobmTpZdpRINsgTcWtEow1wReUbVsLJqJeuFx57PjZE/jxswIECD6bdqEsh7PkW2RqJSQ7i/1VU59v9EkhR6FqumAdf8PV; 4:HSIEpJN8DCqxXVYKR/RT8XP0BdydMTBcne6ZWDs4Rew0T8Ejod9YyxR9NIyNJd2KklO5x7dZguPzKLF5e5ZhB074uzUomM7j4R0KXFaVbPWQLZJYWYzbqq2a5TFMaJbyTClqo0THrnHAFXUkyIaT6+18mTWJyNj/2a4wyhvIu67C3M7w3oGtr3laQyO4/bEb+dA8nxtR6LL7iviUKa9L1hsJADkyMCpw4Ej0R5Y2+oJcyF1J76ekxMF9Ln5G8/GBB1oOdFuLTWGz7dmaQZB+tHqxwXDwzjx8H5tk5e6/cv7Lhqojg7yF522LyMsrA+US 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)(3231020)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123555025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR12MB0157; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR12MB0157; X-Forefront-PRVS: 0466CA5A45 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(36756003)(7736002)(68736007)(50466002)(1076002)(478600001)(4326008)(16526018)(316002)(53936002)(6486002)(86362001)(305945005)(53416004)(54906003)(50226002)(2351001)(106356001)(101416001)(81166006)(105586002)(8676002)(2361001)(76176999)(2870700001)(2906002)(50986999)(6916009)(23676002)(66066001)(47776003)(6666003)(97736004)(6116002)(2950100002)(189998001)(8936002)(3846002)(33646002)(81156014)(7416002)(5660300001)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0157; 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) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwMTU3OzIzOjBSUmRTMmFqMFpvWmdQbDJBeE13U00ramFX?= =?utf-8?B?aTBkbGZESVh6cTNKb0xFM1JkamF4ZHRLcU0yZzltdHZIdWZvcWphUTY2Zmtk?= =?utf-8?B?aHhNMjl1dDFGY0psanV0NjdpRkNlSEszdzIzME9BQUNGRk1vNFNzbkZDTmZx?= =?utf-8?B?Q0dxVW1QZGxMbXVTZ1JmTVdWaFc5cXZkeDNsSXlFZ0VqcVRueVJHVVR4SzI3?= =?utf-8?B?Z2ZCeS9oU3hQNXBCZUpGaExuT1NlcHJCSklZYXp6ZytGZ0luaU5wRFBrOEZq?= =?utf-8?B?KzRVTFZDSU9Ib3JoTW9sRXgzYmZvZ2hxK1VCUlRXS2RjSmVYZFA2M2lsbGwr?= =?utf-8?B?Tm1SY2t4NGVOZWwrdmVNVVpUVUY0SXA0Z0dyY3d4TC9lYXRBMGc4aDBJN21T?= =?utf-8?B?ZWxjaG5WckpYcDlwOVNIaXdCb2NGdngzNG8vaVlXQ2tTOGNSNkZpRm0xQ2Vw?= =?utf-8?B?YTM4NHBKSHhVQ2J5NzZreWJJU2wyWFkvenNDNnh5blYxQWRtNzdxQk1zNGNr?= =?utf-8?B?bWZnNStLR2NGOFBIUWFrMFJ1MEpyaGNzNmlUenRMVmtNZzJMYnFOczkrODZN?= =?utf-8?B?cUpBY1hiQ2JIRFNTYitWQ01KQnNPM2s3WHVrSUdUL3doTEl3UEZVTG5VQ3Vp?= =?utf-8?B?YWF4ZlJ4N1cxM3p3bWxTK1hITGRlWGkxTys0aEZvMzVLSUY2dHRxSmd4Ukxj?= =?utf-8?B?VWRhZ2hKVXl4YmR3aUxyclVyU1Q5d1o0cDZkdnR1d3l3U2hEQ1JHMmRqS1dE?= =?utf-8?B?d0UrMmszVTJpZEViNDMxSExyT1Z6aFMzR0pNbjRueVhjM2RZSFNkY01uY2RZ?= =?utf-8?B?T21RNVBNZXZiODJYOWR5TnVHMi9oM2t1ZTU5UjlrTFlnMURIRE9JV2VyVDdV?= =?utf-8?B?d2pEM1dycCtQQjZhT3daZlhjYVZaVkFncHU3enVmZzlzR1NFVk95RmJiL05Y?= =?utf-8?B?NVcyZXR6TVA0L2diclFwaHRXU1M5U3RlMm1zYUdYSzVSRTZhbFltQUdaRVRv?= =?utf-8?B?QWVMaXhNWHVia1RuZEJjUTVuZkExdjJtKzBnS0dJNDRxZGdJUm9zUVV5dUZL?= =?utf-8?B?anRJTUdTSVBCMjNxUE5HWlg2QkJxWGNUSTZhREpJbFFWekhwQmtsU2FIVkRx?= =?utf-8?B?eFdqRE1EenVrRGM0UHBTOUczWnZrd3E3MU1IRHN1dTFIZktqeTRkWVg5bnRU?= =?utf-8?B?eC9CYnRWRjk4aVUweUo1S2pIRWhJTHVDb0dORno5TjJhYVdXWmM2eGhqREQv?= =?utf-8?B?d3ZlZ0lGMk9DTW1wWThQNURXZXRxNlBCNDY3NlpMRWN1bEIrYnB6TUN4UWZQ?= =?utf-8?B?QWdUdVpOQjlZeUNtMnIyTHIyc2UycEp0a1BiRmtXR05BVnJPUVdGek9CUU9r?= =?utf-8?B?aWdlaHpmTnRabHVkSnZycDUzcHIxWWV3c0dnS0RlSVR3TjNJdUM2ZUlWK3VF?= =?utf-8?B?UHlwOHRYaHpHbzdNdVhEZVJXWUlEWHF6SmlabXR5Mm44ckdNb1lzL3k1bHRw?= =?utf-8?Q?fCYB0XT19zjHgnRDQH/f//POgGehjJ5bSS76cRbd8q56kI?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0157; 6:SU99yvMJqetBQ5ht3omh8tAWsP/7we6Lnnc/SmGNc+zR4Zzj51CsG13Ek1vrrpAW62HooywGX+yEq7Hqch8Tm1atSAaNrLeey7m+w4s1jQgDPmcQl+O/RJ1ND69hH40L6fqVEgKKqU5lDmZEEM4ACGGT3hMcRM95DsF4aIa+Eta4mBMxpJDT0y6adOn8yLEMN+hRku2AbHePKcLAz++ZgYDaQHUhTqa6pexRO2QKWTnf8DBIsaQMGZpnOOqGFocgSnpoUIF9t5sGBlCZ/n187/Kz1qNxPEk3p3kmiU0VDWfyePBvP3DxmJ0xvHGhYf/42/Bs8o0qdf3p0maHx+W8KQ==; 5:h7wrDktWiVlhBK3RuE/2xeyDGdQJ2D+gfDxKMyI91lJkIpNAo31BEss1OY1idMPgl8yq0HfKeswBSghjYbVOIoFxU3HdTFxk3yYLqK1Kti14PkllT+Met1DEK9eyW245S18lKAvPBPooM/rHhZzYhA==; 24:UDmduKX2pGlc9NvpxIGlxDi1fEgCvr5QZmNeQKF8mdkwsQeEY34pLxJFcR9sTz7Xpe1NIjaDUnWecW4SRQ/L3myeB71TvJjESu5gDwcOhoU=; 7:TlXrdux9laizYrqDuxXae2CAoY29U2orjfsUg8v6biw+sjkEiESPSn+9l2tYMu0fAZIaYuDjrj0CNW49tVfC10NpJDLKjbL3T5rta1vOSUDFcmTnnHpuO0CgXun6Xb1KSO8kRlUcQuASYmGLIQjS8jij3MUtDyzzAviGh8oQ/RvsquMUvRrdvSAt2SWKV3mwfieX+k9B9vUw0ynwQpy8LVZyZvfKxMsx3OidSMXRiZQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0157; 20:Apj+IEsocMGf9ZVUvIzJ21LeRoHYyQfI/csHyDHmkFBiZs6xiwOLx3RSrCpvwiS9nqSMUgo7KUmEWEUh5qzgvEXUx7LzfA8VIQXVfreJBc/jrocedw7z5UhTERrA9U2TT5hD+MCyt7mdeHb94IvnF3KQQCtMvCQRxSDKyyuAentJ5TwU4pBZdUq9DXNyLmCQK/iQp9uMh4KKmhhqHwcQFI3EZTt6gAqQB8raepV8UJlBmw70MsarFAc3DG8zQuFC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 02:35:45.6910 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dd05287f-bd14-4f97-e91c-08d517634541 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0157 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 af218e11f23d..e1eaaf2fbe80 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2403,7 +2403,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,