From patchwork Fri Apr 28 09:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Wenlong X-Patchwork-Id: 88577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp823745vqo; Fri, 28 Apr 2023 03:16:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZT+Dc9F+HTDw53sD6pBeK6N8xmLtQqPyG+PfNyrRDPikbtLez8qH0g9bW+iguDmper5e9 X-Received: by 2002:a17:90b:33c6:b0:247:761d:a6af with SMTP id lk6-20020a17090b33c600b00247761da6afmr4610727pjb.17.1682676985007; Fri, 28 Apr 2023 03:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682676984; cv=none; d=google.com; s=arc-20160816; b=MGxK/sSf7WsrPuih2V6Wi+eLYf3WSKqDtOvezVNWMev2TBUuahlS6Jun2E0hqn8iRi UNs3VlTSe9wBbczoZCrsdjUn1TZtrxWGORA2oXTWxZsIMGDJsfs2/AVCmu66KuuE4mo3 syXza0a4Z2GF45JaJSllzg4DgQLiQq1dWK6xKQ+OvHNzRtk2YcRVO8S8haQjk5c/y5Yr 5yY9/WAeFEx8+WXFNj/7ZkBSAtCrbh6e5GBmOi7+NSXoaE6f8VcakMbixZkWfcTR/9Yh pKJxeLGn2u6z4giGfLJZK7Cw5NDj2haHT9jMDviBewmErzOVlOQwhHN4tMKA3kp14BBZ tUvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=S+3cKGZSPgUq9ZBegD57ImzSDDuV1K0UNaNvu3Oil/Q=; b=XootoEkM41w0Aeb40vxzpWuddmMc2rMTejbTTtaxmmZme3SuuqNsNsffeeuLGxe14G LaIDc3Ds7cWo/HrVyH7rGHVWufVyG+ybzpRUPhnSKnu1f/bIckoqv7RzpjXL5cS8sa20 stuMbkFPplVGz9wcl6htWIksP9V7ONjTRW3wEKI/gOoc5DcpPf7lM/wETGQreB5r1lFd 14gu28lXHSR6BzLhWyZ5LDkDzM7usgYg//JIH+AM4h5rWTc15L2zt3WW41rywVT9qhv6 nlVsmncbgB2wzOexotzbQhEYmlG/JBER9R8eoEJa5e8S9zIYTy/RPfXWxa0j7WHoZppG Ahpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id im16-20020a170902bb1000b001a6a50d6526si20326049plb.579.2023.04.28.03.16.08; Fri, 28 Apr 2023 03:16:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=antgroup.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345948AbjD1J4P (ORCPT + 99 others); Fri, 28 Apr 2023 05:56:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345954AbjD1JzY (ORCPT ); Fri, 28 Apr 2023 05:55:24 -0400 Received: from out187-17.us.a.mail.aliyun.com (out187-17.us.a.mail.aliyun.com [47.90.187.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B677465AB for ; Fri, 28 Apr 2023 02:55:07 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047190;MF=houwenlong.hwl@antgroup.com;NM=1;PH=DS;RN=17;SR=0;TI=SMTPD_---.STFoGjm_1682675641; Received: from localhost(mailfrom:houwenlong.hwl@antgroup.com fp:SMTPD_---.STFoGjm_1682675641) by smtp.aliyun-inc.com; Fri, 28 Apr 2023 17:54:02 +0800 From: "Hou Wenlong" To: linux-kernel@vger.kernel.org Cc: "Thomas Garnier" , "Lai Jiangshan" , "Kees Cook" , "Hou Wenlong" , "Thomas Gleixner" , "Ingo Molnar" , "Borislav Petkov" , "Dave Hansen" , , "H. Peter Anvin" , "Andy Lutomirski" , "Peter Zijlstra" , "Juergen Gross" , "Anshuman Khandual" , "Josh Poimboeuf" , "Pasha Tatashin" Subject: [PATCH RFC 39/43] x86/fixmap: Unify FIXADDR_TOP Date: Fri, 28 Apr 2023 17:51:19 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764414702283561328?= X-GMAIL-MSGID: =?utf-8?q?1764414702283561328?= Now FIXADDR_TOP is nothing to do with vsyscall page, it can be declared as variable too for x86_64, so unify it for x86. Suggested-by: Lai Jiangshan Signed-off-by: Hou Wenlong Cc: Thomas Garnier Cc: Kees Cook --- arch/x86/include/asm/fixmap.h | 13 ------------- arch/x86/kernel/head64.c | 1 - arch/x86/mm/dump_pagetables.c | 3 ++- arch/x86/mm/ioremap.c | 5 ++--- arch/x86/mm/pgtable.c | 13 +++++++++++++ arch/x86/mm/pgtable_32.c | 3 --- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index eeb152ad9682..9433109e4853 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -40,21 +40,8 @@ #include #endif -/* - * We can't declare FIXADDR_TOP as variable for x86_64 because vsyscall - * uses fixmaps that relies on FIXADDR_TOP for proper address calculation. - * Because of this, FIXADDR_TOP x86 integration was left as later work. - */ -#ifdef CONFIG_X86_32 -/* - * Leave one empty page between vmalloc'ed areas and - * the start of the fixmap. - */ extern unsigned long __FIXADDR_TOP; #define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP) -#else -#define FIXADDR_TOP (0xffffffffff600000UL - PAGE_SIZE) -#endif /* * Here we define all the compile-time 'special' virtual diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index ef7ad96f2154..8295b547b64f 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -499,7 +499,6 @@ asmlinkage __visible void __init __noreturn x86_64_start_kernel(char * real_mode BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL)); MAYBE_BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == (__START_KERNEL & PGDIR_MASK))); - BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) <= MODULES_END); cr4_init_shadow(); diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index e1b599ecbbc2..df1a708a038a 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -104,7 +104,7 @@ static struct addr_marker address_markers[] = { [HIGH_KERNEL_NR] = { __START_KERNEL_map, "High Kernel Mapping" }, [MODULES_VADDR_NR] = { MODULES_VADDR, "Modules" }, [MODULES_END_NR] = { MODULES_END, "End Modules" }, - [FIXADDR_START_NR] = { FIXADDR_START, "Fixmap Area" }, + [FIXADDR_START_NR] = { 0UL, "Fixmap Area" }, [END_OF_SPACE_NR] = { -1, NULL } }; @@ -453,6 +453,7 @@ static int __init pt_dump_init(void) address_markers[KASAN_SHADOW_START_NR].start_address = KASAN_SHADOW_START; address_markers[KASAN_SHADOW_END_NR].start_address = KASAN_SHADOW_END; #endif + address_markers[FIXADDR_START_NR].start_address = FIXADDR_START; #endif #ifdef CONFIG_X86_32 address_markers[VMALLOC_START_NR].start_address = VMALLOC_START; diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index aa7d279321ea..44f9c6781c15 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -879,10 +879,9 @@ void __init early_ioremap_init(void) pmd_t *pmd; #ifdef CONFIG_X86_64 - BUILD_BUG_ON((fix_to_virt(0) + PAGE_SIZE) & ((1 << PMD_SHIFT) - 1)); -#else - WARN_ON((fix_to_virt(0) + PAGE_SIZE) & ((1 << PMD_SHIFT) - 1)); + BUG_ON(__fix_to_virt(__end_of_fixed_addresses) <= MODULES_END); #endif + WARN_ON((fix_to_virt(0) + PAGE_SIZE) & ((1 << PMD_SHIFT) - 1)); early_ioremap_setup(); diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index afab0bc7862b..726c0c369676 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -627,6 +627,19 @@ pmd_t pmdp_invalidate_ad(struct vm_area_struct *vma, unsigned long address, } #endif +#ifdef CONFIG_X86_32 +/* + * Leave one empty page between vmalloc'ed areas and + * the start of the fixmap. + */ +#define __FIXADDR_TOP_BASE 0xfffff000 +#else +#define __FIXADDR_TOP_BASE (0xffffffffff600000UL - PAGE_SIZE) +#endif + +unsigned long __FIXADDR_TOP = __FIXADDR_TOP_BASE; +EXPORT_SYMBOL(__FIXADDR_TOP); + /** * reserve_top_address - reserves a hole in the top of kernel address space * @reserve - size of hole to reserve diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index c234634e26ba..2b9a00976fee 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -65,9 +65,6 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval) flush_tlb_one_kernel(vaddr); } -unsigned long __FIXADDR_TOP = 0xfffff000; -EXPORT_SYMBOL(__FIXADDR_TOP); - /* * vmalloc=size forces the vmalloc area to be exactly 'size' * bytes. This can be used to increase (or decrease) the