From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4/MRJAaceIkBbWPDW1FmwWitLQypWBtLXTeuc1GVZcYzVodEYfFD2f8OKtvWNjgu8DEGow5 ARC-Seal: i=1; a=rsa-sha256; t=1523892352; cv=none; d=google.com; s=arc-20160816; b=FRriVvXvhZ/kgtg2IQKWNgwarr5AxMRia7mTQiOgg6CFFy8JzwbO+O9zPLymYIgNQZ cyT0kAaPWWCcj9aEQu92eTgRGT9O8Hk5lTG22pmvTKb2qycR+3r0YPfkzBJuRwcKn8h0 /4U563PgRlCjS0/+YpsfL29W3gMLzlEFFo/6xC/NmhLl3x96b825Mz/9XlNQyNqnnRU9 SdN+eHsna6AoDdA4tZgtuNPN4Lh0qc7y5HmpX+EbKc6fjtVqenaDCRbJmT5iS87imZWM 2IK4DK+4DjpFEDeVc85ufqWKbjQ32XSz2XnMtSbJ+TB+6RndhHzPe3oDaSoLBtbnXIqf e3ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=DuyJCPb/1FTV6q4CJjr9sBI6ldDnIBliiVWeLlyTNVw=; b=bGdIR0BwBwsjpbuFs53TwEpAhNCWOBzHTeXtJwnGdKrKF7Qebhc2q3mCVH2kfMRJ56 dF2Ywy0WxW98OUV9I6lohj/H1X6szxA31AwrcmyaQ/9ffeht9bAazSqeWhmH9r8ZkNQu 53Rt0JFdazjddqbVtJpx1HKWr49AgGITOTUJaph783hAwJAuXF6BEMAYc5kXd8aPBwGU 39bTrl+sCCww3p/+ifSnGavT8r9eqoZoYPZpgpiwKaDpTZJu8TzyeOnY+f8LmVrbp5+u 7PfUJ5sxc09A1etEflkKA9qri3bup041i6+H0j+wJ49IfjPqipNyPJSa0tXPiNLykirO Xw5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=qmends0u; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=qmends0u; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org From: Joerg Roedel To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Andy Lutomirski , Dave Hansen , Josh Poimboeuf , Juergen Gross , Peter Zijlstra , Borislav Petkov , Jiri Kosina , Boris Ostrovsky , Brian Gerst , David Laight , Denys Vlasenko , Eduardo Valentin , Greg KH , Will Deacon , aliguori@amazon.com, daniel.gruss@iaik.tugraz.at, hughd@google.com, keescook@google.com, Andrea Arcangeli , Waiman Long , Pavel Machek , "David H . Gutteridge" , jroedel@suse.de, joro@8bytes.org Subject: [PATCH 29/35] x86/ldt: Reserve address-space range on 32 bit for the LDT Date: Mon, 16 Apr 2018 17:25:17 +0200 Message-Id: <1523892323-14741-30-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523892323-14741-1-git-send-email-joro@8bytes.org> References: <1523892323-14741-1-git-send-email-joro@8bytes.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1597916947096121780?= X-GMAIL-MSGID: =?utf-8?q?1597916947096121780?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Joerg Roedel Reserve 2MB/4MB of address-space for mapping the LDT to user-space on 32 bit PTI kernels. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/pgtable_32_types.h | 7 +++++-- arch/x86/mm/dump_pagetables.c | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h index e3225e8..1fa76c9 100644 --- a/arch/x86/include/asm/pgtable_32_types.h +++ b/arch/x86/include/asm/pgtable_32_types.h @@ -50,13 +50,16 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */ ((FIXADDR_TOT_START - PAGE_SIZE * (CPU_ENTRY_AREA_PAGES + 1)) \ & PMD_MASK) -#define PKMAP_BASE \ +#define LDT_BASE_ADDR \ ((CPU_ENTRY_AREA_BASE - PAGE_SIZE) & PMD_MASK) +#define PKMAP_BASE \ + ((LDT_BASE_ADDR - PAGE_SIZE) & PMD_MASK) + #ifdef CONFIG_HIGHMEM # define VMALLOC_END (PKMAP_BASE - 2 * PAGE_SIZE) #else -# define VMALLOC_END (CPU_ENTRY_AREA_BASE - 2 * PAGE_SIZE) +# define VMALLOC_END (LDT_BASE_ADDR - 2 * PAGE_SIZE) #endif #define MODULES_VADDR VMALLOC_START diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 84498da..956c886 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -122,6 +122,9 @@ enum address_markers_idx { #ifdef CONFIG_HIGHMEM PKMAP_BASE_NR, #endif +#ifdef CONFIG_MODIFY_LDT_SYSCALL + LDT_NR, +#endif CPU_ENTRY_AREA_NR, FIXADDR_START_NR, END_OF_SPACE_NR, @@ -135,6 +138,9 @@ static struct addr_marker address_markers[] = { #ifdef CONFIG_HIGHMEM [PKMAP_BASE_NR] = { 0UL, "Persistent kmap() Area" }, #endif +#ifdef CONFIG_MODIFY_LDT_SYSCALL + [LDT_NR] = { 0UL, "LDT remap" }, +#endif [CPU_ENTRY_AREA_NR] = { 0UL, "CPU entry area" }, [FIXADDR_START_NR] = { 0UL, "Fixmap area" }, [END_OF_SPACE_NR] = { -1, NULL } @@ -608,6 +614,9 @@ static int __init pt_dump_init(void) # endif address_markers[FIXADDR_START_NR].start_address = FIXADDR_START; address_markers[CPU_ENTRY_AREA_NR].start_address = CPU_ENTRY_AREA_BASE; +# ifdef CONFIG_MODIFY_LDT_SYSCALL + address_markers[LDT_NR].start_address = LDT_BASE_ADDR; +# endif #endif return 0; } -- 2.7.4