Message ID | 20181130115758.4425-3-kirill.shutemov@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.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 41A7514BD for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 30 Nov 2018 11:58:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31E902FFF2 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 30 Nov 2018 11:58:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25E162FFF8; Fri, 30 Nov 2018 11:58:13 +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 085472FFF2 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 30 Nov 2018 11:58:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C998F6B580E; Fri, 30 Nov 2018 06:58:06 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C34076B5811; Fri, 30 Nov 2018 06:58:06 -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 7FF946B580E; Fri, 30 Nov 2018 06:58:06 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 2E2416B5810 for <linux-mm@kvack.org>; Fri, 30 Nov 2018 06:58:06 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id h86-v6so4301380pfd.2 for <linux-mm@kvack.org>; Fri, 30 Nov 2018 03:58:06 -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=GSVQa7WKeYVmQyAmeIhEB+SlVtaQzJ028rygvBoC0N3m7DlWiUtCqEdjEQT5x+OeM8 zbSmhe8s3Rc6D1E1bEK8oK5IOg9JiMzH4idDpitIi0pumzr/qCT1ciwIa2W0DkmKKszf cq6AZKkkM4lkjThDHDTzfaJ6Mb4jZmnOZQIGigKFICJ1QadIYrA4roOi+rq4fW6RMHlu EP5TE1GijA6j2ARr8Wks13YXacx3Sx/4qDFLO0pTWntkbvo8CQzQOgTgbOyih7aUst/x Iy3ELJ/MoGRrC0tfsKnHxosMNWvTN6xABFwcWOgYyvzL7UKfnNXJT9NAOEB8bkQi0xOY H9mg== 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.115 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+aEWbQHEXLRfGreN4AnCBMAckEt66zLft/UntXl0wrxQpr0NWEQZpe OmKSNSIzgP+IwLuMKn5Q2ZDwGT8rnqz42qNmZOnj8KrMTRy8GlI74NOrnwiy6YW1F6zKvaZg5Jw JWFoCOm3XVetqdVSsE8Xs3SkEgJtFEsRF8IBUm/hXPUNbXy3kYsCkMJ79shq4LPfk5w== X-Received: by 2002:a63:bf0b:: with SMTP id v11mr4697053pgf.302.1543579085841; Fri, 30 Nov 2018 03:58:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/UU0SMdH/Ha2IWNu8RQcKTG5PwbEDmWZtj9lQf3e1cekx86nPamOQkYPLwh8j7aruSR7ir2 X-Received: by 2002:a63:bf0b:: with SMTP id v11mr4697025pgf.302.1543579085168; Fri, 30 Nov 2018 03:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543579085; cv=none; d=google.com; s=arc-20160816; b=sCqui72CWOE4yK8ujsCe827iM4fD0xinzCdRbsptuOC4Sf+mYAlrw9qwmWg8lw7adu w+BPlbWVuvfNar/AhoJWjtFkfAwjzgljW8QStTQWBfFSjjEioYn4g03sSz8Oyj5I6Oxz oJp37t62pbwzKY8nxkeMQ87z+fwe1/JDlfJ1y7ZO/AwXDSJLsuVRoMU7FOVevUzDPHcM 33JscYNo5YK3J7mieZC08A782KDJOYzvs02pT3Lx2YTzS60tDCd13mzIc+LOnZnbZACm JtSZmeMOjXLx5ovBQGWOF/+dKKBH/xNTzdSgfyHMy9PylLNmF9zHm+B8XLchESUAQgFf wsdg== 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=WxZA5xpdICMfDx5ZGW11yajS2V1Sd7lUbWa+g0X6+2RpHMOLfn84BmGxIej9JkNW8l SkqKfksXsD625c/nUGv7njVR7q76rN0NCAz0e7RbdGAC2jtH+7ld/mLrEPNpsrLP/CXH He20mN/rb3rkl61IMRJiGjJcJdh+UKeCGg6gm/xLMBYrqhFv//YWghfNMQFAJLl1ovkc YjLqdCZpnticNPBuB1yse5QWJVFO1dIJ6Twx1QwR3QG+R2RKViZbIXgmd1K1EmZP/NYR 9072g+eXxVleg5BYBx/xncsU1LDld/9vwAtCaWs7kvfbuzefO+LgKNG38RXzy+owEdUY APXw== 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.115 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga14.intel.com (mga14.intel.com. [192.55.52.115]) by mx.google.com with ESMTPS id k11si5136491plt.68.2018.11.30.03.58.04 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 03:58:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.115 as permitted sender) client-ip=192.55.52.115; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.115 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 orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Nov 2018 03:58:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,298,1539673200"; d="scan'208";a="114177706" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 30 Nov 2018 03:58:00 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id DF2323F2; Fri, 30 Nov 2018 13:57:59 +0200 (EET) From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> 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, x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH 2/2] x86/dump_pagetables: Fix LDT remap address marker Date: Fri, 30 Nov 2018 14:57:58 +0300 Message-Id: <20181130115758.4425-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181130115758.4425-1-kirill.shutemov@linux.intel.com> References: <20181130115758.4425-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Fixups for LDT remap placement change
|
expand
|
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
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 <kirill.shutemov@linux.intel.com> 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(-)