From nobody Mon Feb 9 09:42:40 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1619014580; cv=none; d=zohomail.com; s=zohoarc; b=R1uKzum4lFxQKPHXgwkE/Iy9cOZdUgimXPCm47t87HhxO09TBpbyz7VXlohGyXffdwlzW6w7FyERJCWpDfOH5gfEcr1hqkxaQK8iz1DupvD1o+ij7cS8TcohBUODvaPUZKZ1PO3r5TjemNKGEmP1FOkgrgyYOB53Y6I4U9u0XsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619014580; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=EZDPpIrnwQ2O27mjd2bZL/24PbG09BLeqyZDcu4x8Gc=; b=SrMXyqKzWJ47si5aCVQGcUtorvSvVFeu0QuHAxztIetjS1ZSAlve4Jk4/KA4F2BbJ2FdTw3kyJVPhQ2yRWUG3j034UgysbKJ7hKWxTgHk91RtCNM5SgIvlvOa9cw1QPkEpB3WfDCvhobDaDxIxY4SFT2plHEV8bL7xpoO+qf7eE= 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1619014579757873.2721491789956; Wed, 21 Apr 2021 07:16:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.114548.218377 (Exim 4.92) (envelope-from ) id 1lZDe6-000820-GB; Wed, 21 Apr 2021 14:16:02 +0000 Received: by outflank-mailman (output) from mailman id 114548.218377; Wed, 21 Apr 2021 14:16:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZDe6-00081d-7d; Wed, 21 Apr 2021 14:16:02 +0000 Received: by outflank-mailman (input) for mailman id 114548; Wed, 21 Apr 2021 14:16:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZDe5-00080K-IF for xen-devel@lists.xenproject.org; Wed, 21 Apr 2021 14:16:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZDe5-0000xw-8X; Wed, 21 Apr 2021 14:16:01 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ua82172827c7b5a.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lZDe4-00045m-U3; Wed, 21 Apr 2021 14:16:01 +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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From; bh=EZDPpIrnwQ2O27mjd2bZL/24PbG09BLeqyZDcu4x8Gc=; b=c uS1oNojhUPv/uI6wzd8mnojbNgmCMsZuZhdSfL/S4PmxGEyfoClmyVUnVx8aicXCb4YkMqsQSwzKD aLKiGRdxL5ZUah5EhTumBHGF8qWsxlkrwWFDYQdqYu1ZeWawMqJuer6mn5AkvMCrF5skEgeN0wa/p ZVsgmmN/x6XN/9J0=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Cc: jgrall@amazon.com, Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH v10 06/13] x86_64/mm: switch to new APIs in setup_m2p_table Date: Wed, 21 Apr 2021 15:15:34 +0100 Message-Id: <49477e63f5b1ae4f666ae6eb1fc225677a4418fb.1619014052.git.hongyxia@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Wei Liu While doing so, avoid repetitive mapping of l2_ro_mpt by keeping it across loops, and only unmap and map it when crossing 1G boundaries. Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- Changed in v8: - re-structure if condition around l2_ro_mpt. - reword the commit message. Changed in v7: - avoid repetitive mapping of l2_ro_mpt. - edit commit message. - switch to alloc_map_clear_xen_pt(). --- xen/arch/x86/x86_64/mm.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 3e40d529bbf3..c625075695e0 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -402,7 +402,8 @@ static int setup_m2p_table(struct mem_hotadd_info *info) =20 ASSERT(l4e_get_flags(idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)]) & _PAGE_PRESENT); - l3_ro_mpt =3D l4e_to_l3e(idle_pg_table[l4_table_offset(RO_MPT_VIRT_STA= RT)]); + l3_ro_mpt =3D map_l3t_from_l4e( + idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)]); =20 smap =3D (info->spfn & (~((1UL << (L2_PAGETABLE_SHIFT - 3)) -1))); emap =3D ((info->epfn + ((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1 )) & @@ -420,6 +421,10 @@ static int setup_m2p_table(struct mem_hotadd_info *inf= o) i =3D smap; while ( i < emap ) { + if ( (RO_MPT_VIRT_START + i * sizeof(*machine_to_phys_mapping)) & + ((1UL << L3_PAGETABLE_SHIFT) - 1) ) + UNMAP_DOMAIN_PAGE(l2_ro_mpt); + switch ( m2p_mapped(i) ) { case M2P_1G_MAPPED: @@ -455,32 +460,31 @@ static int setup_m2p_table(struct mem_hotadd_info *in= fo) =20 ASSERT(!(l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & _PAGE_PSE)); - if ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & - _PAGE_PRESENT ) - l2_ro_mpt =3D l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]) + - l2_table_offset(va); + if ( l2_ro_mpt ) + /* nothing */; + else if ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & + _PAGE_PRESENT ) + l2_ro_mpt =3D map_l2t_from_l3e(l3_ro_mpt[l3_table_offset(v= a)]); else { - l2_ro_mpt =3D alloc_xen_pagetable(); + mfn_t l2_ro_mpt_mfn; + + l2_ro_mpt =3D alloc_mapped_pagetable(&l2_ro_mpt_mfn); if ( !l2_ro_mpt ) { ret =3D -ENOMEM; goto error; } =20 - clear_page(l2_ro_mpt); l3e_write(&l3_ro_mpt[l3_table_offset(va)], - l3e_from_paddr(__pa(l2_ro_mpt), - __PAGE_HYPERVISOR_RO | _PAGE_USER= )); - l2_ro_mpt +=3D l2_table_offset(va); + l3e_from_mfn(l2_ro_mpt_mfn, + __PAGE_HYPERVISOR_RO | _PAGE_USER)); } =20 /* NB. Cannot be GLOBAL: guest user mode should not see it. */ - l2e_write(l2_ro_mpt, l2e_from_mfn(mfn, + l2e_write(&l2_ro_mpt[l2_table_offset(va)], l2e_from_mfn(mfn, /*_PAGE_GLOBAL|*/_PAGE_PSE|_PAGE_USER|_PAGE_PRESENT)); } - if ( !((unsigned long)l2_ro_mpt & ~PAGE_MASK) ) - l2_ro_mpt =3D NULL; i +=3D ( 1UL << (L2_PAGETABLE_SHIFT - 3)); } #undef CNT @@ -488,6 +492,8 @@ static int setup_m2p_table(struct mem_hotadd_info *info) =20 ret =3D setup_compat_m2p_table(info); error: + unmap_domain_page(l2_ro_mpt); + unmap_domain_page(l3_ro_mpt); return ret; } =20 --=20 2.23.4