From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+vQusPpYHkUfrtZuBOE+5bcmCKIATHT/7PRY/mx8ODOwJIk4NfM3RerCK+oYGO875VFgV8 ARC-Seal: i=1; a=rsa-sha256; t=1523892346; cv=none; d=google.com; s=arc-20160816; b=ejbMJ99YrSgkwOKamziSREnJQ2nZUyxwoE/+WfaUJOYUIZy3SwTrWlTUkE41WVTnS2 cPRAJo23LLh5B/+JDsoD8vSb4ZwxO3q28VlyU7gAD4KWlomFgZ01q/l99ek4KqTHdBDv cu/ge+t4yUuPy8SgBtDPeiQHxpVzh7mcKGLNMF12n9I/KwMx7xjYaxg0odZTwp6lBfIX I/lB9kq93pRmnaXRifAQunFWYdFO4DhsLKEcX6JFZahzY4vA4SLgF0H/nYuqJmXuQVmG zxXFIE9s/OZZB4fyvu0CK4kQL94nIOw194xmi0Ao29uB65+Ypb8uviVMMq4NZE0tZ7pT Akmw== 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=ztOkeM8hpJ8qxoWjXo6JBy8pkFONtOwKqJDg4PtNm40=; b=NLj2GS2Mv1J+f+zgyBURsE9FaEYnQbmgUVSiEeoo2JtJiX89af27Ax2xh+f0eHYsvT MHCgG4EQi+8HaVfZ+6C1P8SJfXs7S4RmOlfUXRYWVCElFu6s9lIU8JiiYfc1a8YOnUwP j2G661Bx1a0mWpZzGqhOiE9E9vq+rLBeMwtahaJUvwoXDXgsvqZ6nChajfYU1sRss+ol AtlTy+pWLBu7Bkep8TGtPCIa+4lK3SolVYxAFEnd82c4AmrDM6ODSlO4ihNgVt6RAOA3 ge6dvf/XHBq02hSWt2/DWBDlhulVS6BP8MWAcVGA7Hx48ZOd3MNqA9nuzxWJJSlA7Txs U92Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=bXLLzOHn; 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=bXLLzOHn; 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 19/35] x86/pgtable: Move pti_set_user_pgtbl() to pgtable.h Date: Mon, 16 Apr 2018 17:25:07 +0200 Message-Id: <1523892323-14741-20-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?1597916941507373872?= X-GMAIL-MSGID: =?utf-8?q?1597916941507373872?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Joerg Roedel There it is also usable from 32 bit code. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/pgtable.h | 23 +++++++++++++++++++++++ arch/x86/include/asm/pgtable_64.h | 21 --------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 3055c77..557ddf8 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -635,8 +635,31 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size, pmd_t *populate_extra_pmd(unsigned long vaddr); pte_t *populate_extra_pte(unsigned long vaddr); + +#ifdef CONFIG_PAGE_TABLE_ISOLATION +pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd); + +/* + * Take a PGD location (pgdp) and a pgd value that needs to be set there. + * Populates the user and returns the resulting PGD that must be set in + * the kernel copy of the page tables. + */ +static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd) +{ + if (!static_cpu_has(X86_FEATURE_PTI)) + return pgd; + return __pti_set_user_pgtbl(pgdp, pgd); +} +#else /* CONFIG_PAGE_TABLE_ISOLATION */ +static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd) +{ + return pgd; +} +#endif /* CONFIG_PAGE_TABLE_ISOLATION */ + #endif /* __ASSEMBLY__ */ + #ifdef CONFIG_X86_32 # include #else diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 9934115..6dd2eb6 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -146,27 +146,6 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (ptr & ~PAGE_MASK) < (PAGE_SIZE / 2); } -#ifdef CONFIG_PAGE_TABLE_ISOLATION -pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd); - -/* - * Take a PGD location (pgdp) and a pgd value that needs to be set there. - * Populates the user and returns the resulting PGD that must be set in - * the kernel copy of the page tables. - */ -static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd) -{ - if (!static_cpu_has(X86_FEATURE_PTI)) - return pgd; - return __pti_set_user_pgtbl(pgdp, pgd); -} -#else -static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd) -{ - return pgd; -} -#endif - static inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d) { pgd_t pgd; -- 2.7.4