From patchwork Fri Nov 30 20:23:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 10707147 Return-Path: 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 D855914BD for ; Fri, 30 Nov 2018 20:23:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA4A328653 for ; Fri, 30 Nov 2018 20:23:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEBA2286C8; Fri, 30 Nov 2018 20:23:59 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB7C828653 for ; Fri, 30 Nov 2018 20:23:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 709756B59F5; Fri, 30 Nov 2018 15:23:53 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 66A0A6B59F6; Fri, 30 Nov 2018 15:23:53 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BD556B59F7; Fri, 30 Nov 2018 15:23:53 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 059F16B59F5 for ; Fri, 30 Nov 2018 15:23:53 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id v79so5316118pfd.20 for ; Fri, 30 Nov 2018 12:23:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QZbLck9EpslCztsKV/Zh7o/NqVBPEMet2V0AvICXx5s=; b=qg1Jgl3lKYbECB5gWg1cl1ip2tlSPDcMrIN6YV5uriyQ9HIUZisYUGo3tq48uMXvu2 5+XWhxZ0UE8BFoBHE70qIzgseqPYx0xg5fNSz7cjj8eLUu9R2DMhr09ZyKwRhtNf67GF +fL3WYkeA2xQce1X0RfkfKzf3iCIm0Hj9noGoUW3dTftutsgWXf2BYE2YG1+iVjyprGu I7D7AAeZ9PvpLBcSXRbZ0o3ymNRAbDri6m7MP50RoTv7m+W2OnQs6sCjj31W3Q6rLwmx 0l2L8NzqqNLCGXxRu+4wTL6130kjxLR5i05TIivTcb4QaxRtssC9XcFEmcIvq77Qc9CS 0Ckw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AA+aEWYaZAduj4QP++NveaL6IWVdDhMBTy2BRWnKQQQooISwQkcKdsIR +lOOUtmu31S9iWgmfEa1CogQ5Bb4R8o7fOrv91EYB4mK67gcxQlClU/mwkaF24nFcVwmAdODtG0 6ufISxqlDdPEbvmE4LnbES/1kuF+/Zf0RthUWIuYu0TWNSxHDSc7M1+TTPs10pLVQXQ== X-Received: by 2002:a63:31d0:: with SMTP id x199mr5941870pgx.10.1543609432717; Fri, 30 Nov 2018 12:23:52 -0800 (PST) X-Google-Smtp-Source: AFSGD/WdyeUByrhawn5Ox6hTg83ftMh5OhEU/6u0FsEy8Her+flaJYED1xUXfs28HYOSAa25TKlV X-Received: by 2002:a63:31d0:: with SMTP id x199mr5941846pgx.10.1543609432044; Fri, 30 Nov 2018 12:23:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543609432; cv=none; d=google.com; s=arc-20160816; b=MGJaIv9mXxZW2Cs0baMlh8emZ5VlwcH/vOoQVM5RRse+ldh3FA04BzS+hTz8CaMmUT 5CR2H9BzD4LzYwBbym1pP+O/J6HZ+HEPX0/DJIIETAadfq7Zdm2/3lXCMWD+6sQ4pHW0 aXoMUF3ST1ErizDgXZRdqZa6s+ZFtiRfrkHHVDz28bWMAaZUdhF+yuTTmIYOPqm5nutW HlLkZHJNnOkoLBWdyO3Mhu3v/63gZqmtNBN+/BlIeUo4c6fWYl86H7q6eBh0FFrLu+uh Kmc36IA6NKbleD8DcFKcPSFCNFi+E+Qb8l1Y0R3EPXhYyOqH6i0nfDmukWX482Duk4L+ abcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=QZbLck9EpslCztsKV/Zh7o/NqVBPEMet2V0AvICXx5s=; b=YesFxqwDLkNd4xxNdsMwaKEdGluW1p8s0R4Unjl2h1kH1HYGfb2adA5Ly3ERHjK/sX 8caY8U+ZSActs2KMC20IsCWpcxXe8QZKkBSINpnbpdPtR+YWo8/CEA9+NgUOGDV4XAm0 JsZydX0AlQZM7cNSqx8M1UxMA3pNOluIdKL8KNqiq5MwSQrIT3mnnIbQDYG9ys7G+COB F0ff6jfc3hX/C5mn6ZMd1/zbNhttIbC+q3sEi3nIfK2e4CZpKoVwhNzjAWwsnOsjUbi/ JOMkwh94VCYpMS0+DUSHv6Ya8I457eFUENs9GHjnDhmjcp4xKgvQehntvCDh3t70oTJL /qDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id 9si6079960plc.40.2018.11.30.12.23.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 12:23:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Nov 2018 12:23:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,299,1539673200"; d="scan'208";a="96481101" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 30 Nov 2018 12:23:46 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id 8FC2F368; Fri, 30 Nov 2018 22:23:45 +0200 (EET) From: "Kirill A. Shutemov" To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org Cc: boris.ostrovsky@oracle.com, jgross@suse.com, bhe@redhat.com, hans.van.kranenburg@mendix.com, x86@kernel.org, linux-mm@kvack.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv2 2/2] x86/dump_pagetables: Fix LDT remap address marker Date: Fri, 30 Nov 2018 23:23:28 +0300 Message-Id: <20181130202328.65359-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181130202328.65359-1-kirill.shutemov@linux.intel.com> References: <20181130202328.65359-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The LDT remap placement has been changed. It's now placed before direct mapping in the kernel virtual address space for both paging modes. Change address markers order accordingly. Signed-off-by: Kirill A. Shutemov Fixes: d52888aa2753 ("x86/mm: Move LDT remap out of KASLR region on 5-level paging") --- 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 dad153e5a427..abcb8d00b014 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -55,10 +55,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 @@ -66,9 +66,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