From nobody Sun Nov 24 13:13:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1723027294824700.3246941717729; Wed, 7 Aug 2024 03:41:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.773371.1183818 (Exim 4.92) (envelope-from ) id 1sbe6c-0003J5-Jp; Wed, 07 Aug 2024 10:41:22 +0000 Received: by outflank-mailman (output) from mailman id 773371.1183818; Wed, 07 Aug 2024 10:41:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6c-0003Iw-GK; Wed, 07 Aug 2024 10:41:22 +0000 Received: by outflank-mailman (input) for mailman id 773371; Wed, 07 Aug 2024 10:41:21 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6a-0003I0-VR for xen-devel@lists.xenproject.org; Wed, 07 Aug 2024 10:41:20 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2a07:de40:b251:101:10:150:64:1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 950adb50-54a9-11ef-bc04-fd08da9f4363; Wed, 07 Aug 2024 12:41:20 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id AA10021CFE; Wed, 7 Aug 2024 10:41:19 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 54CC513297; Wed, 7 Aug 2024 10:41:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id j747E09Ps2YQIgAAD6G6ig (envelope-from ); Wed, 07 Aug 2024 10:41:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 950adb50-54a9-11ef-bc04-fd08da9f4363 Authentication-Results: smtp-out1.suse.de; none From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org, =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 1/5] xen: use correct end address of kernel for conflict checking Date: Wed, 7 Aug 2024 12:41:06 +0200 Message-ID: <20240807104110.18117-2-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807104110.18117-1-jgross@suse.com> References: <20240807104110.18117-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Rspamd-Queue-Id: AA10021CFE X-Spam-Level: X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -4.00 X-ZM-MESSAGEID: 1723027296173116600 When running as a Xen PV dom0 the kernel is loaded by the hypervisor using a different memory map than that of the host. In order to minimize the required changes in the kernel, the kernel adapts its memory map to that of the host. In order to do that it is checking for conflicts of its load address with the host memory map. Unfortunately the tested memory range does not include the .brk area, which might result in crashes or memory corruption when this area does conflict withe the memory map of the host. Fix the test by using the _end label instead of __bss_stop. Fixes: 808fdb71936c ("xen: check for kernel memory conflicting with memory = layout") Signed-off-by: Juergen Gross Tested-by: Marek Marczykowski-G=C3=B3recki --- arch/x86/xen/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 806ddb2391d9..4bcc70a71b7d 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -825,7 +825,7 @@ char * __init xen_memory_setup(void) * to relocating (and even reusing) pages with kernel text or data. */ if (xen_is_e820_reserved(__pa_symbol(_text), - __pa_symbol(__bss_stop) - __pa_symbol(_text))) { + __pa_symbol(_end) - __pa_symbol(_text))) { xen_raw_console_write("Xen hypervisor allocated kernel memory conflicts = with E820 map\n"); BUG(); } --=20 2.43.0 From nobody Sun Nov 24 13:13:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1723027301; cv=none; d=zohomail.com; s=zohoarc; b=eb/QAzlFir6NcRYQmFb4jfDxf62hz3aqojUCP82iDEwIA77IDvNBEd7t8aY5rD0lWyvy5aHsCI7+msuvInj6u6xPV43y/6nvN9+B13avBQVqJUiepJ8ONHMLcwEJ9YSrAR3b5+MGjvYN0PG/700X/14PbeZgRkotIUh/p6PigGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723027301; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LEPD7L+PrX6jbrsj5UZebNb1W2NcisUaeKba9OJ0nRo=; b=hGvmiLXx5pzyg3nF70je0dCaJ4TbAX5Ujl0c5u3Vx2h0ou83XXZcza25Nw5kEJXm6YJU773hNOl3Wr5jN4II+33KzqqN5hs/td5ip3nkpREF5LUaO2/FEoH8VF0qh9dl6ZztcUdeFhGKIUvaYL+DovsKxg1EqIJfilRQ5UEdegs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 172302730147282.82706664255556; Wed, 7 Aug 2024 03:41:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.773372.1183828 (Exim 4.92) (envelope-from ) id 1sbe6i-0003cS-Rq; Wed, 07 Aug 2024 10:41:28 +0000 Received: by outflank-mailman (output) from mailman id 773372.1183828; Wed, 07 Aug 2024 10:41:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6i-0003cL-O2; Wed, 07 Aug 2024 10:41:28 +0000 Received: by outflank-mailman (input) for mailman id 773372; Wed, 07 Aug 2024 10:41:27 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6h-00033N-Ju for xen-devel@lists.xenproject.org; Wed, 07 Aug 2024 10:41:27 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 95841f90-54a9-11ef-8776-851b0ebba9a2; Wed, 07 Aug 2024 12:41:20 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6CD071F807; Wed, 7 Aug 2024 10:41:25 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 15AA813297; Wed, 7 Aug 2024 10:41:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id he/lA1VPs2YeIgAAD6G6ig (envelope-from ); Wed, 07 Aug 2024 10:41:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 95841f90-54a9-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027285; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LEPD7L+PrX6jbrsj5UZebNb1W2NcisUaeKba9OJ0nRo=; b=LUYTC61WgoxQZisyGVLtQzUgwgoTf5pzPem32y7U6kp+DXDzaZOVFxGtlwzDaJE8BxxafK 4S60ze5VkHMB3FOYNGAeiAo1WVqleWsTsCTgkB1mWESWybTjYboqFwf23EellDssAS6NCv EyUl3qhbXGd4fWpKjWypcJRvhYGA09Y= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027285; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LEPD7L+PrX6jbrsj5UZebNb1W2NcisUaeKba9OJ0nRo=; b=LUYTC61WgoxQZisyGVLtQzUgwgoTf5pzPem32y7U6kp+DXDzaZOVFxGtlwzDaJE8BxxafK 4S60ze5VkHMB3FOYNGAeiAo1WVqleWsTsCTgkB1mWESWybTjYboqFwf23EellDssAS6NCv EyUl3qhbXGd4fWpKjWypcJRvhYGA09Y= From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org, =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 2/5] xen: introduce generic helper checking for memory map conflicts Date: Wed, 7 Aug 2024 12:41:07 +0200 Message-ID: <20240807104110.18117-3-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807104110.18117-1-jgross@suse.com> References: <20240807104110.18117-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-7.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,imap1.dmz-prg2.suse.org:helo,invisiblethingslab.com:email] X-Spam-Score: -7.30 X-Spam-Flag: NO X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1723027302153116600 When booting as a Xen PV dom0 the memory layout of the dom0 is modified to match that of the host, as this requires less changes in the kernel for supporting Xen. There are some cases, though, which are problematic, as it is the Xen hypervisor selecting the kernel's load address plus some other data, which might conflict with the host's memory map. These conflicts are detected at boot time and result in a boot error. In order to support handling at least some of these conflicts in future, introduce a generic helper function which will later gain the ability to adapt the memory layout when possible. Add the missing check for the xen_start_info area. Signed-off-by: Juergen Gross Tested-by: Marek Marczykowski-G=C3=B3recki --- arch/x86/xen/mmu_pv.c | 5 +---- arch/x86/xen/setup.c | 34 ++++++++++++++++++++++++++++------ arch/x86/xen/xen-ops.h | 3 ++- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index f1ce39d6d32c..839e6613753d 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -2018,10 +2018,7 @@ void __init xen_reserve_special_pages(void) =20 void __init xen_pt_check_e820(void) { - if (xen_is_e820_reserved(xen_pt_base, xen_pt_size)) { - xen_raw_console_write("Xen hypervisor allocated page table memory confli= cts with E820 map\n"); - BUG(); - } + xen_chk_is_e820_usable(xen_pt_base, xen_pt_size, "page table"); } =20 static unsigned char dummy_mapping[PAGE_SIZE] __page_aligned_bss; diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 4bcc70a71b7d..96765180514b 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -567,7 +567,7 @@ static void __init xen_ignore_unusable(void) } } =20 -bool __init xen_is_e820_reserved(phys_addr_t start, phys_addr_t size) +static bool __init xen_is_e820_reserved(phys_addr_t start, phys_addr_t siz= e) { struct e820_entry *entry; unsigned mapcnt; @@ -624,6 +624,23 @@ phys_addr_t __init xen_find_free_area(phys_addr_t size) return 0; } =20 +/* + * Check for an area in physical memory to be usable for non-movable purpo= ses. + * An area is considered to usable if the used E820 map lists it to be RAM. + * In case the area is not usable, crash the system with an error message. + */ +void __init xen_chk_is_e820_usable(phys_addr_t start, phys_addr_t size, + const char *component) +{ + if (!xen_is_e820_reserved(start, size)) + return; + + xen_raw_console_write("Xen hypervisor allocated "); + xen_raw_console_write(component); + xen_raw_console_write(" memory conflicts with E820 map\n"); + BUG(); +} + /* * Like memcpy, but with physical addresses for dest and src. */ @@ -824,11 +841,16 @@ char * __init xen_memory_setup(void) * Failing now is better than running into weird problems later due * to relocating (and even reusing) pages with kernel text or data. */ - if (xen_is_e820_reserved(__pa_symbol(_text), - __pa_symbol(_end) - __pa_symbol(_text))) { - xen_raw_console_write("Xen hypervisor allocated kernel memory conflicts = with E820 map\n"); - BUG(); - } + xen_chk_is_e820_usable(__pa_symbol(_text), + __pa_symbol(_end) - __pa_symbol(_text), + "kernel"); + + /* + * Check for a conflict of the xen_start_info memory with the target + * E820 map. + */ + xen_chk_is_e820_usable(__pa(xen_start_info), sizeof(*xen_start_info), + "xen_start_info"); =20 /* * Check for a conflict of the hypervisor supplied page tables with diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 0cf16fc79e0b..9a27d1d653d3 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -48,7 +48,8 @@ void xen_mm_unpin_all(void); void __init xen_relocate_p2m(void); #endif =20 -bool __init xen_is_e820_reserved(phys_addr_t start, phys_addr_t size); +void __init xen_chk_is_e820_usable(phys_addr_t start, phys_addr_t size, + const char *component); unsigned long __ref xen_chk_extra_mem(unsigned long pfn); void __init xen_inv_extra_mem(void); void __init xen_remap_memory(void); --=20 2.43.0 From nobody Sun Nov 24 13:13:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1723027304; cv=none; d=zohomail.com; s=zohoarc; b=DYeWLenTISnloyNYcXKfbjf3lKyR8TqQkOAB+BleSJRGy55mICQEGNMTgoZmj/JCn2LNndbbH5+Vzo8rSQsE14nSr8374qLyQbPVZc9s53b8NMmcyyzF6kr23yMmeYNt4s7asDvTxLO8AxJILUc5Pj7Ea2i5GRpLVeRX+o4c2Zs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723027304; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dWJJMR8rBuh/QPRtNN+RcR8hDqRUcjKWCA7J80NLso8=; b=G+41mRSzgytdeSyGX4dJP1qNtKeyv38YBAEMTvnOQq0KZmWvy22CPy1Gh2Ts+faplil1FZbCpj4UoZvxMc7v8/TM9Zoc3451R+mGDCQK1gOk01qFA6es5fw+XCHOFS5a1hNZUvcsinaqUeaX44DxzZ9+3Xf0L/BJGJDwlpgqzMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1723027304304644.3088281197291; Wed, 7 Aug 2024 03:41:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.773373.1183838 (Exim 4.92) (envelope-from ) id 1sbe6o-00044J-AJ; Wed, 07 Aug 2024 10:41:34 +0000 Received: by outflank-mailman (output) from mailman id 773373.1183838; Wed, 07 Aug 2024 10:41:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6o-000448-7H; Wed, 07 Aug 2024 10:41:34 +0000 Received: by outflank-mailman (input) for mailman id 773373; Wed, 07 Aug 2024 10:41:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6n-00033N-Cq for xen-devel@lists.xenproject.org; Wed, 07 Aug 2024 10:41:33 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 98edc35c-54a9-11ef-8776-851b0ebba9a2; Wed, 07 Aug 2024 12:41:26 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4718221D09; Wed, 7 Aug 2024 10:41:31 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DCB2113297; Wed, 7 Aug 2024 10:41:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id su46NFpPs2YkIgAAD6G6ig (envelope-from ); Wed, 07 Aug 2024 10:41:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 98edc35c-54a9-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027291; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dWJJMR8rBuh/QPRtNN+RcR8hDqRUcjKWCA7J80NLso8=; b=qnE8fYFP4gwW+nXwpdR80jZOfndfb8Y101T9TucjArPeBoAuu5NCh26FxkpLUfqHm9d337 JJGGWMlPMDTnN/dryUuQj5wuXwoQlK1gJI5n+rZauRhzL4t5mdByRms8c8ghks23PYC8jV a+m5cWwebAIabk/tl0zpo/Yk4UK4HLQ= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027291; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dWJJMR8rBuh/QPRtNN+RcR8hDqRUcjKWCA7J80NLso8=; b=qnE8fYFP4gwW+nXwpdR80jZOfndfb8Y101T9TucjArPeBoAuu5NCh26FxkpLUfqHm9d337 JJGGWMlPMDTnN/dryUuQj5wuXwoQlK1gJI5n+rZauRhzL4t5mdByRms8c8ghks23PYC8jV a+m5cWwebAIabk/tl0zpo/Yk4UK4HLQ= From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org, =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 3/5] xen: move checks for e820 conflicts further up Date: Wed, 7 Aug 2024 12:41:08 +0200 Message-ID: <20240807104110.18117-4-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807104110.18117-1-jgross@suse.com> References: <20240807104110.18117-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spamd-Result: default: False [-4.30 / 50.00]; REPLY(-4.00)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_SEVEN(0.00)[11]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,invisiblethingslab.com:email,suse.com:email] X-Spam-Flag: NO X-Spam-Score: -4.30 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1723027306083116600 Move the checks for e820 memory map conflicts using the xen_chk_is_e820_usable() helper further up in order to prepare resolving some of the possible conflicts by doing some e820 map modifications, which must happen before evaluating the RAM layout. Signed-off-by: Juergen Gross Tested-by: Marek Marczykowski-G=C3=B3recki --- arch/x86/xen/setup.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 96765180514b..dba68951ed6b 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -764,6 +764,28 @@ char * __init xen_memory_setup(void) /* Make sure the Xen-supplied memory map is well-ordered. */ e820__update_table(&xen_e820_table); =20 + /* + * Check whether the kernel itself conflicts with the target E820 map. + * Failing now is better than running into weird problems later due + * to relocating (and even reusing) pages with kernel text or data. + */ + xen_chk_is_e820_usable(__pa_symbol(_text), + __pa_symbol(_end) - __pa_symbol(_text), + "kernel"); + + /* + * Check for a conflict of the xen_start_info memory with the target + * E820 map. + */ + xen_chk_is_e820_usable(__pa(xen_start_info), sizeof(*xen_start_info), + "xen_start_info"); + + /* + * Check for a conflict of the hypervisor supplied page tables with + * the target E820 map. + */ + xen_pt_check_e820(); + max_pages =3D xen_get_max_pages(); =20 /* How many extra pages do we need due to remapping? */ @@ -836,28 +858,6 @@ char * __init xen_memory_setup(void) =20 e820__update_table(e820_table); =20 - /* - * Check whether the kernel itself conflicts with the target E820 map. - * Failing now is better than running into weird problems later due - * to relocating (and even reusing) pages with kernel text or data. - */ - xen_chk_is_e820_usable(__pa_symbol(_text), - __pa_symbol(_end) - __pa_symbol(_text), - "kernel"); - - /* - * Check for a conflict of the xen_start_info memory with the target - * E820 map. - */ - xen_chk_is_e820_usable(__pa(xen_start_info), sizeof(*xen_start_info), - "xen_start_info"); - - /* - * Check for a conflict of the hypervisor supplied page tables with - * the target E820 map. - */ - xen_pt_check_e820(); - xen_reserve_xen_mfnlist(); =20 /* Check for a conflict of the initrd with the target E820 map. */ --=20 2.43.0 From nobody Sun Nov 24 13:13:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1723027314; cv=none; d=zohomail.com; s=zohoarc; b=JQSX0C9X0xFd3K9a1MJh8ZOZRGUbEWuLnw0CGVsF8nO4I9TthnTRfE3EyPURy54OHi95YDOsBxNOUCPzqR6Vovo2xqnMaOS9GzZcsAeQzAabu8MzoE4eIqEilgYgpK2O4fCethjLaT5rIpP3vmwdEw8RxNGQ3DDNb5S6sDbpwIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723027314; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=67Tp86aOVS8QP/GkFPihX/Ae6F141YUARfLRlav5UEw=; b=IJUXA7JUB2mJfUg1TAWUUcTv3/E4gQvukzzvz3ExQfweMhTehdttueCItQ6t6uBbqLRDoEIp4+Ca+1JzMUQG19eOieie1xObuQQ1VTNoVhkuOt/JxL8p0n/qhHHd5QDGzqXdbOGf9fr2wlmX07AGGz5nwFCIITSrs4tC9QS4aMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1723027314179930.8410407211754; Wed, 7 Aug 2024 03:41:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.773380.1183847 (Exim 4.92) (envelope-from ) id 1sbe6u-0004Vc-He; Wed, 07 Aug 2024 10:41:40 +0000 Received: by outflank-mailman (output) from mailman id 773380.1183847; Wed, 07 Aug 2024 10:41:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6u-0004VT-EU; Wed, 07 Aug 2024 10:41:40 +0000 Received: by outflank-mailman (input) for mailman id 773380; Wed, 07 Aug 2024 10:41:39 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6t-00033N-8x for xen-devel@lists.xenproject.org; Wed, 07 Aug 2024 10:41:39 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9c6e7ead-54a9-11ef-8776-851b0ebba9a2; Wed, 07 Aug 2024 12:41:32 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1AD1721D0A; Wed, 7 Aug 2024 10:41:37 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B89E113297; Wed, 7 Aug 2024 10:41:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id po6hK2BPs2Y3IgAAD6G6ig (envelope-from ); Wed, 07 Aug 2024 10:41:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9c6e7ead-54a9-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027297; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=67Tp86aOVS8QP/GkFPihX/Ae6F141YUARfLRlav5UEw=; b=We12Cl/QcqG6IZAxLI2izb1FxSc1Tf3vBn64x9HvTZzjSe6UHo15z2WK8Ej55VaJsAMYIM GEs6K8SUbmXyH8Mfz1cSFoIrCwwo/Ud1Qeelfkk2UDU62uoFlRSjZGxKUgHMpjLbbFCx5q IqHLlikv0kU725wvKM3/nDKU34EYhdE= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027297; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=67Tp86aOVS8QP/GkFPihX/Ae6F141YUARfLRlav5UEw=; b=We12Cl/QcqG6IZAxLI2izb1FxSc1Tf3vBn64x9HvTZzjSe6UHo15z2WK8Ej55VaJsAMYIM GEs6K8SUbmXyH8Mfz1cSFoIrCwwo/Ud1Qeelfkk2UDU62uoFlRSjZGxKUgHMpjLbbFCx5q IqHLlikv0kU725wvKM3/nDKU34EYhdE= From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org, =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 4/5] xen: move max_pfn in xen_memory_setup() out of function scope Date: Wed, 7 Aug 2024 12:41:09 +0200 Message-ID: <20240807104110.18117-5-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807104110.18117-1-jgross@suse.com> References: <20240807104110.18117-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spamd-Result: default: False [-4.30 / 50.00]; REPLY(-4.00)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,invisiblethingslab.com:email,suse.com:email] X-Spam-Flag: NO X-Spam-Score: -4.30 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1723027316154116600 Instead of having max_pfn as a local variable of xen_memory_setup(), make it a static variable in setup.c instead. This avoids having to pass it to subfunctions, which will be needed in more cases in future. Rename it to ini_nr_pages, as the value denotes the currently usable number of memory pages as passed from the hypervisor at boot time. Signed-off-by: Juergen Gross Tested-by: Marek Marczykowski-G=C3=B3recki --- arch/x86/xen/setup.c | 53 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index dba68951ed6b..d678c0330971 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -46,6 +46,9 @@ bool xen_pv_pci_possible; /* E820 map used during setting up memory. */ static struct e820_table xen_e820_table __initdata; =20 +/* Number of initially usable memory pages. */ +static unsigned long ini_nr_pages __initdata; + /* * Buffer used to remap identity mapped pages. We only need the virtual sp= ace. * The physical page behind this address is remapped as needed to different @@ -212,7 +215,7 @@ static int __init xen_free_mfn(unsigned long mfn) * as a fallback if the remapping fails. */ static void __init xen_set_identity_and_release_chunk(unsigned long start_= pfn, - unsigned long end_pfn, unsigned long nr_pages) + unsigned long end_pfn) { unsigned long pfn, end; int ret; @@ -220,7 +223,7 @@ static void __init xen_set_identity_and_release_chunk(u= nsigned long start_pfn, WARN_ON(start_pfn > end_pfn); =20 /* Release pages first. */ - end =3D min(end_pfn, nr_pages); + end =3D min(end_pfn, ini_nr_pages); for (pfn =3D start_pfn; pfn < end; pfn++) { unsigned long mfn =3D pfn_to_mfn(pfn); =20 @@ -341,15 +344,14 @@ static void __init xen_do_set_identity_and_remap_chun= k( * to Xen and not remapped. */ static unsigned long __init xen_set_identity_and_remap_chunk( - unsigned long start_pfn, unsigned long end_pfn, unsigned long nr_pages, - unsigned long remap_pfn) + unsigned long start_pfn, unsigned long end_pfn, unsigned long remap_pfn) { unsigned long pfn; unsigned long i =3D 0; unsigned long n =3D end_pfn - start_pfn; =20 if (remap_pfn =3D=3D 0) - remap_pfn =3D nr_pages; + remap_pfn =3D ini_nr_pages; =20 while (i < n) { unsigned long cur_pfn =3D start_pfn + i; @@ -358,19 +360,19 @@ static unsigned long __init xen_set_identity_and_rema= p_chunk( unsigned long remap_range_size; =20 /* Do not remap pages beyond the current allocation */ - if (cur_pfn >=3D nr_pages) { + if (cur_pfn >=3D ini_nr_pages) { /* Identity map remaining pages */ set_phys_range_identity(cur_pfn, cur_pfn + size); break; } - if (cur_pfn + size > nr_pages) - size =3D nr_pages - cur_pfn; + if (cur_pfn + size > ini_nr_pages) + size =3D ini_nr_pages - cur_pfn; =20 remap_range_size =3D xen_find_pfn_range(&remap_pfn); if (!remap_range_size) { pr_warn("Unable to find available pfn range, not remapping identity pag= es\n"); xen_set_identity_and_release_chunk(cur_pfn, - cur_pfn + left, nr_pages); + cur_pfn + left); break; } /* Adjust size to fit in current e820 RAM region */ @@ -397,18 +399,18 @@ static unsigned long __init xen_set_identity_and_rema= p_chunk( } =20 static unsigned long __init xen_count_remap_pages( - unsigned long start_pfn, unsigned long end_pfn, unsigned long nr_pages, + unsigned long start_pfn, unsigned long end_pfn, unsigned long remap_pages) { - if (start_pfn >=3D nr_pages) + if (start_pfn >=3D ini_nr_pages) return remap_pages; =20 - return remap_pages + min(end_pfn, nr_pages) - start_pfn; + return remap_pages + min(end_pfn, ini_nr_pages) - start_pfn; } =20 -static unsigned long __init xen_foreach_remap_area(unsigned long nr_pages, +static unsigned long __init xen_foreach_remap_area( unsigned long (*func)(unsigned long start_pfn, unsigned long end_pfn, - unsigned long nr_pages, unsigned long last_val)) + unsigned long last_val)) { phys_addr_t start =3D 0; unsigned long ret_val =3D 0; @@ -436,8 +438,7 @@ static unsigned long __init xen_foreach_remap_area(unsi= gned long nr_pages, end_pfn =3D PFN_UP(entry->addr); =20 if (start_pfn < end_pfn) - ret_val =3D func(start_pfn, end_pfn, nr_pages, - ret_val); + ret_val =3D func(start_pfn, end_pfn, ret_val); start =3D end; } } @@ -700,7 +701,7 @@ static void __init xen_reserve_xen_mfnlist(void) **/ char * __init xen_memory_setup(void) { - unsigned long max_pfn, pfn_s, n_pfns; + unsigned long pfn_s, n_pfns; phys_addr_t mem_end, addr, size, chunk_size; u32 type; int rc; @@ -712,9 +713,9 @@ char * __init xen_memory_setup(void) int op; =20 xen_parse_512gb(); - max_pfn =3D xen_get_pages_limit(); - max_pfn =3D min(max_pfn, xen_start_info->nr_pages); - mem_end =3D PFN_PHYS(max_pfn); + ini_nr_pages =3D xen_get_pages_limit(); + ini_nr_pages =3D min(ini_nr_pages, xen_start_info->nr_pages); + mem_end =3D PFN_PHYS(ini_nr_pages); =20 memmap.nr_entries =3D ARRAY_SIZE(xen_e820_table.entries); set_xen_guest_handle(memmap.buffer, xen_e820_table.entries); @@ -789,10 +790,10 @@ char * __init xen_memory_setup(void) max_pages =3D xen_get_max_pages(); =20 /* How many extra pages do we need due to remapping? */ - max_pages +=3D xen_foreach_remap_area(max_pfn, xen_count_remap_pages); + max_pages +=3D xen_foreach_remap_area(xen_count_remap_pages); =20 - if (max_pages > max_pfn) - extra_pages +=3D max_pages - max_pfn; + if (max_pages > ini_nr_pages) + extra_pages +=3D max_pages - ini_nr_pages; =20 /* * Clamp the amount of extra memory to a EXTRA_MEM_RATIO @@ -801,8 +802,8 @@ char * __init xen_memory_setup(void) * Make sure we have no memory above max_pages, as this area * isn't handled by the p2m management. */ - maxmem_pages =3D EXTRA_MEM_RATIO * min(max_pfn, PFN_DOWN(MAXMEM)); - extra_pages =3D min3(maxmem_pages, extra_pages, max_pages - max_pfn); + maxmem_pages =3D EXTRA_MEM_RATIO * min(ini_nr_pages, PFN_DOWN(MAXMEM)); + extra_pages =3D min3(maxmem_pages, extra_pages, max_pages - ini_nr_pages); i =3D 0; addr =3D xen_e820_table.entries[0].addr; size =3D xen_e820_table.entries[0].size; @@ -885,7 +886,7 @@ char * __init xen_memory_setup(void) * Set identity map on non-RAM pages and prepare remapping the * underlying RAM. */ - xen_foreach_remap_area(max_pfn, xen_set_identity_and_remap_chunk); + xen_foreach_remap_area(xen_set_identity_and_remap_chunk); =20 pr_info("Released %ld page(s)\n", xen_released_pages); =20 --=20 2.43.0 From nobody Sun Nov 24 13:13:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1723027317; cv=none; d=zohomail.com; s=zohoarc; b=ijzhZACd+kq+rzTBp0/Qm/s6j998jJtpuefH1PxokvabCq8+FmmFrQFde6ZKqJlGA9iwnYf13GR3hJc3CEbJjUxNL6kXaKUoj4/h/Ab3h5A/ZS0MHGk5RLcHETjegyBQ4AoEw6kKIK0OOUoY+IY/vnVX4sXGFN3C1mBE/iy+Fl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723027317; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Eu33IF37KPV2peySpoH2AKulwBtPRZshtpTGtlDrC4o=; b=UGphNRzN5VFZSuyv3nqfqcbshSeyjJUYt4zXIqE5f8Af2aOD5i7q8VE+b8aEOAe95Uwo5EP8gzOfVIqspUy9QzeX2zYkffSE7JOAYFF/Tztt7B1Lpq6+/OGmnyiIC/6IEWAjcXxJcd22k8tZIM9c+NQP8QeoMyXZjjoSaNBtCSg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 172302731766279.72835379677065; Wed, 7 Aug 2024 03:41:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.773385.1183858 (Exim 4.92) (envelope-from ) id 1sbe6y-0004tX-QC; Wed, 07 Aug 2024 10:41:44 +0000 Received: by outflank-mailman (output) from mailman id 773385.1183858; Wed, 07 Aug 2024 10:41:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6y-0004tQ-Mn; Wed, 07 Aug 2024 10:41:44 +0000 Received: by outflank-mailman (input) for mailman id 773385; Wed, 07 Aug 2024 10:41:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sbe6y-0003I0-1R for xen-devel@lists.xenproject.org; Wed, 07 Aug 2024 10:41:44 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a2e7a1a5-54a9-11ef-bc04-fd08da9f4363; Wed, 07 Aug 2024 12:41:43 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E24351F38C; Wed, 7 Aug 2024 10:41:42 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 803AB13297; Wed, 7 Aug 2024 10:41:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id DVfIHWZPs2Y9IgAAD6G6ig (envelope-from ); Wed, 07 Aug 2024 10:41:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a2e7a1a5-54a9-11ef-bc04-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027302; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Eu33IF37KPV2peySpoH2AKulwBtPRZshtpTGtlDrC4o=; b=m0w7vF4UF9VBkwcbgKeJEkLaQfkFICc7DrOR73PQmWVbjIhve+gSA1r7kmLJH60K/SXQ5q 9JatpbIuObHmzIz8s7IvNf/DheM0hxg3ru6+5S0XE/yPUaI19Ar1nynPwEyQtOEgme+J34 KFd9vXZ88IUg0jUpqcCc3BAOkhiSkjg= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1723027302; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Eu33IF37KPV2peySpoH2AKulwBtPRZshtpTGtlDrC4o=; b=m0w7vF4UF9VBkwcbgKeJEkLaQfkFICc7DrOR73PQmWVbjIhve+gSA1r7kmLJH60K/SXQ5q 9JatpbIuObHmzIz8s7IvNf/DheM0hxg3ru6+5S0XE/yPUaI19Ar1nynPwEyQtOEgme+J34 KFd9vXZ88IUg0jUpqcCc3BAOkhiSkjg= From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Boris Ostrovsky , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , xen-devel@lists.xenproject.org, =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 5/5] xen: tolerate ACPI NVS memory overlapping with Xen allocated memory Date: Wed, 7 Aug 2024 12:41:10 +0200 Message-ID: <20240807104110.18117-6-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240807104110.18117-1-jgross@suse.com> References: <20240807104110.18117-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-7.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,imap1.dmz-prg2.suse.org:helo,invisiblethingslab.com:email] X-Spam-Score: -7.30 X-Spam-Flag: NO X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1723027318134116600 In order to minimize required special handling for running as Xen PV dom0, the memory layout is modified to match that of the host. This requires to have only RAM at the locations where Xen allocated memory is living. Unfortunately there seem to be some machines, where ACPI NVS is located at 64 MB, resulting in a conflict with the loaded kernel or the initial page tables built by Xen. As ACPI NVS needs to be accessed by the kernel only for saving and restoring it across suspend operations, it can be relocated in the dom0's memory map by swapping it with unused RAM (this is possible via modification of the dom0 P2M map). While the E820 map can (and should) be modified right away, the P2M map can be updated only after memory allocation is working, as the P2M map might need to be extended. Fixes: 808fdb71936c ("xen: check for kernel memory conflicting with memory = layout") Signed-off-by: Juergen Gross Tested-by: Marek Marczykowski-G=C3=B3recki --- arch/x86/xen/setup.c | 133 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 1 deletion(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index d678c0330971..dbb5d13ca61a 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -49,6 +49,15 @@ static struct e820_table xen_e820_table __initdata; /* Number of initially usable memory pages. */ static unsigned long ini_nr_pages __initdata; =20 +/* Remapped non-RAM areas */ +#define NR_NONRAM_REMAP 4 +static struct nonram_remap { + unsigned long maddr; + unsigned long size; + unsigned long paddr; +} xen_nonram_remap[NR_NONRAM_REMAP] __initdata; +static unsigned int nr_nonram_remap __initdata; + /* * Buffer used to remap identity mapped pages. We only need the virtual sp= ace. * The physical page behind this address is remapped as needed to different @@ -452,6 +461,8 @@ static unsigned long __init xen_foreach_remap_area( * to be remapped memory itself in a linked list anchored at xen_remap_mfn. * This scheme allows to remap the different chunks in arbitrary order whi= le * the resulting mapping will be independent from the order. + * In case xen_e820_resolve_conflicts() did relocate some non-RAM E820 + * entries, set the correct P2M information for the affected pages. */ void __init xen_remap_memory(void) { @@ -495,6 +506,29 @@ void __init xen_remap_memory(void) set_pte_mfn(buf, mfn_save, PAGE_KERNEL); =20 pr_info("Remapped %ld page(s)\n", remapped); + + if (nr_nonram_remap =3D=3D 0) + return; + + remapped =3D 0; + for (i =3D 0; i < nr_nonram_remap; i++) { + struct nonram_remap *remap =3D xen_nonram_remap + i; + + pfn =3D PFN_DOWN(remap->paddr); + mfn_save =3D PFN_DOWN(remap->maddr); + for (len =3D 0; len < remap->size; len +=3D PAGE_SIZE) { + if (!set_phys_to_machine(pfn, mfn_save)) { + WARN(1, "Failed to set p2m mapping for pfn=3D%ld mfn=3D%ld\n", + pfn, mfn_save); + BUG(); + } + pfn++; + mfn_save++; + remapped++; + } + } + + pr_info("Remapped %ld non-RAM page(s)\n", remapped); } =20 static unsigned long __init xen_get_pages_limit(void) @@ -625,14 +659,111 @@ phys_addr_t __init xen_find_free_area(phys_addr_t si= ze) return 0; } =20 +/* + * Swap a non-RAM E820 map entry with RAM above ini_nr_pages. + * Note that the E820 map is modified accordingly, but the P2M map isn't y= et. + * The adaption of the P2M must be deferred until page allocation is possi= ble. + */ +static void __init xen_e820_swap_entry_with_ram(struct e820_entry *swap_en= try) +{ + struct e820_entry *entry; + unsigned int mapcnt; + phys_addr_t mem_end =3D PFN_PHYS(ini_nr_pages); + struct nonram_remap *remap; + phys_addr_t swap_addr, swap_size, entry_end; + + if (nr_nonram_remap =3D=3D NR_NONRAM_REMAP) { + xen_raw_console_write("Number of required E820 entry remapping actions e= xceed maximum value\n"); + BUG(); + } + + swap_addr =3D PAGE_ALIGN_DOWN(swap_entry->addr); + swap_size =3D PAGE_ALIGN(swap_entry->addr - swap_addr + swap_entry->size); + remap =3D xen_nonram_remap + nr_nonram_remap; + entry =3D xen_e820_table.entries; + + for (mapcnt =3D 0; mapcnt < xen_e820_table.nr_entries; mapcnt++) { + entry_end =3D entry->addr + entry->size; + if (entry->type =3D=3D E820_TYPE_RAM && entry->size >=3D swap_size && + entry_end - swap_size >=3D mem_end) { + /* Reduce RAM entry by needed space (whole pages). */ + entry->size -=3D swap_size; + + /* Add new entry at the end of E820 map. */ + entry =3D xen_e820_table.entries + + xen_e820_table.nr_entries; + xen_e820_table.nr_entries++; + + /* Fill new entry (keep size and page offset). */ + entry->type =3D swap_entry->type; + entry->addr =3D entry_end - swap_size + + swap_addr - swap_entry->addr; + entry->size =3D swap_entry->size; + + /* Convert old entry to RAM, align to pages. */ + swap_entry->type =3D E820_TYPE_RAM; + swap_entry->addr =3D swap_addr; + swap_entry->size =3D swap_size; + + /* Remember PFN<->MFN relation for P2M update. */ + remap->maddr =3D swap_addr; + remap->size =3D swap_size; + remap->paddr =3D entry_end - swap_size; + nr_nonram_remap++; + + /* Order E820 table and merge entries. */ + e820__update_table(&xen_e820_table); + + return; + } + + entry++; + } + + xen_raw_console_write("No suitable area found for required E820 entry rem= apping action\n"); + BUG(); +} + +/* + * Look for non-RAM memory types in a specific guest physical area and move + * those away if possible (ACPI NVS only for now). + */ +static void __init xen_e820_resolve_conflicts(phys_addr_t start, + phys_addr_t size) +{ + struct e820_entry *entry; + unsigned int mapcnt; + phys_addr_t end; + + if (!size) + return; + + end =3D start + size; + entry =3D xen_e820_table.entries; + + for (mapcnt =3D 0; mapcnt < xen_e820_table.nr_entries; mapcnt++) { + if (entry->addr >=3D end) + return; + + if (entry->addr + entry->size > start && + entry->type =3D=3D E820_TYPE_NVS) + xen_e820_swap_entry_with_ram(entry); + + entry++; + } +} + /* * Check for an area in physical memory to be usable for non-movable purpo= ses. - * An area is considered to usable if the used E820 map lists it to be RAM. + * An area is considered to usable if the used E820 map lists it to be RAM= or + * some other type which can be moved to higher PFNs while keeping the MFN= s. * In case the area is not usable, crash the system with an error message. */ void __init xen_chk_is_e820_usable(phys_addr_t start, phys_addr_t size, const char *component) { + xen_e820_resolve_conflicts(start, size); + if (!xen_is_e820_reserved(start, size)) return; =20 --=20 2.43.0