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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_GIT 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 23C22C61DD8 for ; Mon, 16 Nov 2020 14:49:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9DCB22314 for ; Mon, 16 Nov 2020 14:49:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="QVz7Gb2v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730584AbgKPOtA (ORCPT ); Mon, 16 Nov 2020 09:49:00 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:39060 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728759AbgKPOs7 (ORCPT ); Mon, 16 Nov 2020 09:48:59 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0AGEiZuS195345; Mon, 16 Nov 2020 14:48:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=AJUnYl9q2aFNqQHIPc035IxF21kJkzcWxb0zMqd1WJ4=; b=QVz7Gb2vK8Yar3r5QO8C9/xT7W7K50H1KW1bvTKd55NyW5Shb1NuS48GRsBANOamoURe 4bhNL80y9x1NxBsiVFZv/kTwboZVoMQcvv3mYapDe4fQhlmH+wCbJ9RxXBg7QurYBTH3 MEcV+2tGs0jTSjO79rzlbvIcPcMvF2jvL7gNfGS0ThhGdgtI+mHfdHReBiMWdm/gDqn1 obLRZkbWCexEFd4YbZtzk+eF2VC+6bMBBxFyF8hR4cr9cSSd9zvIZMUaMucgV32XbuZA 80tGSFr0nPDVeD09nwfVcTb4V6BTBmVtJSjHLiMarXHE5Qkz3i/WqWzoMgjn/99kUQN9 Jg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 34t76knd3n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 16 Nov 2020 14:48:40 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0AGEjPEa051719; Mon, 16 Nov 2020 14:46:40 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 34ts0phb9m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Nov 2020 14:46:40 +0000 Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0AGEkciC014766; Mon, 16 Nov 2020 14:46:38 GMT Received: from localhost.localdomain (/92.157.91.83) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 16 Nov 2020 06:46:38 -0800 From: Alexandre Chartre To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, x86@kernel.org, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, thomas.lendacky@amd.com, jroedel@suse.de Cc: konrad.wilk@oracle.com, jan.setjeeilers@oracle.com, junaids@google.com, oweisse@google.com, rppt@linux.vnet.ibm.com, graf@amazon.de, mgross@linux.intel.com, kuzuno@gmail.com, alexandre.chartre@oracle.com Subject: [RFC][PATCH v2 09/21] x86/pti: Function to clone page-table entries from a specified mm Date: Mon, 16 Nov 2020 15:47:45 +0100 Message-Id: <20201116144757.1920077-10-alexandre.chartre@oracle.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20201116144757.1920077-1-alexandre.chartre@oracle.com> References: <20201116144757.1920077-1-alexandre.chartre@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9806 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011160090 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9806 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 adultscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011160090 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PTI has a function to clone page-table entries but only from the init_mm page-table. Provide a new function to clone page-table entries from a specified mm page-table. Signed-off-by: Alexandre Chartre --- arch/x86/include/asm/pti.h | 10 ++++++++++ arch/x86/mm/pti.c | 32 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/arch/x86/include/asm/pti.h b/arch/x86/include/asm/pti.h index 07375b476c4f..5484e69ff8d3 100644 --- a/arch/x86/include/asm/pti.h +++ b/arch/x86/include/asm/pti.h @@ -4,9 +4,19 @@ #ifndef __ASSEMBLY__ #ifdef CONFIG_PAGE_TABLE_ISOLATION + +enum pti_clone_level { + PTI_CLONE_PMD, + PTI_CLONE_PTE, +}; + +struct mm_struct; + extern void pti_init(void); extern void pti_check_boottime_disable(void); extern void pti_finalize(void); +extern void pti_clone_pgtable(struct mm_struct *mm, unsigned long start, + unsigned long end, enum pti_clone_level level); #else static inline void pti_check_boottime_disable(void) { } #endif diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 1aab92930569..ebc8cd2f1cd8 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -294,14 +294,8 @@ static void __init pti_setup_vsyscall(void) static void __init pti_setup_vsyscall(void) { } #endif -enum pti_clone_level { - PTI_CLONE_PMD, - PTI_CLONE_PTE, -}; - -static void -pti_clone_pgtable(unsigned long start, unsigned long end, - enum pti_clone_level level) +void pti_clone_pgtable(struct mm_struct *mm, unsigned long start, + unsigned long end, enum pti_clone_level level) { unsigned long addr; @@ -320,7 +314,7 @@ pti_clone_pgtable(unsigned long start, unsigned long end, if (addr < start) break; - pgd = pgd_offset_k(addr); + pgd = pgd_offset(mm, addr); if (WARN_ON(pgd_none(*pgd))) return; p4d = p4d_offset(pgd, addr); @@ -409,6 +403,12 @@ pti_clone_pgtable(unsigned long start, unsigned long end, } } +static void pti_clone_init_pgtable(unsigned long start, unsigned long end, + enum pti_clone_level level) +{ + pti_clone_pgtable(&init_mm, start, end, level); +} + #ifdef CONFIG_X86_64 /* * Clone a single p4d (i.e. a top-level entry on 4-level systems and a @@ -476,7 +476,7 @@ static void __init pti_clone_user_shared(void) start = CPU_ENTRY_AREA_BASE; end = start + (PAGE_SIZE * CPU_ENTRY_AREA_PAGES); - pti_clone_pgtable(start, end, PTI_CLONE_PMD); + pti_clone_init_pgtable(start, end, PTI_CLONE_PMD); } #endif /* CONFIG_X86_64 */ @@ -495,9 +495,9 @@ static void __init pti_setup_espfix64(void) */ static void pti_clone_entry_text(void) { - pti_clone_pgtable((unsigned long) __entry_text_start, - (unsigned long) __entry_text_end, - PTI_CLONE_PMD); + pti_clone_init_pgtable((unsigned long) __entry_text_start, + (unsigned long) __entry_text_end, + PTI_CLONE_PMD); } /* @@ -572,11 +572,11 @@ static void pti_clone_kernel_text(void) * pti_set_kernel_image_nonglobal() did to clear the * global bit. */ - pti_clone_pgtable(start, end_clone, PTI_LEVEL_KERNEL_IMAGE); + pti_clone_init_pgtable(start, end_clone, PTI_LEVEL_KERNEL_IMAGE); /* - * pti_clone_pgtable() will set the global bit in any PMDs - * that it clones, but we also need to get any PTEs in + * pti_clone_init_pgtable() will set the global bit in any + * PMDs that it clones, but we also need to get any PTEs in * the last level for areas that are not huge-page-aligned. */ -- 2.18.4