From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvX7FPKbOmJojk4U7cdL5QFDipTkyZwpSnOJGzIYucicccNG9NdczdxSY4jO4sjkwo3bXzs ARC-Seal: i=1; a=rsa-sha256; t=1521228615; cv=none; d=google.com; s=arc-20160816; b=QklpXBqWAAb3BVMK/Xp0fai0RvMKPPvTsxLsoQTu5hu/SEKmxo+6Bt34nI/kA4JDBL TMuRPXMRoA75Hjt44t1fLaoXwVZh5HRuNU2RPwFmcMdboe7MWoMJOrkYra9DQaliKvlQ aGo8ugv0s7bi08s+xHziT2FgEDjLqskPlvUgwlMcpVlWtJozeQ32fudeL9S92p58xwPT CA4ZkTk+MtcNb2kuRuGk2N5g0S7LfcPmxT1LlOHVbqvyvF7UY2VMPYqE9yknVLlmU/4z aivteafxS4QnWI6Zih2ivs2wHWeXEwSv1CT0AIdtHIxm9W++KgoI6gTccHCMWaUpgiBI PI+Q== 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=RGA25vQ8gBPaSKGy/lT4lV6mDQVKRyvseZa9z9ApG6o=; b=Rvrio85V7mmdu7tCjylQ1S81V8xANZFG653ImfuuRXtfphKRTE7P+VoP7MDMIgWtpK AqqRQxjskr6oJbXNJIoIeYtDcuncYiaJKA/OdSzdGuZOyXM4BsbuTaOpfswKNfKLD2ym kQOYqfHgOj/kwEdyfvT3Ei3RlRB8Tdyj4PNfPf9kxee8wK73N12HbuF/GF7+eKeovZq9 ZZOdNHlPp4xajweiB6bSpiWTgxW0LPxB/y0PXy9OKQ/eKKrn+9ngqrrhwBUP0Xvv2yPM MIlUoqglnAaYdZNG5ERT57t8+V9Vlma10RDR7dH0WK3xnmjUVMjJgxLl/3DV0pHqQ2LI Wdrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=ll680rTV; 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=ll680rTV; 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 , jroedel@suse.de, joro@8bytes.org Subject: [PATCH 30/35] x86/ldt: Define LDT_END_ADDR Date: Fri, 16 Mar 2018 20:29:48 +0100 Message-Id: <1521228593-3820-31-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521228593-3820-1-git-send-email-joro@8bytes.org> References: <1521228593-3820-1-git-send-email-joro@8bytes.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1595123816823144910?= X-GMAIL-MSGID: =?utf-8?q?1595123816823144910?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Joerg Roedel It marks the end of the address-space range reserved for the LDT. The LDT-code will use it when unmapping the LDT for user-space. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/pgtable_32_types.h | 2 ++ arch/x86/include/asm/pgtable_64_types.h | 2 ++ arch/x86/kernel/ldt.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h index eb2e97a..02bd445 100644 --- a/arch/x86/include/asm/pgtable_32_types.h +++ b/arch/x86/include/asm/pgtable_32_types.h @@ -51,6 +51,8 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */ #define LDT_BASE_ADDR \ ((CPU_ENTRY_AREA_BASE - PAGE_SIZE) & PMD_MASK) +#define LDT_END_ADDR (LDT_BASE_ADDR + PMD_SIZE) + #define PKMAP_BASE \ ((LDT_BASE_ADDR - PAGE_SIZE) & PMD_MASK) diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h index e57003a..15188baa 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -90,12 +90,14 @@ typedef struct { pteval_t pte; } pte_t; # define __VMEMMAP_BASE _AC(0xffd4000000000000, UL) # define LDT_PGD_ENTRY _AC(-112, UL) # define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT) +#define LDT_END_ADDR (LDT_BASE_ADDR + PGDIR_SIZE) #else # define VMALLOC_SIZE_TB _AC(32, UL) # define __VMALLOC_BASE _AC(0xffffc90000000000, UL) # define __VMEMMAP_BASE _AC(0xffffea0000000000, UL) # define LDT_PGD_ENTRY _AC(-3, UL) # define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT) +#define LDT_END_ADDR (LDT_BASE_ADDR + PGDIR_SIZE) #endif #ifdef CONFIG_RANDOMIZE_MEMORY diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 26d713e..f3c2fbf 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c @@ -202,7 +202,7 @@ static void free_ldt_pgtables(struct mm_struct *mm) #ifdef CONFIG_PAGE_TABLE_ISOLATION struct mmu_gather tlb; unsigned long start = LDT_BASE_ADDR; - unsigned long end = start + (1UL << PGDIR_SHIFT); + unsigned long end = LDT_END_ADDR; if (!static_cpu_has(X86_FEATURE_PTI)) return; -- 2.7.4