From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1F0FC43612 for ; Fri, 11 Jan 2019 15:04:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C18EC20874 for ; Fri, 11 Jan 2019 15:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547219041; bh=iPjWC98gWLSWoPp4GD1DnNsTLiu3Auue49EupepnXtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bX9o7L8n9rRlLSmlcePF+LujqOHTRODmvyRSu+7lszwh9Qnlwi64XXcOcOa9h/UCC RvhM4MO+d692Kvxppm7DzkRhTZAcAHfVuowgjS0GYOYFs150nTQauB7PN/p3sB5jtJ OQS8HpMgK6VmkhalSttBVqXQY6Fn8MQGBR9w4f4Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388998AbfAKOal (ORCPT ); Fri, 11 Jan 2019 09:30:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:49976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388984AbfAKOah (ORCPT ); Fri, 11 Jan 2019 09:30:37 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E539D2133F; Fri, 11 Jan 2019 14:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217036; bh=iPjWC98gWLSWoPp4GD1DnNsTLiu3Auue49EupepnXtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=osjwOa7Dds1O0pBpZo3ZjL/8O4aWqKDQwG1fJ3ji3IdKzI3udsRCfexuF8d5+anYY 8wlxG5elinPHCIY5wyXR3R2XMXZrfciRoOCQji31RuT4FvHqZPkEQaVOmDnjXytR5d TQG9RlxCu2WUud5KeMkZew4aVggHvjNXQAXyIjD4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "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 Subject: [PATCH 4.14 019/105] x86/dump_pagetables: Fix LDT remap address marker Date: Fri, 11 Jan 2019 15:13:50 +0100 Message-Id: <20190111131104.844827246@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131102.899065735@linuxfoundation.org> References: <20190111131102.899065735@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.14 019/105] x86/dump_pagetables: Fix LDT remap address marker Date: Fri, 11 Jan 2019 15:13:50 +0100 Message-ID: <20190111131104.844827246@linuxfoundation.org> References: <20190111131102.899065735@linuxfoundation.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 1ghxpV-0004K6-CZ for xen-devel@lists.xenproject.org; Fri, 11 Jan 2019 14:30:37 +0000 In-Reply-To: <20190111131102.899065735@linuxfoundation.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: jgross@suse.com, Sasha Levin , bhe@redhat.com, peterz@infradead.org, Greg Kroah-Hartman , dave.hansen@linux.intel.com, stable@vger.kernel.org, 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 NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpbIFVwc3RyZWFtIGNvbW1p dCAyNTRlYjU1MDVjYTBjYTc0OWQzYTQ5MWZjNjY2OGI2YzE2NjQ3YTk5IF0KClRoZSBMRFQgcmVt YXAgcGxhY2VtZW50IGhhcyBiZWVuIGNoYW5nZWQuIEl0J3Mgbm93IHBsYWNlZCBiZWZvcmUgdGhl IGRpcmVjdAptYXBwaW5nIGluIHRoZSBrZXJuZWwgdmlydHVhbCBhZGRyZXNzIHNwYWNlIGZvciBi b3RoIHBhZ2luZyBtb2Rlcy4KCkNoYW5nZSBhZGRyZXNzIG1hcmtlcnMgb3JkZXIgYWNjb3JkaW5n bHkuCgpGaXhlczogZDUyODg4YWEyNzUzICgieDg2L21tOiBNb3ZlIExEVCByZW1hcCBvdXQgb2Yg S0FTTFIgcmVnaW9uIG9uIDUtbGV2ZWwgcGFnaW5nIikKU2lnbmVkLW9mZi1ieTogS2lyaWxsIEEu IFNodXRlbW92IDxraXJpbGwuc2h1dGVtb3ZAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KQ2M6IGJwQGFsaWVuOC5kZQpD YzogaHBhQHp5dG9yLmNvbQpDYzogZGF2ZS5oYW5zZW5AbGludXguaW50ZWwuY29tCkNjOiBsdXRv QGtlcm5lbC5vcmcKQ2M6IHBldGVyekBpbmZyYWRlYWQub3JnCkNjOiBib3Jpcy5vc3Ryb3Zza3lA b3JhY2xlLmNvbQpDYzogamdyb3NzQHN1c2UuY29tCkNjOiBiaGVAcmVkaGF0LmNvbQpDYzogaGFu cy52YW4ua3JhbmVuYnVyZ0BtZW5kaXguY29tCkNjOiBsaW51eC1tbUBrdmFjay5vcmcKQ2M6IHhl bi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpMaW5rOiBodHRwczovL2xrbWwua2VybmVsLm9y Zy9yLzIwMTgxMTMwMjAyMzI4LjY1MzU5LTMta2lyaWxsLnNodXRlbW92QGxpbnV4LmludGVsLmNv bQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogYXJj aC94ODYvbW0vZHVtcF9wYWdldGFibGVzLmMgfCA3ICsrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvbW0v ZHVtcF9wYWdldGFibGVzLmMgYi9hcmNoL3g4Ni9tbS9kdW1wX3BhZ2V0YWJsZXMuYwppbmRleCBj ZjQwM2UwNTdmM2YuLjZiY2E0NWQwNjY3NiAxMDA2NDQKLS0tIGEvYXJjaC94ODYvbW0vZHVtcF9w YWdldGFibGVzLmMKKysrIGIvYXJjaC94ODYvbW0vZHVtcF9wYWdldGFibGVzLmMKQEAgLTUxLDEw ICs1MSwxMCBAQCBzdHJ1Y3QgYWRkcl9tYXJrZXIgewogZW51bSBhZGRyZXNzX21hcmtlcnNfaWR4 IHsKIAlVU0VSX1NQQUNFX05SID0gMCwKIAlLRVJORUxfU1BBQ0VfTlIsCi0JTE9XX0tFUk5FTF9O UiwKLSNpZiBkZWZpbmVkKENPTkZJR19NT0RJRllfTERUX1NZU0NBTEwpICYmIGRlZmluZWQoQ09O RklHX1g4Nl81TEVWRUwpCisjaWZkZWYgQ09ORklHX01PRElGWV9MRFRfU1lTQ0FMTAogCUxEVF9O UiwKICNlbmRpZgorCUxPV19LRVJORUxfTlIsCiAJVk1BTExPQ19TVEFSVF9OUiwKIAlWTUVNTUFQ X1NUQVJUX05SLAogI2lmZGVmIENPTkZJR19LQVNBTgpAQCAtNjIsOSArNjIsNiBAQCBlbnVtIGFk ZHJlc3NfbWFya2Vyc19pZHggewogCUtBU0FOX1NIQURPV19FTkRfTlIsCiAjZW5kaWYKIAlDUFVf RU5UUllfQVJFQV9OUiwKLSNpZiBkZWZpbmVkKENPTkZJR19NT0RJRllfTERUX1NZU0NBTEwpICYm ICFkZWZpbmVkKENPTkZJR19YODZfNUxFVkVMKQotCUxEVF9OUiwKLSNlbmRpZgogI2lmZGVmIENP TkZJR19YODZfRVNQRklYNjQKIAlFU1BGSVhfU1RBUlRfTlIsCiAjZW5kaWYKLS0gCjIuMTkuMQoK CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRl dmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9s aXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==