From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80313ECDE5F for ; Thu, 19 Jul 2018 23:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A5E520673 for ; Thu, 19 Jul 2018 23:29:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A5E520673 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zytor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731599AbeGTAOp (ORCPT ); Thu, 19 Jul 2018 20:14:45 -0400 Received: from terminus.zytor.com ([198.137.202.136]:45877 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727553AbeGTAOp (ORCPT ); Thu, 19 Jul 2018 20:14:45 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w6JNSNId2453482 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 19 Jul 2018 16:28:23 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w6JNSNZe2453479; Thu, 19 Jul 2018 16:28:23 -0700 Date: Thu, 19 Jul 2018 16:28:23 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Joerg Roedel Message-ID: Cc: mingo@kernel.org, jkosina@suse.cz, luto@kernel.org, tglx@linutronix.de, aarcange@redhat.com, bp@alien8.de, llong@redhat.com, eduval@amazon.com, dave.hansen@intel.com, peterz@infradead.org, jroedel@suse.de, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com, dvlasenk@redhat.com, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, pavel@ucw.cz, David.Laight@aculab.com, will.deacon@arm.com, hpa@zytor.com, brgerst@gmail.com, jgross@suse.com, dhgutteridge@sympatico.ca Reply-To: hpa@zytor.com, will.deacon@arm.com, brgerst@gmail.com, dhgutteridge@sympatico.ca, jgross@suse.com, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, boris.ostrovsky@oracle.com, David.Laight@aculab.com, pavel@ucw.cz, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, aarcange@redhat.com, eduval@amazon.com, bp@alien8.de, llong@redhat.com, jroedel@suse.de, peterz@infradead.org, dave.hansen@intel.com, mingo@kernel.org, jkosina@suse.cz, tglx@linutronix.de, luto@kernel.org In-Reply-To: <1531906876-13451-20-git-send-email-joro@8bytes.org> References: <1531906876-13451-20-git-send-email-joro@8bytes.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/pgtable: Move pti_set_user_pgtbl() to pgtable.h Git-Commit-ID: fcbbd977572cfe5a3dcc97d663bf7480431a07ca X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fcbbd977572cfe5a3dcc97d663bf7480431a07ca Gitweb: https://git.kernel.org/tip/fcbbd977572cfe5a3dcc97d663bf7480431a07ca Author: Joerg Roedel AuthorDate: Wed, 18 Jul 2018 11:40:56 +0200 Committer: Thomas Gleixner CommitDate: Fri, 20 Jul 2018 01:11:42 +0200 x86/pgtable: Move pti_set_user_pgtbl() to pgtable.h There it is also usable from 32 bit code. Signed-off-by: Joerg Roedel Signed-off-by: Thomas Gleixner Tested-by: Pavel Machek Cc: "H . Peter Anvin" Cc: linux-mm@kvack.org Cc: Linus Torvalds Cc: Andy Lutomirski Cc: Dave Hansen Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Jiri Kosina Cc: Boris Ostrovsky Cc: Brian Gerst Cc: David Laight Cc: Denys Vlasenko Cc: Eduardo Valentin Cc: Greg KH Cc: Will Deacon Cc: aliguori@amazon.com Cc: daniel.gruss@iaik.tugraz.at Cc: hughd@google.com Cc: keescook@google.com Cc: Andrea Arcangeli Cc: Waiman Long Cc: "David H . Gutteridge" Cc: joro@8bytes.org Link: https://lkml.kernel.org/r/1531906876-13451-20-git-send-email-joro@8bytes.org --- arch/x86/include/asm/pgtable.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index eb474329d751..cc117161f13d 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -640,8 +640,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