From nobody Wed May 8 09:08:45 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=1623828636; cv=none; d=zohomail.com; s=zohoarc; b=MUJ4aaxS+ywfm1WQuL2yxlCaK9BZYGBpvBxjFuEaeP1xWKo5XzVZdhTr7olIYNvOw4SKY4NiBJnaGakM/g/ezjMVZNbZfM60nFLnJd0hBlgL1Y/3LhiXGbolrdXaWpxVjiymX6CHhRqXvdP6RIXpUUKuQUx1W3XDjuRMSEcS8Kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623828636; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S1r1xotAufgSrJxoO6eVl3GT9o9kmdrAP0fb2+09k/Y=; b=JmRq6UMEulUkKS0ag0musF2Z2DMYwnslQjQ0gjAV3Kg42linDzSz9I/AlGBTNLHLC2YogZhpE5lHvklWAkhPNEgoZx04i4GFDo58ES5aAF6VA3j++UN7t7vo+9hJNvTcjWyyLLqKiolFHqIwnRsWDjG9JsrZbqca5bpXoY+9Ojo= 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 1623828636710955.8593972006258; Wed, 16 Jun 2021 00:30:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.142737.263307 (Exim 4.92) (envelope-from ) id 1ltQ0A-000701-MS; Wed, 16 Jun 2021 07:30:18 +0000 Received: by outflank-mailman (output) from mailman id 142737.263307; Wed, 16 Jun 2021 07:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ltQ0A-0006zm-JK; Wed, 16 Jun 2021 07:30:18 +0000 Received: by outflank-mailman (input) for mailman id 142737; Wed, 16 Jun 2021 07:30:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ltQ09-0006Rp-2F for xen-devel@lists.xenproject.org; Wed, 16 Jun 2021 07:30:17 +0000 Received: from smtp-out1.suse.de (unknown [195.135.220.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 857ad28a-75a5-4017-a0fc-28718caeb760; Wed, 16 Jun 2021 07:30:11 +0000 (UTC) Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A261A21A24; Wed, 16 Jun 2021 07:30:10 +0000 (UTC) Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 53A0511A98; Wed, 16 Jun 2021 07:30:10 +0000 (UTC) Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id kOVJE4KoyWBfZAAALh3uQQ (envelope-from ); Wed, 16 Jun 2021 07:30:10 +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: 857ad28a-75a5-4017-a0fc-28718caeb760 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623828610; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S1r1xotAufgSrJxoO6eVl3GT9o9kmdrAP0fb2+09k/Y=; b=rrtxG4a3oZRTeuM96PmrvNJ9mDw4s3FGu3Lt679kjarEpkWxfo+hWYdS4X+u3TqylaZlJr V3FSb3/rS3kXEauOsaW7c5pXjxS4O9eIryIAQc0InNovNDrA6RZm3/l8q7+i88EsnXV6QY Gm6m0edAK5fEt0Xzp2IcFUvrAYJKM+w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623828610; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S1r1xotAufgSrJxoO6eVl3GT9o9kmdrAP0fb2+09k/Y=; b=rrtxG4a3oZRTeuM96PmrvNJ9mDw4s3FGu3Lt679kjarEpkWxfo+hWYdS4X+u3TqylaZlJr V3FSb3/rS3kXEauOsaW7c5pXjxS4O9eIryIAQc0InNovNDrA6RZm3/l8q7+i88EsnXV6QY Gm6m0edAK5fEt0Xzp2IcFUvrAYJKM+w= From: Juergen Gross To: xen-devel@lists.xenproject.org, x86@kernel.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Boris Ostrovsky , Stefano Stabellini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , stable@vger.kernel.org Subject: [PATCH 1/2] xen: fix setting of max_pfn in shared_info Date: Wed, 16 Jun 2021 09:30:06 +0200 Message-Id: <20210616073007.5215-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210616073007.5215-1-jgross@suse.com> References: <20210616073007.5215-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Xen PV guests are specifying the highest used PFN via the max_pfn field in shared_info. This value is used by the Xen tools when saving or migrating the guest. Unfortunately this field is misnamed, as in reality it is specifying the number of pages (including any memory holes) of the guest, so it is the highest used PFN + 1. Renaming isn't possible, as this is a public Xen hypervisor interface which needs to be kept stable. The kernel will set the value correctly initially at boot time, but when adding more pages (e.g. due to memory hotplug or ballooning) a real PFN number is stored in max_pfn. This is done when expanding the p2m array, and the PFN stored there is even possibly wrong, as it should be the last possible PFN of the just added P2M frame, and not one which led to the P2M expansion. Fix that by setting shared_info->max_pfn to the last possible PFN + 1. Fixes: 98dd166ea3a3c3 ("x86/xen/p2m: hint at the last populated P2M entry") Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- arch/x86/xen/p2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index ac06ca32e9ef..5e6e236977c7 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -618,8 +618,8 @@ int xen_alloc_p2m_entry(unsigned long pfn) } =20 /* Expanded the p2m? */ - if (pfn > xen_p2m_last_pfn) { - xen_p2m_last_pfn =3D pfn; + if (pfn >=3D xen_p2m_last_pfn) { + xen_p2m_last_pfn =3D ALIGN(pfn + 1, P2M_PER_PAGE); HYPERVISOR_shared_info->arch.max_pfn =3D xen_p2m_last_pfn; } =20 --=20 2.26.2 From nobody Wed May 8 09:08:45 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=1623828636; cv=none; d=zohomail.com; s=zohoarc; b=fcTafur2LUh3OcxklnaqNmKOwQsadZ1yFPC0z8gcYA8b9aBTrzjPNsF2hDFPilaEezKDscFb8XdPdabXt4ndmYy061JWa7f8gid/0cVhICjS0SL31cDbN7n1v3axCIEkhR7KQBtdc4jm/RnoklUuk1W2IPUnC8DZiN/oeRjhZAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623828636; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B5lCFKLS4SrkKe1lJQmspLTLsY+q2DCNZBeEteAkDQg=; b=YyhlrqISa9Mm5iHnB/mTs5EHGEMaGBJnhyjcNOlQgBBGQzTsKdcwLDLwdiyDxRfm0VRlnYhXUTQkkfl9T05WJu7BCgxbUReoQeaKO28FicnuLI4+B70BT1ZW5ui2EFxKI1TsmOzCUUuTQSbraITj+T5pxxo7EwTgJ+RuRrHUNxc= 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 162382863644389.89719792152505; Wed, 16 Jun 2021 00:30:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.142736.263296 (Exim 4.92) (envelope-from ) id 1ltQ07-0006iE-Di; Wed, 16 Jun 2021 07:30:15 +0000 Received: by outflank-mailman (output) from mailman id 142736.263296; Wed, 16 Jun 2021 07:30:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ltQ07-0006i7-AF; Wed, 16 Jun 2021 07:30:15 +0000 Received: by outflank-mailman (input) for mailman id 142736; Wed, 16 Jun 2021 07:30:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ltQ05-0006d2-Pk for xen-devel@lists.xenproject.org; Wed, 16 Jun 2021 07:30:13 +0000 Received: from smtp-out2.suse.de (unknown [195.135.220.29]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fcca34ec-6c56-4ee8-928c-4016de194043; Wed, 16 Jun 2021 07:30:11 +0000 (UTC) Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0071A1FD64; Wed, 16 Jun 2021 07:30:11 +0000 (UTC) Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id A8DBC118DD; Wed, 16 Jun 2021 07:30:10 +0000 (UTC) Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id GDcVKIKoyWBfZAAALh3uQQ (envelope-from ); Wed, 16 Jun 2021 07:30:10 +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: fcca34ec-6c56-4ee8-928c-4016de194043 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623828611; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B5lCFKLS4SrkKe1lJQmspLTLsY+q2DCNZBeEteAkDQg=; b=kBk7upbTudELxn7yk841qgv/oTl4rY+JGrnXx/ubDi7or2hFGGLcCc/8IfvwqRjNXUmSs8 DvdYGZHd+Nl/PdO99VHbDn9iHrQb8dHkoOHCudS/c0YIIBoEVMTyWWWTMF6kIviO54rDko riExKLBpi2seQw6jy11YdqeHGxnRf+I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623828610; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B5lCFKLS4SrkKe1lJQmspLTLsY+q2DCNZBeEteAkDQg=; b=eZR6UrR0IN/1H5lwf+BJwP8nIqhw0G0LC3nS3EHasCUSZUHuKQtAyH9P4xUtVldEvTR4+n TvEL48QavumVOcMtRU9RbokYzMc6wbMcBITMtPW4k48qrxHo53UDD6xeF7CaHeQbxnlpnt HO6SlWPPONAx2ISAbOkkl56EZ1vSlGs= From: Juergen Gross To: xen-devel@lists.xenproject.org, x86@kernel.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Boris Ostrovsky , Stefano Stabellini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH 2/2] xen: rename wrong named pfn related variables Date: Wed, 16 Jun 2021 09:30:07 +0200 Message-Id: <20210616073007.5215-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210616073007.5215-1-jgross@suse.com> References: <20210616073007.5215-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) (identity @suse.com) Content-Type: text/plain; charset="utf-8" There are some variables in Xen specific coding which names imply them holding a PFN, while in reality they are containing numbers of PFNs. Rename them accordingly. Signed-off-by: Juergen Gross --- arch/x86/include/asm/xen/page.h | 4 ++-- arch/x86/xen/p2m.c | 31 ++++++++++++++++--------------- arch/x86/xen/setup.c | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/pag= e.h index 1a162e559753..3590d6bf42c7 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h @@ -51,7 +51,7 @@ extern unsigned long *machine_to_phys_mapping; extern unsigned long machine_to_phys_nr; extern unsigned long *xen_p2m_addr; extern unsigned long xen_p2m_size; -extern unsigned long xen_max_p2m_pfn; +extern unsigned long xen_p2m_max_size; =20 extern int xen_alloc_p2m_entry(unsigned long pfn); =20 @@ -144,7 +144,7 @@ static inline unsigned long __pfn_to_mfn(unsigned long = pfn) =20 if (pfn < xen_p2m_size) mfn =3D xen_p2m_addr[pfn]; - else if (unlikely(pfn < xen_max_p2m_pfn)) + else if (unlikely(pfn < xen_p2m_max_size)) return get_phys_to_machine(pfn); else return IDENTITY_FRAME(pfn); diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index 5e6e236977c7..babdc18dbef7 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -95,8 +95,8 @@ unsigned long *xen_p2m_addr __read_mostly; EXPORT_SYMBOL_GPL(xen_p2m_addr); unsigned long xen_p2m_size __read_mostly; EXPORT_SYMBOL_GPL(xen_p2m_size); -unsigned long xen_max_p2m_pfn __read_mostly; -EXPORT_SYMBOL_GPL(xen_max_p2m_pfn); +unsigned long xen_p2m_max_size __read_mostly; +EXPORT_SYMBOL_GPL(xen_p2m_max_size); =20 #ifdef CONFIG_XEN_MEMORY_HOTPLUG_LIMIT #define P2M_LIMIT CONFIG_XEN_MEMORY_HOTPLUG_LIMIT @@ -121,7 +121,7 @@ static pte_t *p2m_identity_pte; * can avoid scanning the whole P2M (which may be sized to account for * hotplugged memory). */ -static unsigned long xen_p2m_last_pfn; +static unsigned long xen_p2m_pfn_limit; =20 static inline unsigned p2m_top_index(unsigned long pfn) { @@ -239,7 +239,7 @@ void __ref xen_build_mfn_list_list(void) p2m_mid_mfn_init(p2m_mid_missing_mfn, p2m_missing); } =20 - for (pfn =3D 0; pfn < xen_max_p2m_pfn && pfn < MAX_P2M_PFN; + for (pfn =3D 0; pfn < xen_p2m_max_size && pfn < MAX_P2M_PFN; pfn +=3D P2M_PER_PAGE) { topidx =3D p2m_top_index(pfn); mididx =3D p2m_mid_index(pfn); @@ -284,7 +284,7 @@ void xen_setup_mfn_list_list(void) else HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =3D virt_to_mfn(p2m_top_mfn); - HYPERVISOR_shared_info->arch.max_pfn =3D xen_p2m_last_pfn; + HYPERVISOR_shared_info->arch.max_pfn =3D xen_p2m_pfn_limit; HYPERVISOR_shared_info->arch.p2m_generation =3D 0; HYPERVISOR_shared_info->arch.p2m_vaddr =3D (unsigned long)xen_p2m_addr; HYPERVISOR_shared_info->arch.p2m_cr3 =3D @@ -302,7 +302,7 @@ void __init xen_build_dynamic_phys_to_machine(void) for (pfn =3D xen_start_info->nr_pages; pfn < xen_p2m_size; pfn++) xen_p2m_addr[pfn] =3D INVALID_P2M_ENTRY; =20 - xen_max_p2m_pfn =3D xen_p2m_size; + xen_p2m_max_size =3D xen_p2m_size; } =20 #define P2M_TYPE_IDENTITY 0 @@ -353,7 +353,7 @@ static void __init xen_rebuild_p2m_list(unsigned long *= p2m) pfn_pte(PFN_DOWN(__pa(p2m_identity)), PAGE_KERNEL_RO)); } =20 - for (pfn =3D 0; pfn < xen_max_p2m_pfn; pfn +=3D chunk) { + for (pfn =3D 0; pfn < xen_p2m_max_size; pfn +=3D chunk) { /* * Try to map missing/identity PMDs or p2m-pages if possible. * We have to respect the structure of the mfn_list_list @@ -413,21 +413,22 @@ void __init xen_vmalloc_p2m_tree(void) static struct vm_struct vm; unsigned long p2m_limit; =20 - xen_p2m_last_pfn =3D xen_max_p2m_pfn; + xen_p2m_pfn_limit =3D xen_p2m_max_size; =20 p2m_limit =3D (phys_addr_t)P2M_LIMIT * 1024 * 1024 * 1024 / PAGE_SIZE; vm.flags =3D VM_ALLOC; - vm.size =3D ALIGN(sizeof(unsigned long) * max(xen_max_p2m_pfn, p2m_limit), + vm.size =3D ALIGN(sizeof(unsigned long) * + max(xen_p2m_max_size, p2m_limit), PMD_SIZE * PMDS_PER_MID_PAGE); vm_area_register_early(&vm, PMD_SIZE * PMDS_PER_MID_PAGE); pr_notice("p2m virtual area at %p, size is %lx\n", vm.addr, vm.size); =20 - xen_max_p2m_pfn =3D vm.size / sizeof(unsigned long); + xen_p2m_max_size =3D vm.size / sizeof(unsigned long); =20 xen_rebuild_p2m_list(vm.addr); =20 xen_p2m_addr =3D vm.addr; - xen_p2m_size =3D xen_max_p2m_pfn; + xen_p2m_size =3D xen_p2m_max_size; =20 xen_inv_extra_mem(); } @@ -438,7 +439,7 @@ unsigned long get_phys_to_machine(unsigned long pfn) unsigned int level; =20 if (unlikely(pfn >=3D xen_p2m_size)) { - if (pfn < xen_max_p2m_pfn) + if (pfn < xen_p2m_max_size) return xen_chk_extra_mem(pfn); =20 return IDENTITY_FRAME(pfn); @@ -618,9 +619,9 @@ int xen_alloc_p2m_entry(unsigned long pfn) } =20 /* Expanded the p2m? */ - if (pfn >=3D xen_p2m_last_pfn) { - xen_p2m_last_pfn =3D ALIGN(pfn + 1, P2M_PER_PAGE); - HYPERVISOR_shared_info->arch.max_pfn =3D xen_p2m_last_pfn; + if (pfn >=3D xen_p2m_pfn_limit) { + xen_p2m_pfn_limit =3D ALIGN(pfn + 1, P2M_PER_PAGE); + HYPERVISOR_shared_info->arch.max_pfn =3D xen_p2m_pfn_limit; } =20 return 0; diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 8bfc10330107..1caddd3fa0e1 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -816,7 +816,7 @@ char * __init xen_memory_setup(void) n_pfns =3D PFN_DOWN(addr + chunk_size) - pfn_s; extra_pages -=3D n_pfns; xen_add_extra_mem(pfn_s, n_pfns); - xen_max_p2m_pfn =3D pfn_s + n_pfns; + xen_p2m_max_size =3D pfn_s + n_pfns; } else discard =3D true; } --=20 2.26.2