From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752769AbdLEBHI (ORCPT ); Mon, 4 Dec 2017 20:07:08 -0500 Received: from mail-by2nam01on0087.outbound.protection.outlook.com ([104.47.34.87]:63748 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751546AbdLEBGr (ORCPT ); Mon, 4 Dec 2017 20:06:47 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@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 Subject: [Part2 PATCH v9 36/38] KVM: SVM: Clear C-bit from the page fault address Date: Mon, 4 Dec 2017 19:06:14 -0600 Message-Id: <20171205010616.5958-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171205010616.5958-1-brijesh.singh@amd.com> References: <20171205010616.5958-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: BN6PR04CA0055.namprd04.prod.outlook.com (2603:10b6:405:3b::44) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9b04e69-6195-463e-04f8-08d53b7c7286 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603286);SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0156;3:AOjGJwxFcA/MQnL0PdmE5Drvwyvu35AlDLxkwt1rs65xJA2dW87OHFASLmjHtysbl0jRGYW9mwd1YP1WelgLBXEAVNPAvGKl3co3K5/1ODyXYpssU6SJI/1ISAM98E0+RukpsQnCmZp7tyeONkmER0oAmRvnbCg1nYQdG3f88MZzth527ayZtm0Hel3qlVEufH+GQBud+3R9rC+ar2fO0yPQwCu5GyIqykgKJevocV1aU9+y0zTisfbxq6FzmEZP;25:5JGWTjNSMhDHyqBWLUeYgwnAKkgHk5U5cZ0ZHYG+uMILvciOKkMbC7345k7MdOmqu4PN7Sp+1/C6hHhHlCp3XqyqOdqKXed68rcTeXAn2A/eoLZtntzc9ch/fRQTFJ0ERghTsORPGlzD7UVSydT2nqPU/N+GeSL518dyvxH3sdYObkjYuwpYoUNV+d8tsDOKHcJJF2SHwns4COFP781c5jb/xUhxt6nVvm1haDX46qm8GR4n+qENLqIm2Z9uigwxQ64tmgk1JZknIDslEHt+XNxadZTenGiHOM48pAuFFzfeAH06cBheuRyD1Owg0iPD4HtjaxmIyd+wLxH7/tWCew==;31:FCtTEo7+WwyEN7y4IONtuZS2UyHq2oVQjy66JFHCj4xhy5oFpSDQhZxQg39oQzKeYiABkL5S9ftc3mXfWlqur69Px4EZzMTJIv6emoMc1jrSkAP3vQMe3iA12oVvR4aRONowTZpjZL3RlZHgUPPqOiTTPbJvqLp1I/EQdA+qIWIVL0B8Z0n7u48Lpn5wunzF2wsSshaRJBpbTVEZ586zHHpn8jaCWkoyCaXpmjN4XU4= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0156;20:g7AKxbfLHGK1VvP1lqFq0P012lcb+mJM9EyQRC1i/g0AQuolmWXQQxn7EHUs1nfJBcarvBd5InIleFdZyFpyCwL1L9a9rn0ceak/3Ond567RuuN5xPqc1fpLGVtOootxul8J2gVuu3imejZtQ9aRulFrIf3DNSHyILcP87sxxSXCVQWPBAEC/6ebYQJ5lMIr5JLdB+r9kwZufrvCwh3TQDalb5SpiaAKkF18cFafrO5Yyovwpl/mjGDaaMfUJgk9pkyLye+qhFZdrX117nDbhgr47Hf3ydMpyKmZYevU6qEinARTPpgNXkf/4/T9KKJLZPJiUBaB58emDyMsK60tgIjvDLl1ANbUOagWw95/kgrbFCbiAY2gqnyrb82hUsxpEIxTNnA/xvQpkdEBG5++2m94QrLgCvxMjVkTpQcIW3vBBZOh74Bhs5ArsgjYv0u+UrqSkRTi+x2AjHpT8TaLdfre6pCfm9uN+O7KYhU1Fc7QjIFmBKYj+WluKiT7vRr5;4:b3IuMWA+AAJ43EpRMf8tvIRM7IaLvffnQG8U1oxU3SCJc0ObbGRzSL5IBmraJjaU0xdv0TGYiQZgvpfRgs4SUNlCI7TtpYaPWhBWksUJOW7OR7yta9v8LVWxmdqWSe4CQxl7swdrrYZ5O3Hgfnj3+QCYjqkLIUZg3+PNeeg1Tj75Xg7HjbMNEcSxXg0BjE8AghtbLCRtXJyphUV01VeGWzFGNXQvjFhkO0ouZflFVVq2JivQR2vzC6EW0yKzrK/QcxuS6phjcB7GrasI2Kh8EaELhinVI4oZywDLy2axBvfOY/IFpuSjYMQXBMx+vkP+x0iMvodWZlmHU3rgXRLMDQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231022)(6055026)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011);SRVR:DM2PR12MB0156;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DM2PR12MB0156; X-Forefront-PRVS: 0512CC5201 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(376002)(346002)(39860400002)(366004)(189002)(199003)(316002)(66066001)(50466002)(23676004)(47776003)(25786009)(54906003)(86362001)(53416004)(7696005)(76176011)(16526018)(36756003)(8936002)(81166006)(6486002)(81156014)(305945005)(50226002)(7736002)(53936002)(5660300001)(52116002)(2950100002)(6666003)(33646002)(4326008)(101416001)(8676002)(478600001)(2906002)(7416002)(2870700001)(1076002)(189998001)(106356001)(6116002)(3846002)(68736007)(97736004)(105586002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR12MB0156;H:wsp141597wss.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjEyTUIwMTU2OzIzOmFkakh1SFZLOVA0b1Zrai9MTWFMdHMrYlJO?= =?utf-8?B?VS9icDJIamhNdlRpNjVrQk5FQ3Y2RHlqSUxBZm5aMTBQUVJGMjhoLy94YkhN?= =?utf-8?B?VVZydE9CMUU5TXdZaS9qaXVPSGFTdW93MFcyUWZXNFNTQW5KajhJVmVRT0xO?= =?utf-8?B?c1pxYU51TlNPVnp3UFJZU3dwMVJHY2daVFd0RExxMy9EVmRUb3Z3SGNvRk1h?= =?utf-8?B?NjRqQWdmVitFejJGYm5sQWd1cjA3MzV2OEFHeXBTV20rSW1BcEViZXJ0S1FR?= =?utf-8?B?Z2Qrd3VPZDR2cmhzbFdNOWNlWS9Va3JLRnoybWFReXVnTzd6QTd4ZUVDeENG?= =?utf-8?B?Z3BzcVBWZHkwc3lxV2xnb1BTTHJ2bFFGRDFXUjFDLzVuS2VodWRERkRDTVlj?= =?utf-8?B?dzFJNUtGTW9rajZKSmVaL2g0UDNCTW9vbHhibGo1ek9XRzU5V2RhL0V1ZG9j?= =?utf-8?B?QVBOUW9GcittejljTkpaUFY1RzRqdHljZWZkbTdYekgzZldHN29mTUx1N3Vh?= =?utf-8?B?c08wRnMxeHRTWm13K3QvdXE5c0gzRGUyeUdsSGx6bkhMSXAzT0lKN2ppK3oy?= =?utf-8?B?T1FKZlprZGhmRkpsbTUxUzk3SmxGNGQzcGs3Wm1ZcTZIWTcrczVPWk5PWjNx?= =?utf-8?B?cTRtelQzQTl3SENZQU50QmpGZFdRemxnekc0cmpXeW5VUWxsTk9qa0FoQnoy?= =?utf-8?B?dldWNEdkeDlIaTVUeWNPd0V6T04vaWN2eUxPS040RWpZYUxtZzFVME5vMnJo?= =?utf-8?B?VVhvaTUzeUlBdWNoQUNLcHMwK25OWW1zWHoxTS96NWQ5OW96WnRXWWhtcS9M?= =?utf-8?B?d3NhMnBHc0ZnYVozS0lzUy9NOHArVlRjVnJ0Ym16S0VLTHBOYmNJM2dLdkt4?= =?utf-8?B?NmxlK2ZOcVJXam5RVzZvbzlEeDNLaW9kanJoakNTUWRqaW16cDkyWHVFMGZj?= =?utf-8?B?VkFsVmZDTXJWQ1NIeWZWS21HZmpZbmd5Rnh3YXovaElxdU1Mem5KTE9UdkJs?= =?utf-8?B?UUhsR0RtamRnQzRkZGJNR1dGZ1FVeGZSWU1MT1hEeDB1YVIxWEpWTnA4eEZ1?= =?utf-8?B?U2tTdDhWYVlCeTUycWJaZURJZU5waHUzUG13NlU5aFRYMUdMK1pIM1BQdWdS?= =?utf-8?B?SzludUxFeW9ZU2ttTnNoWExZeFkxYXVNMDh4WllSZ0kwd0Q1ZFpSM2NPb1BW?= =?utf-8?B?N0xSdDVoRVBLVUwySTFrL1pzTG5lbEYwUEUvUjE3dms0aW5HMjdOazhja0NK?= =?utf-8?B?SnJ6U2VDTHRiQXIwOEU1eE0xOGJkNW9JeEFRNVpVMGIrbVR2UWNXUmlvL1dU?= =?utf-8?B?SkN4cG51ZXRITFNyTHBoTUlGQ3ZHUnVyS3FmVkN2SlJIemVKTkIvNmNDdENQ?= =?utf-8?B?MWVSRTZEcUJhWXdzNlk2aTJCc1hGbGh0b1doN1Fyazh5eHJkSkI0ZEhLUzU1?= =?utf-8?B?ZDYzaWhOU2xTdDRvOHZTcWMvL3FZUDNQWUJMVWdwRHMvZEN3Y0VMZ2J2bzNM?= =?utf-8?Q?HkXE1IQXcyBgTeAjJncPTtYHM=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0156;6:13gBQnxj+QkWJvBkZtO+6BJZTJqxI057RgJ8l/6Tg4w14FkBf7CnCjZrhJCBaAURqG/DeOnujV3eeDlxcgMBFuXQgQEzfKsqCxAzz1qXeqVAIqBTOBETC3pR26AmTWNM5+SV9UpNW21QmMbAFvsuV1IRJBKE+tj9d58uULxHSMtA1dxdO4u8mGNv0v0sOyMDb8njciAbuNX3Wm2Ybt6/h17k7VAiNZFNz5ZNtAWtKK0mVLifUVhisIIGOsKnACWGQrKjxBJ9z9c1knbwBpgX95sawruR8Y1fMMz+6DjHofs+O/GyiFDvjSe9Zqdo6MhmlsZcNHMQPKMovB7NJCqFT96+jbR6GRc+ZEI30e1Lq3Y=;5:1oMZViN1xawYTs9+kadRF19Tdn1ijcPyCo3yeNaB32HnvQSYCeTqKYpqTu2Kh8Sz0lU3ohrz8Nw1bxtZlrgHcs16QbBfGcZfsFvh8XLMxn3KzRdKIeaN7zqzNr9WQtu6w7ugj6YjFqtIYH9Z0YykszKIkR5Xv0klOnxk1WgfULA=;24:LojfNezf5UHapN4ZrO204SK4KJBGMqZJXsdVWrrnV5pYcPnMTAgH5YJ3RkIKnsoJaEDAvY3GR6DldOHa+eP8OU5wi4uOaFxmWmpMvvCOBtk=;7:jlV/z0WRFNRi8QH29kTwWNtp6dD8eE2QTXaJ8dyW0sFhAcQ3i8FBPwfA3oRcd+mdkWlMrQ3Jre4iuMikFOVPjNSBdF8ud0R3vcxMNJokrSnwtLhKoP5lyevijzl4zWfozyQLZ+9b2g4EB0fM6rXP8I2Z6rUlygp4ndUAeHLXBG1pcfDBMdqDUTcChgjugwTbf+yD26RFvqfSD1OQWgz6tLNecoXgxRs1t4OYr2LwVMnGCUc/qw/Gf3c4/wLQLmeQ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR12MB0156;20://alqyarmQZVjbM2TuMlE1LExKgfYfj5nhmHfj9vGSE+/cZUqAuJvjKZmRZK6/iCwd31U03/d4ogEJDoNazQ3Z2LQ0DrN5kobRCSKDCB9fH8+W+Hn8kHflkGhX4maRB3kXiu9Q++E6pWDERgOzbkbMZ56gr+isGmDFSxSaZOoPz4HPgHTVKO0d0qfDRfSXOZFcGqnU7vR/eKG9pgm0R53LZReL10yzVnl7gxS8BvHhG4Qk0QAihLr1N6TEMfVD9I X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2017 01:06:41.4912 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9b04e69-6195-463e-04f8-08d53b7c7286 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When SEV is active, on #VMEXIT 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index bdce5b4e71cc..f350e9bac9eb 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2430,7 +2430,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, @@ -2440,7 +2440,7 @@ static int pf_interception(struct vcpu_svm *svm) static int npf_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; trace_kvm_page_fault(fault_address, error_code); -- 2.9.5