From patchwork Wed Jul 18 09:41:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10531877 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 D8B41600F4 for ; Wed, 18 Jul 2018 09:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5CA628FBC for ; Wed, 18 Jul 2018 09:42:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8D8228FCD; Wed, 18 Jul 2018 09:42:50 +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 3C4A228FBC for ; Wed, 18 Jul 2018 09:42:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ECBA76B029D; Wed, 18 Jul 2018 05:41:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EA1C36B02A0; Wed, 18 Jul 2018 05:41:37 -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 D46F06B029F; Wed, 18 Jul 2018 05:41:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by kanga.kvack.org (Postfix) with ESMTP id 5C9F76B029A for ; Wed, 18 Jul 2018 05:41:37 -0400 (EDT) Received: by mail-ed1-f71.google.com with SMTP id s18-v6so1694998edr.15 for ; Wed, 18 Jul 2018 02:41:37 -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=5RyuMf0JoQLxU50ftKKt3zum+cKILbraWmtXrPttPno=; b=TGtmRE85tEqUyzaGP3PyFHtl4SIqzHT7GFtZsoVYRLCY5DhbJdJPbbqfCKlGKn141t ZzY+cMhjsFHsvqUqXes1HU2gWZq35DWvJYXrG80SdL2HIXLy2pqvNRGd6RizWCabQSHf SZowJbOqjU1Oc2lnSDBcRzslV/8PMIgFfIZIHyJMVNSmSCe8m3Ihi+3f647dOsTkMiYw sdxM3tFhYqGOcGnQZni0kJtV2v3KF/mK+/rckW0/ZMd7mr3zhZSGXYS6lCxEjv4tRn0k H8aCErJWqhwccUsLSytIMP2O4mHvmpJBUERRDB0KU/YFzSRULkbY1hJmQ/dCrcapMAfl 9zFg== X-Gm-Message-State: AOUpUlGQmr2xzQmMw4z5+vduypwPV2yssisYarKlg1dfsByfYmIUqEAu s/izv3e6x/Kn3hv31NsahQ8wW8gvqEEYKsR463bfhPi16SFlyFXR8gBUv4ZS0TuMPlgnIfiUfAm De48ahK2PTbUPXFNplD1JMA3/jfRkSwc7fu9SYKCTzymzDhTLFsb+0VSkSt0gq2blsg== X-Received: by 2002:a50:8748:: with SMTP id 8-v6mr6235697edv.13.1531906896926; Wed, 18 Jul 2018 02:41:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe1BJehJT3pPMiYvzU4I4iCQb6Ti82zk9W87mYDJjUWHbPvs6bdgU5MYnYcThNZ4cTdASgK X-Received: by 2002:a50:8748:: with SMTP id 8-v6mr6235657edv.13.1531906896256; Wed, 18 Jul 2018 02:41:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531906896; cv=none; d=google.com; s=arc-20160816; b=TizCiwhG0NEqfwIAUDOczYuQ4tyVm/jB9knem7R3sqS4LvW/KC1JSO0hhbC1G6gXMA 2CiUiV4rMVsUZr30gnrqG7PxgxK6ZKyWsC3GFNJ8E8W+V4D1y5O0FbqzwhMKgNcTdnh0 E2DdtFHXCzpgmJypdtPYY54QGczvoS8OPBzw5U5izg7fpkz+EkHogmQHBbf+HU02nAze xMQDurzuO2UfuOpQNTRiZK2K6BFW/hmYJa+mfrIy5BCaH1dU4DEveEAcCJIu1enS0NTR wVNsUcmeyO9rMUMuOslw/Id48UCGwTCCtBdGyCT8P3ESlChsw2Lm7U8JsQHB/zRQA03i E72Q== 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=5RyuMf0JoQLxU50ftKKt3zum+cKILbraWmtXrPttPno=; b=dygc765/Un2YHN++BBtiR3B1KuS6Ivv15BziIo6HacV7dEcaER0NXFK4e8YmJlDDZk 3d5GxOGjJiD1mdpYB1YcHYF2uOyYa2N9z05V7OcecU9f11LhtPH6KvaQVRMKgdJihtyq Mi0AU0VNPi6GEVKYIV9NMwPQ+YCiaO1Px3G7xETeXslWTAnniPgU8UA7fDPKKHXMPaoG LZLifA4U0pbRYRSCGJJnqUf/tGDyn0Cup6FzkJPMIKOEvdfeYp4xQ1hIfae7gMd4CAcV fn2VgDYeEuuoxzMBwmNYCaFvdRyuDlRbHyRfuAPU3ObaQXakDbv+FrLBTXj30Nu0lhjR T5Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Eid7rb5+; 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 Received: from theia.8bytes.org (8bytes.org. [2a01:238:4383:600:38bc:a715:4b6d:a889]) by mx.google.com with ESMTPS id s7-v6si330244eda.85.2018.07.18.02.41.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jul 2018 02:41:36 -0700 (PDT) Received-SPF: pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) client-ip=2a01:238:4383:600:38bc:a715:4b6d:a889; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Eid7rb5+; 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 Received: by theia.8bytes.org (Postfix, from userid 1000) id EE5E09D8; Wed, 18 Jul 2018 11:41:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1531906883; bh=w6IEnwiFb5igPoQcBU4Vm3UbctYunXcFUtJ3fSOqaF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eid7rb5+hpFZ4wrdgci886sJpgN4kKJ6vR1WWK52lZnoIuKRQ1JkapQfDLcPulhCE idzrLlJs3qV22nH7QEieDIsqZdf6pIPk65Tggf6octke2pkU4vPo+llkJ0eIO26vHQ e31ICPyN6j2IPI4LxsB5WSdvwy9oz08sbObQZFxZI0vMqeOMSLJtqBwaAdOxx4xw3k cIry3Uj2J22oZTx/Dfzrcce/Ak0e6sTDVv5NyQbv5bFmEtBUmA4xnmpCnVE+VM9Bco DVvuVnwu2QXg+KzGSHc4Jxq3V6+Him448m68RbJU7GAAVjRNesRfzrTMF9fAZYEG2x sfYOuU5h2q2pg== 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 29/39] x86/mm/pti: Introduce pti_finalize() Date: Wed, 18 Jul 2018 11:41:06 +0200 Message-Id: <1531906876-13451-30-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531906876-13451-1-git-send-email-joro@8bytes.org> References: <1531906876-13451-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 Introduce a new function to finalize the kernel mappings for the userspace page-table after all ro/nx protections have been applied to the kernel mappings. Also move the call to pti_clone_kernel_text() to that function so that it will run on 32 bit kernels too. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/pti.h | 3 +-- arch/x86/mm/init_64.c | 6 ------ arch/x86/mm/pti.c | 14 +++++++++++++- include/linux/pti.h | 1 + init/main.c | 7 +++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/pti.h b/arch/x86/include/asm/pti.h index 38a17f1..5df09a0 100644 --- a/arch/x86/include/asm/pti.h +++ b/arch/x86/include/asm/pti.h @@ -6,10 +6,9 @@ #ifdef CONFIG_PAGE_TABLE_ISOLATION extern void pti_init(void); extern void pti_check_boottime_disable(void); -extern void pti_clone_kernel_text(void); +extern void pti_finalize(void); #else static inline void pti_check_boottime_disable(void) { } -static inline void pti_clone_kernel_text(void) { } #endif #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index a688617..9b19f9a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1291,12 +1291,6 @@ void mark_rodata_ro(void) (unsigned long) __va(__pa_symbol(_sdata))); debug_checkwx(); - - /* - * Do this after all of the manipulation of the - * kernel text page tables are complete. - */ - pti_clone_kernel_text(); } int kern_addr_valid(unsigned long addr) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index fc77054..1825f30 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -462,7 +462,7 @@ static inline bool pti_kernel_image_global_ok(void) * For some configurations, map all of kernel text into the user page * tables. This reduces TLB misses, especially on non-PCID systems. */ -void pti_clone_kernel_text(void) +static void pti_clone_kernel_text(void) { /* * rodata is part of the kernel image and is normally @@ -526,3 +526,15 @@ void __init pti_init(void) pti_setup_espfix64(); pti_setup_vsyscall(); } + +/* + * Finalize the kernel mappings in the userspace page-table. + */ +void pti_finalize(void) +{ + /* + * Do this after all of the manipulation of the + * kernel text page tables are complete. + */ + pti_clone_kernel_text(); +} diff --git a/include/linux/pti.h b/include/linux/pti.h index 0174883..1a941ef 100644 --- a/include/linux/pti.h +++ b/include/linux/pti.h @@ -6,6 +6,7 @@ #include #else static inline void pti_init(void) { } +static inline void pti_finalize(void) { } #endif #endif diff --git a/init/main.c b/init/main.c index 3b4ada1..fcfef46 100644 --- a/init/main.c +++ b/init/main.c @@ -1065,6 +1065,13 @@ static int __ref kernel_init(void *unused) jump_label_invalidate_initmem(); free_initmem(); mark_readonly(); + + /* + * Kernel mappings are now finalized - update the userspace page-table + * to finalize PTI. + */ + pti_finalize(); + system_state = SYSTEM_RUNNING; numa_default_policy();