From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 19/59] x86/dump_pagetables: Fix LDT remap address marker Date: Wed, 26 Dec 2018 17:37:59 -0500 Message-ID: <20181226223839.150262-19-sashal@kernel.org> References: <20181226223839.150262-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gcHql-0007s6-TV for xen-devel@lists.xenproject.org; Wed, 26 Dec 2018 22:40:27 +0000 In-Reply-To: <20181226223839.150262-1-sashal@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: jgross@suse.com, Sasha Levin , bhe@redhat.com, peterz@infradead.org, dave.hansen@linux.intel.com, linux-mm@kvack.org, bp@alien8.de, luto@kernel.org, hpa@zytor.com, xen-devel@lists.xenproject.org, Thomas Gleixner , hans.van.kranenburg@mendix.com, boris.ostrovsky@oracle.com, "Kirill A. Shutemov" List-Id: xen-devel@lists.xenproject.org RnJvbTogIktpcmlsbCBBLiBTaHV0ZW1vdiIgPGtpcmlsbC5zaHV0ZW1vdkBsaW51eC5pbnRlbC5j b20+CgpbIFVwc3RyZWFtIGNvbW1pdCAyNTRlYjU1MDVjYTBjYTc0OWQzYTQ5MWZjNjY2OGI2YzE2 NjQ3YTk5IF0KClRoZSBMRFQgcmVtYXAgcGxhY2VtZW50IGhhcyBiZWVuIGNoYW5nZWQuIEl0J3Mg bm93IHBsYWNlZCBiZWZvcmUgdGhlIGRpcmVjdAptYXBwaW5nIGluIHRoZSBrZXJuZWwgdmlydHVh bCBhZGRyZXNzIHNwYWNlIGZvciBib3RoIHBhZ2luZyBtb2Rlcy4KCkNoYW5nZSBhZGRyZXNzIG1h cmtlcnMgb3JkZXIgYWNjb3JkaW5nbHkuCgpGaXhlczogZDUyODg4YWEyNzUzICgieDg2L21tOiBN b3ZlIExEVCByZW1hcCBvdXQgb2YgS0FTTFIgcmVnaW9uIG9uIDUtbGV2ZWwgcGFnaW5nIikKU2ln bmVkLW9mZi1ieTogS2lyaWxsIEEuIFNodXRlbW92IDxraXJpbGwuc2h1dGVtb3ZAbGludXguaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5k ZT4KQ2M6IGJwQGFsaWVuOC5kZQpDYzogaHBhQHp5dG9yLmNvbQpDYzogZGF2ZS5oYW5zZW5AbGlu dXguaW50ZWwuY29tCkNjOiBsdXRvQGtlcm5lbC5vcmcKQ2M6IHBldGVyekBpbmZyYWRlYWQub3Jn CkNjOiBib3Jpcy5vc3Ryb3Zza3lAb3JhY2xlLmNvbQpDYzogamdyb3NzQHN1c2UuY29tCkNjOiBi aGVAcmVkaGF0LmNvbQpDYzogaGFucy52YW4ua3JhbmVuYnVyZ0BtZW5kaXguY29tCkNjOiBsaW51 eC1tbUBrdmFjay5vcmcKQ2M6IHhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpMaW5rOiBo dHRwczovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgxMTMwMjAyMzI4LjY1MzU5LTMta2lyaWxsLnNo dXRlbW92QGxpbnV4LmludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFs QGtlcm5lbC5vcmc+Ci0tLQogYXJjaC94ODYvbW0vZHVtcF9wYWdldGFibGVzLmMgfCA3ICsrLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvYXJjaC94ODYvbW0vZHVtcF9wYWdldGFibGVzLmMgYi9hcmNoL3g4Ni9tbS9kdW1w X3BhZ2V0YWJsZXMuYwppbmRleCBjZjQwM2UwNTdmM2YuLjZiY2E0NWQwNjY3NiAxMDA2NDQKLS0t IGEvYXJjaC94ODYvbW0vZHVtcF9wYWdldGFibGVzLmMKKysrIGIvYXJjaC94ODYvbW0vZHVtcF9w YWdldGFibGVzLmMKQEAgLTUxLDEwICs1MSwxMCBAQCBzdHJ1Y3QgYWRkcl9tYXJrZXIgewogZW51 bSBhZGRyZXNzX21hcmtlcnNfaWR4IHsKIAlVU0VSX1NQQUNFX05SID0gMCwKIAlLRVJORUxfU1BB Q0VfTlIsCi0JTE9XX0tFUk5FTF9OUiwKLSNpZiBkZWZpbmVkKENPTkZJR19NT0RJRllfTERUX1NZ U0NBTEwpICYmIGRlZmluZWQoQ09ORklHX1g4Nl81TEVWRUwpCisjaWZkZWYgQ09ORklHX01PRElG WV9MRFRfU1lTQ0FMTAogCUxEVF9OUiwKICNlbmRpZgorCUxPV19LRVJORUxfTlIsCiAJVk1BTExP Q19TVEFSVF9OUiwKIAlWTUVNTUFQX1NUQVJUX05SLAogI2lmZGVmIENPTkZJR19LQVNBTgpAQCAt NjIsOSArNjIsNiBAQCBlbnVtIGFkZHJlc3NfbWFya2Vyc19pZHggewogCUtBU0FOX1NIQURPV19F TkRfTlIsCiAjZW5kaWYKIAlDUFVfRU5UUllfQVJFQV9OUiwKLSNpZiBkZWZpbmVkKENPTkZJR19N T0RJRllfTERUX1NZU0NBTEwpICYmICFkZWZpbmVkKENPTkZJR19YODZfNUxFVkVMKQotCUxEVF9O UiwKLSNlbmRpZgogI2lmZGVmIENPTkZJR19YODZfRVNQRklYNjQKIAlFU1BGSVhfU1RBUlRfTlIs CiAjZW5kaWYKLS0gCjIuMTkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnBy b2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94 ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 792B78E0001 for ; Wed, 26 Dec 2018 17:40:27 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id i3so18866586pfj.4 for ; Wed, 26 Dec 2018 14:40:27 -0800 (PST) Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id s13si17407523pgc.509.2018.12.26.14.40.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Dec 2018 14:40:26 -0800 (PST) From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 19/59] x86/dump_pagetables: Fix LDT remap address marker Date: Wed, 26 Dec 2018 17:37:59 -0500 Message-Id: <20181226223839.150262-19-sashal@kernel.org> In-Reply-To: <20181226223839.150262-1-sashal@kernel.org> References: <20181226223839.150262-1-sashal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Kirill A. Shutemov" , Thomas Gleixner , bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, boris.ostrovsky@oracle.com, jgross@suse.com, bhe@redhat.com, hans.van.kranenburg@mendix.com, linux-mm@kvack.org, xen-devel@lists.xenproject.org, Sasha Levin From: "Kirill A. Shutemov" [ Upstream commit 254eb5505ca0ca749d3a491fc6668b6c16647a99 ] The LDT remap placement has been changed. It's now placed before the direct mapping in the kernel virtual address space for both paging modes. Change address markers order accordingly. Fixes: d52888aa2753 ("x86/mm: Move LDT remap out of KASLR region on 5-level paging") Signed-off-by: Kirill A. Shutemov Signed-off-by: Thomas Gleixner Cc: bp@alien8.de Cc: hpa@zytor.com Cc: dave.hansen@linux.intel.com Cc: luto@kernel.org Cc: peterz@infradead.org Cc: boris.ostrovsky@oracle.com Cc: jgross@suse.com Cc: bhe@redhat.com Cc: hans.van.kranenburg@mendix.com Cc: linux-mm@kvack.org Cc: xen-devel@lists.xenproject.org Link: https://lkml.kernel.org/r/20181130202328.65359-3-kirill.shutemov@linux.intel.com Signed-off-by: Sasha Levin --- arch/x86/mm/dump_pagetables.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index cf403e057f3f..6bca45d06676 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -51,10 +51,10 @@ struct addr_marker { enum address_markers_idx { USER_SPACE_NR = 0, KERNEL_SPACE_NR, - LOW_KERNEL_NR, -#if defined(CONFIG_MODIFY_LDT_SYSCALL) && defined(CONFIG_X86_5LEVEL) +#ifdef CONFIG_MODIFY_LDT_SYSCALL LDT_NR, #endif + LOW_KERNEL_NR, VMALLOC_START_NR, VMEMMAP_START_NR, #ifdef CONFIG_KASAN @@ -62,9 +62,6 @@ enum address_markers_idx { KASAN_SHADOW_END_NR, #endif CPU_ENTRY_AREA_NR, -#if defined(CONFIG_MODIFY_LDT_SYSCALL) && !defined(CONFIG_X86_5LEVEL) - LDT_NR, -#endif #ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR, #endif -- 2.19.1