From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELv5m2V2NqOdx2QVkUMdqh9aaLyIRGd8bTj6qqk3iGFNYNojUWP1TmNDZiOVa2SndT3DlVNG ARC-Seal: i=1; a=rsa-sha256; t=1520245582; cv=none; d=google.com; s=arc-20160816; b=dH64Ac7W2+Ydnbw0+ZSEeq7GI+5IioQ78bQV86/tBWQuLqQZSR307A5/lYA592xQxx d45n6hRK0MTWciGAinHwIaYZ2YaQ45vVdvnAc6cgPNuPKJLF4vNTOMJfxbKGR7r9Of9V WsrHv77VKr3She6yqMlzwp7FomTy0tW852F7HZR8WqcOug8YbykWNxJUym+3qSXCYo+x 7aR6+CTs7ilau9rNrAADtUVXRjplcwIhd9isOW+yzjnn8wL4VHF+sEBq9OeZcV8S3l5Y nnoQ7Zl/MVYQKNzpYeiVcuiE9Wo24aVjmO3EdPSaPsa2rCMa/nJ9tvaobtDsEdIJ+fI1 zllg== 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=GURhZSw998sq/lK4WWE46+2Sd5NNcRgU0o04Qz8ZGzQ5N4EtkrpLpkjtywcX9td1Kl +2RvMUUaBBUcL+qNcremxA+jRcS1CZjHOIyHLU0W2zxtSmyW6RlpPY+j4ihqdeW7QhyJ DjkPUugOwwjO0oKW9SvIeFSjxy4IlrGeWmoYkjrYohlFG2N4WWHXYqcVugY1c+xqF3SG e1uMj977zrEO3LHx6ZsFbtuE+0ZxNBj++jd5iGLR+dmg5TfyP9UNc+g92V0dzUahOxdg izoCZIsAH6hyxK6PdlDcTrB3wBREV34xh9+Azkbz4R8sHV3xgRcLUQupXS9QQVqGPcjA djfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=GwadVX5x; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 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=GwadVX5x; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 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/34] x86/ldt: Define LDT_END_ADDR Date: Mon, 5 Mar 2018 11:25:59 +0100 Message-Id: <1520245563-8444-31-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520245563-8444-1-git-send-email-joro@8bytes.org> References: <1520245563-8444-1-git-send-email-joro@8bytes.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594093031242513504?= X-GMAIL-MSGID: =?utf-8?q?1594093031242513504?= 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