From patchwork Wed Nov 1 21:17:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10037205 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 CBB1F603B5 for ; Wed, 1 Nov 2017 21:19:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5A5428C1D for ; Wed, 1 Nov 2017 21:19:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3BBB1FF87; Wed, 1 Nov 2017 21:19:52 +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 46AF628623 for ; Wed, 1 Nov 2017 21:19:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933596AbdKAVTW (ORCPT ); Wed, 1 Nov 2017 17:19:22 -0400 Received: from mail-by2nam01on0041.outbound.protection.outlook.com ([104.47.34.41]:43936 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933419AbdKAVRt (ORCPT ); Wed, 1 Nov 2017 17:17:49 -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=FSv+YGYdHNQ8myQwG78TTYeU/kpXeT0lD6fHVfgHVwU=; b=oVjm/ryQby/t77wRu/JK71qe9rI1BpaK/6W7biWo7RkgWVad+eoY8Bp/WRIPifS5z1zFnky0mls9USgIHKF3Fw+cGVK+k3KUg+4LMokeBrblb/rjNy3KQum773m2jzlLBmtc7Sb7kQ/uuFmePSSmRxQ2lFBFQ25etp86nIBlqZ0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by BY2PR12MB0145.namprd12.prod.outlook.com (10.162.82.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.178.6; Wed, 1 Nov 2017 21:17:46 +0000 From: Brijesh Singh To: kvm@vger.kernel.org, linux-kernel@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 Subject: [Part2 PATCH v7 36/38] KVM: SVM: Clear C-bit from the page fault address Date: Wed, 1 Nov 2017 16:17:21 -0500 Message-Id: <20171101211723.71594-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171101211723.71594-1-brijesh.singh@amd.com> References: <20171101211723.71594-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: CY4PR02CA0025.namprd02.prod.outlook.com (10.175.57.139) To BY2PR12MB0145.namprd12.prod.outlook.com (10.162.82.18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cac363b3-1375-4f83-37f6-08d5216dffee X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(4534020)(4602075)(2017052603199); SRVR:BY2PR12MB0145; X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 3:5c+6lesL37AzQ3xkn8GnfEX9jCZAgLFlE9P9wfE1Kr83PMRPsKtq4kWYdXdHzod7HIeL6AO5z1VrZ6oNT6f4XzO3GHl0C8BnH2F5lYHyuDvSiTP5j8+SnSIeteZLcsoa3p0gsXquFM1C2s6NlxLxM2xs2O1VyjnICbZSodVmtJs7ORmwmn+eLr9UjXRgLdJ2/XSvq+1wl9u4PuTihppqnYmZ8TJuO+wLbSrsqF50iimI46N8wFvQG39STlqqsSyF; 25:2j+a5oN/PDwUUXpvL4DMSnJ4bmLcSwZEninPlxaxXrev1tNf8aTAuypBasyPsns7XKdwcW975wUBabqdt/l/IUKyU6sV88hvMvcZGgOO9FIVo6EEFUB7Dw3QxHqoX1MpvsgLnIrE8JHAQW69bWCiAd20zhcm9c5/sXgPulyEQ8h7tvB5Hn0c+CVSeZcH7B9honZNTiIYOiu4HUSRNTLU2WHQnye6oHiRzgkGjcObM7OyNDbFy/3PYSjgwk4tqwpSBNBfWDHv0hUl8igxTYJNtdIE0C9jgiw7Iyov5/Pqw0QGUUiPBJ+eTYWg2AQ4QBUtCATM8+R3vtSgp+EsDmQLeQ==; 31:n6SB4E60VxH7gkhsaEPgxbUJCa2aNt9eJvHbXVLIgMfhTK66/5ZTheGqxTf0XVl/GJ/k2KthU+Salrn3vVjQ85XY/dM4eFxnkYaO9trUjMWmL+mzDOapTiajzq5tGvFUr8CMN3PXJtebCUel5ftXAMWdaE8Dpn88j5xVdYh5wGrkACQXseLIlhKyXeJ2WoepdHexG4cCjedQ34PqQvEuvl1OAMy8NtyvSt6J9pdaWRw= X-MS-TrafficTypeDiagnostic: BY2PR12MB0145: X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 20:z9Yh8V0YtbM/csgTr0EMpti3hPl/7rS85Kct94f9qRKe9olMX9Mfas21T1abu4OWqCYz0rHW++XokxJ81SEXiU/NJc7dNUdCb3ELriWQgTenTCCn1/fRM2Kx8xS5xWlzGYt75JRham6v0YXaq3XPK5qfFpCwLZrwsp/mBsbbz7AbDdinuQohk3Pd/1BY5Vd13ieMuX6Nt19BlXHBpuvlKPGvK4ipK9h5o0fCsTiUBY0lRKjF5Bp5vo38Qeai7V/r2we40cWzTTYZ9vH/m28d1fQ6dhtp1hfUzwUced6CK/BGZT75WvfdNWPm6etmU5uYHuBACs8yhSno03A+wPUD9STkmxzuWDVfCKw1zFsolsfm2MdXJxrK2gJEv0D5N9lifqN4wL2ZJtyRANmh3HHjCTzR4VFOZ8edAXLu+2MH8yqKL94LlK5vmYkzfr6kx5rYQcg4QeG/aeCUQ6HqsGVqUAAOpUk2+m97aG23X/k9i9pO+F4z0dWq1IJtGU0zI3Ud; 4:vc02XzehSM3H5JNA7wT9Fn9YILtd1/O0KUofL2+8EXCR8qY6XIau1pM0q/hosGtgorX9Zv7xENmwCUpPIitQ69nJlabaSZc+E9xlPkCSqOozXiCyNCDXq/uPyNf9u1VRvq41nWBUZkNKikJk+RI1kGmDox02fyB3zeidzFNEnynCQq0NBBfy8HB4XrPjafHlK4GKtotKLRSbr6VnI7EfQuU3iggLm+UpUnHVgydzCHNJoo5ZH0MP+PjC/KyOSS46iFrdPDmQdgxMb/YYypLifmE5Kokisdz7OjDlHGtVJ/FvaScG8B3afkseWmq2/LrWcvFsjC0xtZVaskQXZsXg4A== 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(3231020)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR12MB0145; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR12MB0145; X-Forefront-PRVS: 0478C23FE0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(189002)(23676003)(25786009)(2950100002)(4326008)(36756003)(8936002)(81156014)(81166006)(8676002)(33646002)(2906002)(68736007)(2870700001)(6116002)(575784001)(86362001)(3846002)(54906003)(97736004)(1076002)(53936002)(50226002)(316002)(47776003)(50986999)(53416004)(66066001)(76176999)(50466002)(478600001)(101416001)(6486002)(105586002)(5660300001)(6666003)(189998001)(106356001)(7416002)(7736002)(305945005)(16526018); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR12MB0145; H:wsp141597wss.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?MTtCWTJQUjEyTUIwMTQ1OzIzOmtreExyQ1NlTjRlejF4Z0ZZcmthS01lOWVF?= =?utf-8?B?bG1OMzJmQ0VrSHJXQTNqZHpRRjdHR2xCYjV4WWNWUTJIcStjbFFMajg4anZO?= =?utf-8?B?ZHNpRmZuVzRvV2lFc05wcitadEFSNHBIazBOR29JSDdqVFF4NG5wSFY2SjNB?= =?utf-8?B?UkRwa3UyZDBlM2ZYYWJwdXNlWEliUDNDRFlZdThURFo4OUsrbGhHWnFnRjJL?= =?utf-8?B?S2ZqNzJVTEhoTWhCSmdkVklZUkhXVndabWw1VzVzZ0hOM1JOVmhsY0RBeEpJ?= =?utf-8?B?SlZibEVNd3g2VnErbjMrZWJGRmNuNTU5ZDlYRHg1TXFkSUdkUHA2dzdVQkM2?= =?utf-8?B?RzNKTzYvL0lyZkduZXB6Ykt0R1BWaUI2YkZyNzBXYWUxeUJCUThDREkvdi8r?= =?utf-8?B?Q2RXK1d2UEVFamFHektFRDM0am5Fd094aXBqTTR4ODFXNktrTE81QzNQY2dn?= =?utf-8?B?UW5ZVGxPeUVLSE9zK01UWVFHR3EvajdrdFJFVHZ5cFNGdjVnYlRZa0RDZDM5?= =?utf-8?B?aFlJWFdpSXNCanZUVDZ5WU9yemthRU5KRWtpVmMyUnVxWUVQS0d1TWc1bDZ1?= =?utf-8?B?cllDWjhsT21TUTM3YURCWnplTGdSSHlyY0F2U1lmUWtLVU9FT0ZpUGR5T3hF?= =?utf-8?B?TlFmQTVVYVpVaStTc05uMkF5UjFGK2FGdWF4MDRIdGp0Z2RvTG1tUDRvNm44?= =?utf-8?B?L1hRb2RPalV4QStHaDF6V3ZVZUNST002UTAzNDlIREw2ZFRQQjF6ZHo5MG8x?= =?utf-8?B?ZnE2eWpiNndnUVRzT21tMitkcStBZ2dQcmF5cTZiM3dwNG9US04weTFZTmsy?= =?utf-8?B?RnRTeXJReUNLNGpmRkJ1QkZPcUhyRWM4b0JlMERVYVlTZnZuV1diaW85MUx5?= =?utf-8?B?RWNsNFdGR05TbVVObW1naWxBUlNtMTR3WmJYQTdScS9LQkZkUzhoaVZQNURy?= =?utf-8?B?d3ZRMXJ3ZEhuUUx1bmNXZGlGc2pkTFQ0bnJMWXRIbjRDZlVaRDVtWGZnUkt1?= =?utf-8?B?V3lSeXZlUWZQV1YxMTF4NGNUZ0FIelVTcVI3UkpmaDFNK0ZWQXg1bEdoamZC?= =?utf-8?B?UGpORzNHMklmYm5GaS93N1lVSHJhSTE1K3AzU0NUOFk5NWRIbGNSNjZ5NFp6?= =?utf-8?B?SzZINVZRWXVaWWtqRHBuZTNnaCtlNVVvc29haFFhR0l5ZTRkSm1HMi9NZkNC?= =?utf-8?B?K1hnSWt5cTgycHY5ZUdvWGQ2MjNNQjluVENyQTBqK1phU29zY3piVTdBaUdY?= =?utf-8?B?ZmpxK0RBUGU2V1g4OEdqOTdaNDVSVVJRMEFyejJiV0dJZndJVXEyNy9OK2xP?= =?utf-8?B?eFV6VlZLazhpTmhidy95bFdIWVhqRFNnaHA5cGFBd2x4QzJEdHNia1R3Mk5u?= =?utf-8?B?ajh5V1M2MTJINmZUV3lZUlNEVW5zcGhkNU13THlmazlrMFBIbUNZZWhFaFBK?= =?utf-8?B?dHhWc0NBRzEyU0E5aVp6bHV0WkJGZUxrZEVRYmRHZy8xRlhwZy9MSllVOUtD?= =?utf-8?Q?FspBBFdyQ/4lyqmgUjVqPrpuU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 6:iY5qo++BUnKMvDHuf/IbpREFdTy1cjmaJzGPjbWwS70XPS2TNW0VT2LoUQ7WEQvlA2n1PBym8rXaSOpOjYk6p1KFzkKidfAUOvXj3RKzJ819j875Q6tIcBx5J64s/7TGCHSHzzk17WlkJp9LEUb/o99h6L1BWrGA3vteJoqOUvcdfyEYRAuEZjO2Z6wAciypTvEYGPpP2OkgzBmdgR+/spsycMHAcJrasJRXcPOmQ4IjuzCgnfGHR3zyZAM37KA+guEsrz3K3Q06OcFsCVFg3VDm5dN5rcrbAuF1w5h1e3AX7pf99si66qMm2WDSniTUoWyW4GARw062XDKozUlYLZRgQhG//XLQFBsaOqZqRGs=; 5:riAvIZnHyuKjvhSfDGahbgx5Lez1ca3+80Bo8iABgjwlbOa6CQ+rPX9p6X7T1IMaoXwe1lvD/lJL0djaYpzV7lYz24Py5F9e+MJWwbxGXnhyQo2tCJOilE64wBLg5oOjLQWiZREE9bEammzReHKxNsh7h6XtUvIoPgRbBpQK+7o=; 24:/EccQ3/vbhL+RJr/Fe5V+9f1iaOBPGHGXuy74f8HkH/Gd9VaqPHCvL22C3E/wmmtHqGt+6vNdvUmoMwQDdTc1Ss8KMNaBZCkn2uBzw7RXUE=; 7:CMV3PkqoOAK5ma61v49QwfrqvlBE9aWfOuc2sxZtEwIpZsoUwfn2eqYKDVxZtnlFYrfMZPzp1hm/3ASEkBQNx7fQY6+jpgl2bqbyeJU7i/mfdauEpoc+OOQbomcIQthKGSvi5cfuSpqjaHllBAvuNJRQuFnA0LIgS0yoQREK4DPq60S/i++z2zAclLSsBm2QgLbDqaTUr1hLBeltXgaO/sdjyJaikahYnuMsNIVbLyzUHs0L/NcDGF0UtFrgN10s SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0145; 20:GNtyoZXABNoURgrgky+I8/PXnwf+uc+asD70ccWCR79QcBVWUUiOTxEzWMq5zZohyBhoTKYDKznPEhDlbJEDbowxq4mbK0gktFUEaD5pRLeUIYIUJY3DnQME5P42FGig6mCogCrdzZhWx4Hs3xbZaZbtDnNabVL+fK3pLbTFyJEgoFvEOFep04pjWBgoNBA2zo4Mn5YzLXNmWJv6t/EZbYgVoTtWuDy+WYrhMwc1u77EbqIay+2WQiUxejmIxVSQ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2017 21:17:46.1590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cac363b3-1375-4f83-37f6-08d5216dffee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0145 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 6df96d4c164f..a0e5e22bb661 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2404,7 +2404,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,