From patchwork Mon Jun 8 12:54:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 11593313 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8202590 for ; Mon, 8 Jun 2020 12:55:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5855F2083E for ; Mon, 8 Jun 2020 12:55:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5855F2083E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 831C76B0008; Mon, 8 Jun 2020 08:55:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7E0F46B000A; Mon, 8 Jun 2020 08:55:02 -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 6CF9D6B000C; Mon, 8 Jun 2020 08:55:02 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0126.hostedemail.com [216.40.44.126]) by kanga.kvack.org (Postfix) with ESMTP id 4E6126B0008 for ; Mon, 8 Jun 2020 08:55:02 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 0257C805173F for ; Mon, 8 Jun 2020 12:55:02 +0000 (UTC) X-FDA: 76906039644.20.bird47_041737e26dba Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 34376180C2DE9 for ; Mon, 8 Jun 2020 12:54:38 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,kirill.shutemov@linux.intel.com,,RULES_HIT:30003:30051:30054:30064:30070,0,RBL:192.55.52.88:@linux.intel.com:.lbl8.mailshell.net-64.95.201.95 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: bird47_041737e26dba X-Filterd-Recvd-Size: 4187 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Jun 2020 12:54:37 +0000 (UTC) IronPort-SDR: 9lgP/L4FC7phtFhMZkjChnCVj9Nrdg2t01aTx4m8ywCURX0UZChYujk9wKNzTsfPb0OQjrgPfo GQxio6IJ57MQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 05:54:35 -0700 IronPort-SDR: KEqQaB2sMxoC1CNPxMnKuLgPvBAWbnAy77aEs/+afjjth1efB6uzAqm4c8Z6yQ8Lu1VYKdFS4v aMzv5FS6xobg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,487,1583222400"; d="scan'208";a="349160340" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 08 Jun 2020 05:54:31 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id ADB65180; Mon, 8 Jun 2020 15:54:30 +0300 (EEST) From: "Kirill A. Shutemov" To: Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Cc: Dan Williams , Tony Luck , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , Dave Hansen , stable@vger.kernel.org Subject: [PATCHv2 1/2] x86/mm: Fix boot with some memory above MAXMEM Date: Mon, 8 Jun 2020 15:54:23 +0300 Message-Id: <20200608125424.70198-2-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.27.0.rc2 In-Reply-To: <20200608125424.70198-1-kirill.shutemov@linux.intel.com> References: <20200608125424.70198-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 34376180C2DE9 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: A 5-level paging capable machine can have memory above 46-bit in the physical address space. This memory is only addressable in the 5-level paging mode: we don't have enough virtual address space to create direct mapping for such memory in the 4-level paging mode. Currently, we fail boot completely: NULL pointer dereference in subsection_map_init(). Skip creating a memblock for such memory instead and notify user that some memory is not addressable. Signed-off-by: Kirill A. Shutemov Reviewed-by: Dave Hansen Cc: stable@vger.kernel.org # v4.14 Reviewed-by: Mike Rapoport Reported-by: kernel test robot --- arch/x86/kernel/e820.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index c5399e80c59c..c10bab121916 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -1280,8 +1281,8 @@ void __init e820__memory_setup(void) void __init e820__memblock_setup(void) { + u64 size, end, not_addressable = 0; int i; - u64 end; /* * The bootstrap memblock region count maximum is 128 entries @@ -1307,7 +1308,26 @@ void __init e820__memblock_setup(void) if (entry->type != E820_TYPE_RAM && entry->type != E820_TYPE_RESERVED_KERN) continue; - memblock_add(entry->addr, entry->size); + if (entry->addr >= MAXMEM) { + not_addressable += entry->size; + continue; + } + + end = min_t(u64, end, MAXMEM - 1); + size = end - entry->addr; + not_addressable += entry->size - size; + memblock_add(entry->addr, size); + } + + if (not_addressable) { + char tmp[10]; + + string_get_size(not_addressable, 1, STRING_UNITS_2, tmp, sizeof(tmp)); + pr_err("%s of physical memory is not addressable in the %s paging mode\n", + tmp, pgtable_l5_enabled() ? "5-level" : "4-level"); + + if (!pgtable_l5_enabled()) + pr_err("Consider enabling 5-level paging\n"); } /* Throw away partial pages: */ From patchwork Mon Jun 8 12:54:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 11593309 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86AB190 for ; Mon, 8 Jun 2020 12:54:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5CEAA206C3 for ; Mon, 8 Jun 2020 12:54:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CEAA206C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E9DFF6B0005; Mon, 8 Jun 2020 08:54:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E26E66B0006; Mon, 8 Jun 2020 08:54:38 -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 C9ED36B0007; Mon, 8 Jun 2020 08:54:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id AC3926B0005 for ; Mon, 8 Jun 2020 08:54:38 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6BC6C1849A for ; Mon, 8 Jun 2020 12:54:38 +0000 (UTC) X-FDA: 76906038636.06.rake72_051123326dba Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 34F0910044BD1 for ; Mon, 8 Jun 2020 12:54:38 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,kirill.shutemov@linux.intel.com,,RULES_HIT:30003:30054:30064,0,RBL:134.134.136.24:@linux.intel.com:.lbl8.mailshell.net-62.18.0.100 64.95.201.95,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:35,LUA_SUMMARY:none X-HE-Tag: rake72_051123326dba X-Filterd-Recvd-Size: 3432 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Jun 2020 12:54:37 +0000 (UTC) IronPort-SDR: 8Zypt/lBudfUM62SnSEJQI7DorpwvYN167Z0ykT8x/eAzdEzxp0ZlMG+c6fl1lkLJqXWn3+aAy Ru2GN3PayXlg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 05:54:35 -0700 IronPort-SDR: 1b8quhAFTc0jTTKs/rYqChdSLNXYuK3WRXwZzr9Psx945UHNW9hL4q5aATK7R5VRm2CTBOEsrw gwZgyTA08fxg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,487,1583222400"; d="scan'208";a="270496420" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 08 Jun 2020 05:54:31 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id B8D1D25A; Mon, 8 Jun 2020 15:54:30 +0300 (EEST) From: "Kirill A. Shutemov" To: Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Cc: Dan Williams , Tony Luck , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , Dave Hansen , stable@vger.kernel.org Subject: [PATCHv2 2/2] x86/boot/KASLR: Fix boot with some memory above MAXMEM Date: Mon, 8 Jun 2020 15:54:24 +0300 Message-Id: <20200608125424.70198-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.27.0.rc2 In-Reply-To: <20200608125424.70198-1-kirill.shutemov@linux.intel.com> References: <20200608125424.70198-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 34F0910044BD1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: A 5-level paging capable machine can have memory above 46-bit in the physical address space. This memory is only addressable in the 5-level paging mode: we don't have enough virtual address space to create direct mapping for such memory in the 4-level paging mode Teach KASLR to avoid memory regions above MAXMEM or truncate the region if the end is above MAXMEM. Signed-off-by: Kirill A. Shutemov Reviewed-by: Dave Hansen Cc: stable@vger.kernel.org # v4.14 Reviewed-by: Mike Rapoport --- arch/x86/boot/compressed/kaslr.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index d7408af55738..99db18eeb40e 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -695,7 +695,18 @@ static bool process_mem_region(struct mem_vector *region, unsigned long long minimum, unsigned long long image_size) { + unsigned long long end; int i; + + /* Cannot access memory region above MAXMEM: skip it. */ + if (region->start >= MAXMEM) + return 0; + + /* Truncate the region if the end is above MAXMEM */ + end = region->start + region->size; + end = min_t(unsigned long long, end, MAXMEM - 1); + region->size = end - region->start; + /* * If no immovable memory found, or MEMORY_HOTREMOVE disabled, * use @region directly.