From patchwork Wed Jul 11 11:29:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10519465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B96F06032A for ; Wed, 11 Jul 2018 11:31:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC02326861 for ; Wed, 11 Jul 2018 11:31:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF19028837; Wed, 11 Jul 2018 11:31:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16E6426861 for ; Wed, 11 Jul 2018 11:31:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2CCD6B0280; Wed, 11 Jul 2018 07:30:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D05D46B0282; Wed, 11 Jul 2018 07:30:13 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B11F16B0281; Wed, 11 Jul 2018 07:30:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 45D686B027E for ; Wed, 11 Jul 2018 07:30:13 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id t11-v6so9898231edq.1 for ; Wed, 11 Jul 2018 04:30:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=gP0q3U4ApL0dO5I/dNeSaMeVSE47kfimqJAT4KZqvmY=; b=aXiCUKJD8vRUEgm/bxeYpiZUTF5guV5TBiY2+Pscyl2+5vH46KIx/33WNHzioPOBgK J+QjZileNIHfqfdC2KL1fyBNhByBj+1lH2Z22uMORtJywbXLHqF20FXMB3PxC0rZc/2m YDRhDPfZwE2njPdsTVX0KgQv8jR/6AmgwUVuwOBI/FfgPdNR8pcMrjqPL3w5OGQNnt+5 cMouJXgyTM3q18d/DJn3Fq2sAnSMkKDuRt6sMbYazXX/pzh9e//dNqC9RC4PlrCyKhlK Std64YV14aiqJiIAgDPlXzOMNxy93eC5Ycg/tf/Ycve/K8EqKPV62Qa2IL8Wb5v3Lcbp DSNA== X-Gm-Message-State: AOUpUlE7Cm8j/J8ykCtlyA8Xc7a4PSfKvap/o0ou7XM8U2zy4WxGBg9+ QGQGPM6oyZNYISRUm/GWf+2Jxu8jacbt/nGyiywlwmj/sZ27qF3GQ0sljQtiXLgE/39lBBOR2Oh //FyZ2HQGK/fxLNRd7dJ8HAHd7HXwxXCIe714JBGMmrjJigoCBwCAycexyV9na1uj6w== X-Received: by 2002:a50:8dcb:: with SMTP id s11-v6mr10673630edh.86.1531308612838; Wed, 11 Jul 2018 04:30:12 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe2VF70mKrCDzHE4zJCT9t6QZkXliL70LnpWXAVXei9WSMqRd+olSVv3WVSayx1Hb2UOqcq X-Received: by 2002:a50:8dcb:: with SMTP id s11-v6mr10673584edh.86.1531308612101; Wed, 11 Jul 2018 04:30:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531308612; cv=none; d=google.com; s=arc-20160816; b=JcPSyVVycqvLQ4vHiKE7LUEWSmDATxyk6owMfeHyo0Q28OkE5oIy4kXBqf0MyrNIWq LV+uOc44jzZftE6k3PsBfIy1B5cokg8xOt+mI+3/0RUg1F0/dlW2oszvXMK3ml/i+GQj m6xdIfG/1xv/TAF8WONWvcY/c7Stibj17PsyI0LPklelaXrOQ0AgypETAtG1TaNQx3Wb 0zsW2LtaF5r8l7IZd5xN5PAEXuh0GLuWrxj6nSRiv+jEh4DMJK68pbA2fYRK3Xbz76l3 Wu+RBy3WvwCvhHxFhuSAWZvfjjYyE/NnML0Ojeu69CZtGKJI6nYV9/vTxcOl3AezPiSq SE9g== 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=gP0q3U4ApL0dO5I/dNeSaMeVSE47kfimqJAT4KZqvmY=; b=gYOSoKdj06xdC6O1qT1WmGvmwdpMG4bsuCjSWBrqZmOmqC3Z2nmnfRr/N8R77JFHp1 iMJje7C3qK5hHwTq/9NLK1ApJPlwVAQqEf5eKFwd6ZMj7/xJNi7gZA95iR4RIqIC9EW+ I4dpJeHu2M1kfduce4Ft+X1gsPO+TRVrIx/m2xuxa3ad4oNZIb2aWpJWkK58CPpc9yuV VJxt0niO4CJqK5OoKcNkh35WJzrm64aTAkbiDTRbDIuD4bxGDjiP9SEGKChWm8x1qhe7 JNhyTWTChNfSLOfUg86QnYyj9aNJ3EcujK24KlOirOsRWqM+ciA7Gb1PKeSRVgP9NrvY zlZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Bb3URnkk; 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 Received: from theia.8bytes.org (8bytes.org. [81.169.241.247]) by mx.google.com with ESMTPS id x8-v6si4214689edr.318.2018.07.11.04.30.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 04:30:12 -0700 (PDT) Received-SPF: pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) client-ip=81.169.241.247; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Bb3URnkk; 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 Received: by theia.8bytes.org (Postfix, from userid 1000) id 9150A8F0; Wed, 11 Jul 2018 13:30:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1531308603; bh=qgF5TKSPeKfV3RwP/ojIqp2J5p8p9GJpm4hHUAmlDu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bb3URnkkw9JQ2tP1+/YViZpAV7Q01sRogYqTUg8+VALBqZRqAU9LRdl0odFQvTBtd ulCMCrP3rKbtfwi88MWf6Z6+Cvx0leJXVLELnx76ERbakQuDBywPdHX8wtpz5AXLkI eULwXjulew3pcSfA/08zEW3q/IbmiPu2umXjwLNtxYMV+7fuwz5ZsTwb0qw29R/QQe BxikUCcPp0wB7IBtb/wMg+OpgAmPgjrFZ6feMGAVNb0K1r9A5b00krSoPYGR24Pekr u2tekUqlX58VkIR7hZoWa/hz/JB/ug24MJpK1VUFHNH1mjvUvo4afmHIIscw6A/SKn Znr/7z1Nc1FwA== 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 20/39] x86/pgtable: Move two more functions from pgtable_64.h to pgtable.h Date: Wed, 11 Jul 2018 13:29:27 +0200 Message-Id: <1531308586-29340-21-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531308586-29340-1-git-send-email-joro@8bytes.org> References: <1531308586-29340-1-git-send-email-joro@8bytes.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel These two functions are required for PTI on 32 bit: * pgdp_maps_userspace() * pgd_large() Also re-implement pgdp_maps_userspace() so that it will work on 64 and 32 bit kernels. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/pgtable-2level_types.h | 3 +++ arch/x86/include/asm/pgtable-3level_types.h | 1 + arch/x86/include/asm/pgtable.h | 15 ++++++++++++ arch/x86/include/asm/pgtable_32.h | 2 -- arch/x86/include/asm/pgtable_64.h | 36 ----------------------------- arch/x86/include/asm/pgtable_64_types.h | 2 ++ 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/arch/x86/include/asm/pgtable-2level_types.h b/arch/x86/include/asm/pgtable-2level_types.h index f982ef8..6deb6cd 100644 --- a/arch/x86/include/asm/pgtable-2level_types.h +++ b/arch/x86/include/asm/pgtable-2level_types.h @@ -35,4 +35,7 @@ typedef union { #define PTRS_PER_PTE 1024 +/* This covers all VMSPLIT_* and VMSPLIT_*_OPT variants */ +#define PGD_KERNEL_START (CONFIG_PAGE_OFFSET >> PGDIR_SHIFT) + #endif /* _ASM_X86_PGTABLE_2LEVEL_DEFS_H */ diff --git a/arch/x86/include/asm/pgtable-3level_types.h b/arch/x86/include/asm/pgtable-3level_types.h index 78038e0..858358a 100644 --- a/arch/x86/include/asm/pgtable-3level_types.h +++ b/arch/x86/include/asm/pgtable-3level_types.h @@ -46,5 +46,6 @@ typedef union { #define PTRS_PER_PTE 512 #define MAX_POSSIBLE_PHYSMEM_BITS 36 +#define PGD_KERNEL_START (CONFIG_PAGE_OFFSET >> PGDIR_SHIFT) #endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */ diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index cc117161..e39088cb 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1177,6 +1177,21 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, } } #endif +/* + * Page table pages are page-aligned. The lower half of the top + * level is used for userspace and the top half for the kernel. + * + * Returns true for parts of the PGD that map userspace and + * false for the parts that map the kernel. + */ +static inline bool pgdp_maps_userspace(void *__ptr) +{ + unsigned long ptr = (unsigned long)__ptr; + + return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); +} + +static inline int pgd_large(pgd_t pgd) { return 0; } #ifdef CONFIG_PAGE_TABLE_ISOLATION /* diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index 88a056b..b3ec519 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -34,8 +34,6 @@ static inline void check_pgt_cache(void) { } void paging_init(void); void sync_initial_page_table(void); -static inline int pgd_large(pgd_t pgd) { return 0; } - /* * Define this if things work differently on an i386 and an i486: * it will (on an i486) warn about kernel memory accesses that are diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 4adba19..acb6970 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -132,41 +132,6 @@ static inline pud_t native_pudp_get_and_clear(pud_t *xp) #endif } -/* - * Page table pages are page-aligned. The lower half of the top - * level is used for userspace and the top half for the kernel. - * - * Returns true for parts of the PGD that map userspace and - * false for the parts that map the kernel. - */ -static inline bool pgdp_maps_userspace(void *__ptr) -{ - unsigned long ptr = (unsigned long)__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; @@ -206,7 +171,6 @@ extern void sync_global_pgds(unsigned long start, unsigned long end); /* * Level 4 access. */ -static inline int pgd_large(pgd_t pgd) { return 0; } #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE) /* PUD - Level3 access */ diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h index 054765a..066e0ab 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -153,4 +153,6 @@ extern unsigned int ptrs_per_p4d; #define EARLY_DYNAMIC_PAGE_TABLES 64 +#define PGD_KERNEL_START ((PAGE_SIZE / 2) / sizeof(pgd_t)) + #endif /* _ASM_X86_PGTABLE_64_DEFS_H */