From nobody Mon Feb 9 04:39:08 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=1586975916; cv=none; d=zohomail.com; s=zohoarc; b=R+pZwWjm38juzlzk++YMh6teb86LlDbgZZYTZnKpi7nCp/Sd91wl60Uiyh24rewDBiJ3nq3zP315LxLl2k9HBG2qdA4N/NFMF75XZMCBY3XWtb+S3wFyQ1qIXqtGsRMCEns+FBi6gMq/lg5hz6N709BagNplBQFGhwj8PZyGE44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586975916; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=CtlOkdsHjlKFcb39XzK+uw2HvlaIF3cGj21C2XsAUj8=; b=buyOuKEnBY3yC6sQ995MP/8Vdg1h4XK2/jWCRG6/QclutCILmH6fB9e2GsMl67aXngzi17HK3aylmblrDzRLcMDOBdsc4UX0wslaNgb0V3ALyLGzt/V+NJZT75bo61z3YkiJkzEW4pNpet+fE62xhwCQjRQ282JQc77ryYH/Lk0= 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 1586975916595395.677083101138; Wed, 15 Apr 2020 11:38:36 -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 1jOmvK-0000Fk-Mw; Wed, 15 Apr 2020 18:38:10 +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.89) (envelope-from ) id 1jOmvI-0000FT-W5 for xen-devel@lists.xenproject.org; Wed, 15 Apr 2020 18:38:09 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3f236a20-7f48-11ea-8abf-12813bfff9fa; Wed, 15 Apr 2020 18:38:06 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvF-00020g-Fa; Wed, 15 Apr 2020 18:38:05 +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 1jOmvF-0005Md-5r; Wed, 15 Apr 2020 18:38:05 +0000 X-Inumbo-ID: 3f236a20-7f48-11ea-8abf-12813bfff9fa 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=CtlOkdsHjlKFcb39XzK+uw2HvlaIF3cGj21C2XsAUj8=; b=glId3sBLWVFPgGXaUMZcet07lb hxuPNoosoivlji4cO+7gfQHaeE6JlHzl9j10fjJjSbYTH4eIyEjBfnLCzSj0zFDMnfOQndYvKHz4k d0fLo8CVxxoQq2jLWGiUC1AsVHXsQnjw7W7Ib5oI6HRpYdFmewesFF2T7XUrQWXwq+UA=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Subject: [PATCH v4 2/4] x86_64/mm: map and unmap page tables in m2p_mapped Date: Wed, 15 Apr 2020 19:37:50 +0100 Message-Id: <5e880ea0aea869fe31438b61540227c6f4f1bfcb.1586975587.git.hongyxia@amazon.com> 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 v3: - rename l3e_ro_mpt and l2e_ro_mpt, just call them l3e and l2e. Changed in v2: - avoid adding goto labels, simply get the PTE and unmap quickly. - code style fixes. --- xen/arch/x86/x86_64/mm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index cee836ec37..41755ded26 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -129,14 +129,13 @@ static mfn_t alloc_hotadd_mfn(struct mem_hotadd_info = *info) static int m2p_mapped(unsigned long spfn) { unsigned long va; - l3_pgentry_t *l3_ro_mpt; - l2_pgentry_t *l2_ro_mpt; + l3_pgentry_t l3e; + l2_pgentry_t l2e; =20 va =3D RO_MPT_VIRT_START + spfn * sizeof(*machine_to_phys_mapping); - l3_ro_mpt =3D l4e_to_l3e(idle_pg_table[l4_table_offset(va)]); + l3e =3D l3e_from_l4e(idle_pg_table[l4_table_offset(va)], l3_table_offs= et(va)); =20 - switch ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & - (_PAGE_PRESENT |_PAGE_PSE)) + switch ( l3e_get_flags(l3e) & (_PAGE_PRESENT | _PAGE_PSE) ) { case _PAGE_PSE|_PAGE_PRESENT: return M2P_1G_MAPPED; @@ -146,9 +145,9 @@ static int m2p_mapped(unsigned long spfn) default: return M2P_NO_MAPPED; } - l2_ro_mpt =3D l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2e =3D l2e_from_l3e(l3e, l2_table_offset(va)); =20 - if (l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT) + if ( l2e_get_flags(l2e) & _PAGE_PRESENT ) return M2P_2M_MAPPED; =20 return M2P_NO_MAPPED; --=20 2.24.1.AMZN