From patchwork Fri Feb 17 20:52:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9580777 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 69E416049F for ; Fri, 17 Feb 2017 20:53:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A87E285F4 for ; Fri, 17 Feb 2017 20:53:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E9B32877E; Fri, 17 Feb 2017 20:53:22 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0F4A2877C for ; Fri, 17 Feb 2017 20:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935059AbdBQUxF (ORCPT ); Fri, 17 Feb 2017 15:53:05 -0500 Received: from mail-it0-f48.google.com ([209.85.214.48]:36212 "EHLO mail-it0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935050AbdBQUxB (ORCPT ); Fri, 17 Feb 2017 15:53:01 -0500 Received: by mail-it0-f48.google.com with SMTP id h10so32432564ith.1 for ; Fri, 17 Feb 2017 12:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=SQw9/89pEHbz76KMayuzlWw5cND/zrTW1LMzNn5jl18=; b=cnHiO42VHhmLV2GnBI5KeE7XeSC+yvRSipySEsp8/AU5YsXQ7U8TH1nQAJ3eXxun9B vqNoPO270GTQoBdy7QRfYs5wKcdbtfn65y6bGtb9fX2H4t5Xdj9esAxFsAi6SEwDN20c 8pTZMM+P6FUDcMOJtLIs2YVHCjTao7BgXEejz0mtp8n3JIpzmaooKlzqvhnBXNVsLbx7 S/DQ5m3nNtvCM9nGRVbNI1l6N17uQM52ZTTY3T4708+kT4iC+6qzVcukzrlgXLHGPfXe uB7Niy+iH0ybpTNTpMGHlZsKi+MUkg8hXi0ldVwMFS36xEe9nVyAR3ffYaQGdQjVjyo9 XONQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=SQw9/89pEHbz76KMayuzlWw5cND/zrTW1LMzNn5jl18=; b=aLjNzvmrmaW+Vonl5Gews49LFCc2O6/v2n5Ym6lac6woSXwnzFqA+5CqFH5KX9Lo3Z 7L0ZqwT1pNUPK50/TEYH3PCR/oeBMLVfCeEUCq0kExS9rTwpqZkotvCaQa9b7LKrOY23 /qn+KUTXVLum2BhjjDPi4y25mgayqd1Vjt0E0AF7oevTCOtzZ88Im2QcEsGNUrPJP0Wc xA8WLkA0qPJ7V8icllK8hQa7noC4/UR/ydfVlvdl9eHMhuUODl6Vp/FhYKKkz2OvpSEb UVVxCNmUUBFx/42Q1SsOefm+29lZl+XjotEZynUX1JAS93w38ukGj4pBrf3Fsp3dk1Dn VfOQ== X-Gm-Message-State: AMke39kcIDqXUf3xUK97MT37sjllzGXIOm9xbKXP2zHspxIvVBgn0Af41jPC/ryzgs0NpdfCwTUKzbk6DTmXLpLn X-Received: by 10.36.20.216 with SMTP id 207mr6427430itg.61.1487364779582; Fri, 17 Feb 2017 12:52:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.52.13 with HTTP; Fri, 17 Feb 2017 12:52:59 -0800 (PST) In-Reply-To: References: <20170216215438.126111-1-thgarnie@google.com> <201702170838.cW5onrBk%fengguang.wu@intel.com> From: Thomas Garnier Date: Fri, 17 Feb 2017 12:52:59 -0800 Message-ID: Subject: Re: [PATCH v4 1/4] x86/mm: Adapt MODULES_END based on Fixmap section size To: kbuild test robot Cc: kbuild-all@01.org, Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Jonathan Corbet , Kees Cook , Lorenzo Stoakes , Juergen Gross , Andy Lutomirski , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Jiri Kosina , Matt Fleming , Ard Biesheuvel , Boris Ostrovsky , Rusty Russell , Borislav Petkov , Christian Borntraeger , Brian Gerst , He Chen , "Luis R . Rodriguez" , Stanislaw Gruszka , Arnd Bergmann , Peter Zijlstra , Dave Hansen , Vitaly Kuznetsov , Paul Gortmaker , Josh Poimboeuf , Tim Chen , Andi Kleen , Jiri Olsa , Michael Ellerman , Joerg Roedel , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Andy Lutomirski , "the arch/x86 maintainers" , LKML , linux-doc@vger.kernel.org, Linux PM list , linux-efi@vger.kernel.org, xen-devel@lists.xenproject.org, lguest@lists.ozlabs.org, kvm list , Kernel Hardening Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch aligns MODULES_END to the beginning of the Fixmap section. It optimizes the space available for both sections. The address is pre-computed based on the number of pages required by the Fixmap section. It will allow GDT remapping in the Fixmap section. The current MODULES_END static address does not provide enough space for the kernel to support a large number of processors. Signed-off-by: Thomas Garnier --- Based on next-20170213 Fixed fixmap dependencies on random configurations. --- Documentation/x86/x86_64/mm.txt | 5 ++++- arch/x86/include/asm/pgtable_64_types.h | 3 ++- arch/x86/kernel/module.c | 1 + arch/x86/mm/dump_pagetables.c | 1 + arch/x86/mm/kasan_init_64.c | 1 + mm/vmalloc.c | 1 + 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt index 5724092db811..ee3f9c30957c 100644 --- a/Documentation/x86/x86_64/mm.txt +++ b/Documentation/x86/x86_64/mm.txt @@ -19,7 +19,7 @@ ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space ... unused hole ... ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0 -ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space +ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space (variable) ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole @@ -39,6 +39,9 @@ memory window (this size is arbitrary, it can be raised later if needed). The mappings are not part of any other kernel PGD and are only available during EFI runtime calls. +The module mapping space size changes based on the CONFIG requirements for the +following fixmap section. + Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all physical memory, vmalloc/ioremap space and virtual memory map are randomized. Their order is preserved but their base will be offset early at boot time. diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h index 3a264200c62f..bb05e21cf3c7 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -67,7 +67,8 @@ typedef struct { pteval_t pte; } pte_t; #endif /* CONFIG_RANDOMIZE_MEMORY */ #define VMALLOC_END (VMALLOC_START + _AC((VMALLOC_SIZE_TB << 40) - 1, UL)) #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE) -#define MODULES_END _AC(0xffffffffff000000, UL) +/* The module sections ends with the start of the fixmap */ +#define MODULES_END __fix_to_virt(__end_of_fixed_addresses + 1) #define MODULES_LEN (MODULES_END - MODULES_VADDR) #define ESPFIX_PGD_ENTRY _AC(-2, UL) #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT) diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index 477ae806c2fa..fad61caac75e 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -35,6 +35,7 @@ #include #include #include +#include #if 0 #define DEBUGP(fmt, ...) \ diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 8aa6bea1cd6c..90170415f08a 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -19,6 +19,7 @@ #include #include +#include /* * The dumper groups pagetable entries of the same type into one, and for diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 0493c17b8a51..34f167cf3316 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -8,6 +8,7 @@ #include #include +#include extern pgd_t early_level4_pgt[PTRS_PER_PGD]; extern struct range pfn_mapped[E820_X_MAX]; diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 011b446f8758..84e637f2fa49 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "internal.h"