From nobody Mon Feb 9 13:24:02 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=fail; 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=1586975919; cv=none; d=zohomail.com; s=zohoarc; b=FEaCRmx21PkESZG0JYazKp71K0g6tepqpYt92OZa52V+LYO+dZGM7HAKCYtSJ7gG/owmRLznmKBqNbfGfnvCz7fJCXdjbEK57JVA98BKju8zsDd21xbiYgXOFW7lAoPbh9WzU7xyXwQZDcNv1IVjnrMwGRzL/3KhlSQXGS1vYbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586975919; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wtSQHHmgrwnbMvPmliwMYHdNPJs99gEJt0RbRPvDJgc=; b=EgYSR/aF03fovJ0qJbBXpdKPIqrP7sZq7kjxAcPhc/jZa9w6ivvkS1pXSlfnPrse4ALHzwcTpgA9j7WAEU7SSrV7o6CrH2sGnxp+R+HYCPLbYIrcy4otQc+Bd1ctRaQiKJn/x5WrMpSOZZEF+fq39cxzmv0icRYOctG+UKnv6NE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 158697591921740.3269626437949; Wed, 15 Apr 2020 11:38:39 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvQ-0000GT-E0; Wed, 15 Apr 2020 18:38:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvP-0000GC-DS for xen-devel@lists.xenproject.org; Wed, 15 Apr 2020 18:38:15 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4099e352-7f48-11ea-b58d-bc764e2007e4; Wed, 15 Apr 2020 18:38:08 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvI-00020s-A7; Wed, 15 Apr 2020 18:38:08 +0000 Received: from 54-240-197-234.amazon.com ([54.240.197.234] helo=u1bbd043a57dd5a.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jOmvI-0005Md-0h; Wed, 15 Apr 2020 18:38:08 +0000 X-Inumbo-ID: 4099e352-7f48-11ea-b58d-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wtSQHHmgrwnbMvPmliwMYHdNPJs99gEJt0RbRPvDJgc=; b=vduiSzcAUdceT/n7jp+T1bniId ZPNFexGiSZu0nll3HunbP2GHiz8v8ANbQ9h0d924b/+mEYpum/bbbZT/xKLduFcUHmv/V2Sp7BSrh Z0Bdsadnz0SrGhTLQxqM6K4yj4srTWyHXKtIDA54aYjg0L0IJbzhz3BvzKldlp713yWY=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Subject: [PATCH v4 4/4] x86_64/mm: map and unmap page tables in destroy_m2p_mapping Date: Wed, 15 Apr 2020 19:37:52 +0100 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , julien@xen.org, Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Wei Liu Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- Changed in v4: - switch to normal unmap_domain_page() for variable right before end-of-scope. Changed in v3: - rename l2_ro_mpt into pl2e to avoid confusion. Changed in v2: - no point in re-mapping l2t because it is exactly the same as l2_ro_mpt. - point l2_ro_mpt to the entry instead of doing l2_table_offset() all the time. --- xen/arch/x86/x86_64/mm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index cfaeae84e9..e85ef449f3 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -263,7 +263,8 @@ static void destroy_m2p_mapping(struct mem_hotadd_info = *info) unsigned long i, va, rwva; unsigned long smap =3D info->spfn, emap =3D info->epfn; =20 - 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 /* * No need to clean m2p structure existing before the hotplug @@ -271,7 +272,7 @@ static void destroy_m2p_mapping(struct mem_hotadd_info = *info) for (i =3D smap; i < emap;) { unsigned long pt_pfn; - l2_pgentry_t *l2_ro_mpt; + l2_pgentry_t *pl2e; =20 va =3D RO_MPT_VIRT_START + i * sizeof(*machine_to_phys_mapping); rwva =3D RDWR_MPT_VIRT_START + i * sizeof(*machine_to_phys_mapping= ); @@ -285,26 +286,30 @@ static void destroy_m2p_mapping(struct mem_hotadd_inf= o *info) continue; } =20 - l2_ro_mpt =3D l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); - if (!(l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESEN= T)) + pl2e =3D map_l2t_from_l3e(l3_ro_mpt[l3_table_offset(va)]) + + l2_table_offset(va); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) { i =3D ( i & ~((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1)) + (1UL << (L2_PAGETABLE_SHIFT - 3)) ; + UNMAP_DOMAIN_PAGE(pl2e); continue; } =20 - pt_pfn =3D l2e_get_pfn(l2_ro_mpt[l2_table_offset(va)]); + pt_pfn =3D l2e_get_pfn(*pl2e); if ( hotadd_mem_valid(pt_pfn, info) ) { destroy_xen_mappings(rwva, rwva + (1UL << L2_PAGETABLE_SHIFT)); =20 - l2_ro_mpt =3D l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); - l2e_write(&l2_ro_mpt[l2_table_offset(va)], l2e_empty()); + l2e_write(pl2e, l2e_empty()); } i =3D ( i & ~((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1)) + (1UL << (L2_PAGETABLE_SHIFT - 3)); + unmap_domain_page(pl2e); } =20 + UNMAP_DOMAIN_PAGE(l3_ro_mpt); + destroy_compat_m2p_mapping(info); =20 /* Brute-Force flush all TLB */ --=20 2.24.1.AMZN