Message ID | 1535567040-1370-3-git-send-email-brijesh.singh@amd.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <kvm-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 114BE139B for <patchwork-kvm@patchwork.kernel.org>; Wed, 29 Aug 2018 18:28:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDCA62B9A6 for <patchwork-kvm@patchwork.kernel.org>; Wed, 29 Aug 2018 18:28:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0C172B9AD; Wed, 29 Aug 2018 18:28:51 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 5BB922B9A6 for <patchwork-kvm@patchwork.kernel.org>; Wed, 29 Aug 2018 18:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727818AbeH2W0x (ORCPT <rfc822;patchwork-kvm@patchwork.kernel.org>); Wed, 29 Aug 2018 18:26:53 -0400 Received: from mail-cys01nam02on0068.outbound.protection.outlook.com ([104.47.37.68]:16160 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727399AbeH2W0w (ORCPT <rfc822;kvm@vger.kernel.org>); Wed, 29 Aug 2018 18:26:52 -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:X-MS-Exchange-SenderADCheck; bh=f6PW9E0NX+svtefZx6/rCifZcI4kR5EN7WimzZP/yVQ=; b=hz6KcMqADc9KYJ8AmYMZAqKkajDTh7u3nCofgSDN8I67DvafBFj3hDFZVFFCrx6yUiDfW0xowDcCcSh6kGp8WpPL2GQC7tVG/MEYyC1+HOJcIjEDeQQqtwQa+FZmJK/XYTNzQGICgZ9mt2qOnfJc93uZRbZaLnYWbbSl4gHOKe0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from sbrijesh-desktop.amd.com (165.204.77.1) by BYAPR12MB2678.namprd12.prod.outlook.com (2603:10b6:a03:69::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.14; Wed, 29 Aug 2018 18:24:15 +0000 From: Brijesh Singh <brijesh.singh@amd.com> To: x86@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Brijesh Singh <brijesh.singh@amd.com>, Tom Lendacky <thomas.lendacky@amd.com>, Thomas Gleixner <tglx@linutronix.de>, Borislav Petkov <bp@suse.de>, "H. Peter Anvin" <hpa@zytor.com>, Paolo Bonzini <pbonzini@redhat.com>, Sean Christopherson <sean.j.christopherson@intel.com>, =?utf-8?b?UmFkaW0g?= =?utf-8?b?S3LEjW3DocWZ?= <rkrcmar@redhat.com> Subject: [PATCH v3 2/4] x86/mm: fix sme_populate_pgd() to update page flags Date: Wed, 29 Aug 2018 13:23:58 -0500 Message-Id: <1535567040-1370-3-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535567040-1370-1-git-send-email-brijesh.singh@amd.com> References: <1535567040-1370-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR1801CA0020.namprd18.prod.outlook.com (2603:10b6:910:74::33) To BYAPR12MB2678.namprd12.prod.outlook.com (2603:10b6:a03:69::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9674059-9b18-4ffa-aa57-08d60ddca101 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:BYAPR12MB2678; X-Microsoft-Exchange-Diagnostics: 1;BYAPR12MB2678;3:PHPA63FKSOotxPxRnU+KYV9UL5D2aD6g4K9RjWnJzn/j6NmdPOTO0SnzCCPWd4wn+6AzRfgelpV+VZtVnm3+2ieasslFqTxdoZtEw5D0wu1Q+Sqd8VcLACayYH+48olM5M+480JdQyDIHZdUWf0a2K+kApwP+FPApBzd2UMhaLE29vZP7ToBrbeusAtwfcdkJBr5kHj5k6/mgZc9NuC0RG9e0sOxU/M3JOtQe4JVTa9kv2hG48lgFmHGivVAPPYW;25:QUbc++g7/jxAsHyfmUGqBdzsTIlJ7KKdIlLSTVhxMUoEnJEoNlgqnRLPzkTwFxg+qbjPVvylbF9yVfjlbNgxqFUByqvlAL2p/zkuy3Zb1RjfYJaN6Mqz8oEQaFSOJCGVH7spPe8Au6HujRejFfogM1wjSbwgSLtMfkoOFJsm8wyftpdpPTczntIaXqjYcY1crZq+jOaqH3b8rRK9P9RpSCyGpz5UlzP6bTINwFPRcPOlAngFUVz3CQDQR5IjoGCBwT4Mp2d+xyoKM8sAHDjF5Fm19uJeC4Mds0QN46+qVCvsl3YRwp6Ph5Mjm5NNyqziOnIy6SlsYYninIebsRWNNQ==;31:gAMb4oVRPfeRaXjtwerIw6vSYQOHkBX4AW6TwQVR26TzjBw0bG+WCO8aRR1nkjr5Db/MPQWEOQckQKhPEXm76Eu/qve5O9Qu7GdNSRxc+VI0MMNI94DhvJOuyYrNSkpa5XxqSFQCGnidqVVpSzUOR3IkVQZujZw2RD7zQ4DcAtBS5Bu0VDrdnI7V2/ugK89PwZ5aa/hD0tBHtt0YQRWNHBqymNmioHS4fn3QTAe1HRM= X-MS-TrafficTypeDiagnostic: BYAPR12MB2678: X-Microsoft-Exchange-Diagnostics: 1;BYAPR12MB2678;20:N8LXYy+zd9JE+7RZhZCHfre6adQYJ1gSiGg62hniWVHyk8af0AdFeouhk8jgflQ/hw46FzheVUUdO1N5QrKi3eYogdOKZaOHajE6NhUgV847mJOoSCIQ1bET6jn+CoVaXk0jpI+UYfKLibFKk8pAp3PQecNDGWS7elbGaTiNm1IBZsohEvV57r4ZEeZ0IYvMS8STSjja364grVFs0Y2V66djMkswvDF4zt8A/YlUGx7ytqV20LbdQ41I6c/nQdh0KOkS9GhdniEHmviFauJmzgG2RnhQ+OUzPiOgTPkc5P0QzfofnAQXu1NaIDBzF3+iKdCm3EtL9pUG8k+TnuxDs/k2JbCjND+z/76nh1F+vl9ROVCnFdTRz9OPa9LT2XebdzJnSkfsmKO2vb3efTTUhJZC/AEvZ8OGKDfih9d3tV/NGe8eEPLUeugoFxvvrFc71ddh3+BfCIKafHSnT8Jn3Vf8MJ5eWsj8FyYaDziYt72lvV8D/1nEVyuu8TxsiOiT;4:0c8ra8xzGMSORGTcsVngQ8IVulxsb3Ep0ixpA9nqfoagsNhLyovyPKhyMb9O8yYhrBkic/uxOLu9Sfurr88PRGI8pt8wvsezsKTCbJ1rxxtYUAzuxKoAz98SAoI7fBsmuS1Zh5ka/mLkB4pV2rdcDNBaSoDOSg8EDZKcpltkJJX6qOJwTKJJMMZl8varLIDBWkFCdlJYPf2Esqu95DZfqzuuOBv6gvqTLUIbEowj2aXMSIU9qIyIN3LEoyrzhvGJd6QrtMTnurDlhRh4Z6T+Xf8LZQKt3UTsjMr6H/5v4umI2CVz6PPu0IOqOX+Q83roNiu0TR5abcD3w2cnTS0NfOY8MAyYA8fhjWF4DaOKndU4pFP2VK+0chvY+SDTWO2v X-Microsoft-Antispam-PRVS: <BYAPR12MB26781B0E728C987F2BF38F9BE5090@BYAPR12MB2678.namprd12.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110)(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016);SRVR:BYAPR12MB2678;BCL:0;PCL:0;RULEID:;SRVR:BYAPR12MB2678; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(396003)(39860400002)(346002)(366004)(376002)(136003)(189003)(199004)(478600001)(386003)(6486002)(53936002)(5660300001)(14444005)(54906003)(4326008)(6666003)(97736004)(25786009)(23676004)(7736002)(52116002)(7696005)(305945005)(76176011)(50466002)(15650500001)(50226002)(53416004)(36756003)(81156014)(81166006)(8936002)(106356001)(2616005)(956004)(476003)(3846002)(6116002)(86362001)(2870700001)(2906002)(47776003)(446003)(68736007)(186003)(16526019)(486006)(66066001)(316002)(105586002)(26005)(8676002)(11346002)(44832011);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR12MB2678;H:sbrijesh-desktop.amd.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBYAPR12MB2678=3B23=3AcQn03M2?= =?utf-8?q?45OnFbM0S5pCs/6l+YOvwAWICXFIw7sgp1NUISJxaKAYCGvpdDi5ZJac2oJgng50x?= =?utf-8?q?jcoJwRZJyc0tqvfGSNZAd+JdrZUyk0MOGxyrTHEpHxCt0YeIkFN8A//QlEEWjdcic?= =?utf-8?q?oGLivEFttv3PzKFGFduwiMboEYTJo9RJia8asS8zUA5nhmYqmRiXVfrTveeF9c8p5?= =?utf-8?q?A0jLzD1cLibv790j8nEDj6nqcwCcss8px9p2JL29wIOQD6OLV0y+Xt+fLGsmEbKvC?= =?utf-8?q?9zy5F7BpqEKErgH9lzP1brBakyhbIgygr/IN01ExTuLaPkEMb7SqsnhhNqoS9kxEu?= =?utf-8?q?e6KeTTLLU3UVV3z/cbeTU0XBlxnJ9+14p1sIQxi273icCE2l7SFQ1PcUCxCV6P3Gs?= =?utf-8?q?FA+5dtoXVuLctK2RI354evIGuph8jOOecx61PLnBxZL3NIIE8E/yQNW0/9e0mofpw?= =?utf-8?q?JsJxTK6aECXCcj/+1Smnm+oTbIo2Qw7fYbU+QX76IRlkB6X5BeFlpRcwuoIF3pEBv?= =?utf-8?q?gg/CsThCKuLAl2kn/xoxMC2+WRhpULRIhhddQdud/Lq74h4Ko1dFhtkbQzIeJciAw?= =?utf-8?q?sdrsNfV8bIQVi7gOv7tbgpQXWAS7Ev6t57AHIPuQpNMxf6IZYh2QITKHCexnbzZrd?= =?utf-8?q?Zq6q2IqvMCHJr15IiASST05MOGsZFBMpQtse3sUc5HFlIYSxyPj378t+4OxoWsYx3?= =?utf-8?q?HfccWPAZQVzCALndcWzs3osu9cfiPma6iBNlfGkNPWB6hRIn0qBEe8NtHXn8gMdWi?= =?utf-8?q?Lw9O0CVJbBLSXXHjrOBAobwmB1DwGbRLbji2souJZRR2Q3Q5mLGLLHpSHGtQ1E51K?= =?utf-8?q?+XFaDUv3OpKr4uFJ1wh2rSRA0FBEV5OoEiHt1eNnBF2ZydW9sQyr4075oizz3ovx+?= =?utf-8?q?2VZqY5j2CZvwMJ2MoBqeu97jGClytEun+cyQeGZ9D8zMW70oJs3LdHE36VPF9uyWt?= =?utf-8?q?ymcXVW32HmXgHszxL1OJbZDti6gSMXZDl8IsfU20fgHu1YRkZXKDUlYpseFD5lBLY?= =?utf-8?q?m/11QvZRRpDDgAU/9gzNYtwE2ttBIsFSwvlh6tpv1CfExddt+3JW6+X+ShxrXfacy?= =?utf-8?q?9xytNGzUj5ACAbjQcvc545KZbPG1jIzmBVKvhmrcFBI+154qSWWYV/+JFRUiPI8jr?= =?utf-8?q?4XykqAg9WuJ9UfrdkU9jKr5gAjkNtzih+fhEHHiSh+N3IhIRx9YDg0K2cJhAw=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: WpH0h2pRsG8XbZbXsaTdvQnLWyYDoZR0DQEHxM5zlejdmzTaIByMZ1ppAeIICRK2u5EUJb+hYY7Yz7o3kkrjIxjprVY5nfAaY4kTEfmJ0b32cK2wghlCnyX1iAli0l5Qixy7vEM3TaUfdVNUPmWja3FZT79f05P2dV/XTYPs301+zbpsSY9AMt5SJ60fj3AjphlQuu4Kl5iWgky5EjGR54qPNzLgMfj3CB1H0haEa9tJcMrHto+7YLCHWOgNVhowSioo8en2y3NuIZqZyutH4RcVqCJ7nun0OYbb6RTrkCHwRb+A/eCyHRn4Kjo/VThlDNY64JrCgyv0AVv8rhiztWXHQZj0ybI5k88ubjLKVQo= X-Microsoft-Exchange-Diagnostics: 1;BYAPR12MB2678;6:lxgrl/5UQVXqJLbqrP3HIDKdFMInbAGHZIZ+aGSO2wyn6Ip3V64oWs3saq60ep9IFPgVjyyL9JtYenYwM+ZwMhuVX2QwdfuVnQNG6x6JGCw6pMoCAziFVGtzRh8LspK7qP1rAs44Ir36o0uQuEnDMdHxaJbRkH7TQIRF+ImTqOo8QZ2rsl6xy5NxxMOnN73dzC5+Q4SU7BbR+OVHfjJv21M/nXtpKQa5WSvneZwvCWhPhChPKqEffm1xNgVsCm7IV+CNIPE6kjTyc4Ox14YQlA1tUqDXUjCYDt/oEWGSUZqGOcDVHcvM/UOS5tsp8XW5Tp3/6plcYT4dl8KlPPcGB/u4+ta9wy4Hi4cAOo4NX6YeJRf84RN34yf5+6j15UFL4J56QZbHZaFyYU9f317rVQRYlONwA3TQQL/nMYXqXykqCmgLN2Uq+vTluDi/fMQmlJEL+xF3YQFjt4AlyVi8ag==;5:aTCBA5H92EzGDHDTMBHc/HINXStKxkUhVybDvJr5Sgd8FhzecVz05cGkfwOMlU9CziJD03iaTy1TwGNNSQaogG+qY4ZbAyD8aXjrhfYi9+nrlHi8TrtYXVqhWw7XOvA0cLVDctMbMRTr+izTwQDf3TGSuu2tNmsZxJXLjmyZLjk=;7:IzNuDdUpYN7eaBGQ4TuB4xbY+9Tc7+rPn5Uj1S+CLDAaisboml08je8qMa4cwTEYl3Jd4wAFNNN9SkQWgE9z6J1b3s8rcEWUPs1G9oeo77H8nSQdP/t8zNDdGvKTs/0EPNcJws0Ejf98cZfMF3SxXh9aPSFjVZG+eXDmOtL2kCpI4lfLZQDuq4Qw91SHWqEeHoNdp8KNX80nIa/3Ujgq3PL9VISTS+IZP0CalX0OaAi1vO0vqgvHeto7bk+NhqJ/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BYAPR12MB2678;20:3AUTPYXum7j8DeqgjjeL/j5khX05OJrQxiEHPFCrh0MgQYaQMbET/JaqhEZl35PMimeimx0shLsnnBS+i9xJeJSlu3r876kibGNq+fvTg/k7lidWLzQKoXn6mBYuYntItNBBzm9uo8XXyx+lQezCIBcmAD4iKWkbI2o/E3h5Gth/fcsNDZWlxcJA2gv0ZACJchx5BBix+XrLwAdxZQEL8VOnngPBU/4QHMlRaVJHJCDyziGAdOfsBzAVcjKK7NPf X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 18:24:15.2366 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9674059-9b18-4ffa-aa57-08d60ddca101 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2678 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: <kvm.vger.kernel.org> X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
x86: Fix SEV guest regression
|
expand
|
diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c index 92265d3..7659e65 100644 --- a/arch/x86/mm/mem_encrypt_identity.c +++ b/arch/x86/mm/mem_encrypt_identity.c @@ -154,9 +154,6 @@ static void __init sme_populate_pgd_large(struct sme_populate_pgd_data *ppd) return; pmd = pmd_offset(pud, ppd->vaddr); - if (pmd_large(*pmd)) - return; - set_pmd(pmd, __pmd(ppd->paddr | ppd->pmd_flags)); } @@ -182,8 +179,7 @@ static void __init sme_populate_pgd(struct sme_populate_pgd_data *ppd) return; pte = pte_offset_map(pmd, ppd->vaddr); - if (pte_none(*pte)) - set_pte(pte, __pte(ppd->paddr | ppd->pte_flags)); + set_pte(pte, __pte(ppd->paddr | ppd->pte_flags)); } static void __init __sme_map_range_pmd(struct sme_populate_pgd_data *ppd)
Fix sme_populate_pgd() to update page flags if the PMD/PTE entry already exists. Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: kvm@vger.kernel.org Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Borislav Petkov <bp@suse.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: linux-kernel@vger.kernel.org Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Sean Christopherson <sean.j.christopherson@intel.com> Cc: kvm@vger.kernel.org Cc: "Radim Krčmář" <rkrcmar@redhat.com> --- arch/x86/mm/mem_encrypt_identity.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)