From nobody Mon Feb 9 05:29:56 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=1584956558; cv=none; d=zohomail.com; s=zohoarc; b=RfdOTpvvrg6GLRMas0hu/njwrK+LG7X96N4BaOyn7CN5AqlbV5d7wx8zy37XVfPQQyBm9BtibEWaKHlbgZs8qBLSJTmg75roNiaL3XCjNxWQlSIFo+3mK0n1TNIZOesKPGFjEqwzBsdj41Tb7p0AxNLnZDCfCkYDoyAEmfiAeKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584956558; h=Content-Type: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=GE27lkOxplGmpRt6CKrN7p9t69i/Y3Ww+meKpW49ovI=; b=bWbnFvxwP9MqXOdPGU+Tfj12xhNOWmM1YlMqRxVKvRh+8BT1p0a59I6BIzRwX7js3L7oZqcahdYV+V4s8B0ifZhPbOlg56Mw3r2rPwp+NIDdevkEbtNqwpI32rQLY0UFEHAKGQGKY9Xq/sqNyu/SEwlPvtw3nT7XyxYIFuAZDw0= 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 1584956558912319.38843295545246; Mon, 23 Mar 2020 02:42:38 -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 1jGJas-0004Ju-Ul; Mon, 23 Mar 2020 09:42:02 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJar-0004Ir-Vc for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 09:42:02 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8a9208c4-6cea-11ea-a6c1-bc764e2007e4; Mon, 23 Mar 2020 09:41:59 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJao-00006f-VU; Mon, 23 Mar 2020 09:41:58 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] 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 1jGJao-00041e-Lv; Mon, 23 Mar 2020 09:41:58 +0000 X-Inumbo-ID: 8a9208c4-6cea-11ea-a6c1-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=WtqvUHDDBJQ+6nudvL16KfvlHXSoyjOwNd2TthZe2rc=; b=kzjTVEwYIUmcDoZjmeDWdWdjW5 JhcwI/aivOvej2GZCqzC54p65c4R+GjpjgLfanuGMyt5JfNaa5F6b9E241QFRDVojHJ819D2s8Ld5 lHC82x40J3knM1ndwLpGeTW5eYUC93TcckhXVhB2gyHlYlJucyyI+4jPtNo6XZYSfDFk=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Date: Mon, 23 Mar 2020 09:41:40 +0000 Message-Id: <2fa83ef5818805c179757caac99ccf7ab4f7ba3a.1584955616.git.hongyxia@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Subject: [Xen-devel] [PATCH 3/5] x86_64/mm: map and unmap page tables in share_hotadd_m2p_table 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 , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Wei Liu Fetch lYe by mapping and unmapping lXe instead of using the direct map, which is now done via the new lYe_from_lXe() helpers. Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia --- xen/arch/x86/x86_64/mm.c | 12 ++++++------ xen/include/asm-x86/page.h | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index a440dac25e..2680173fab 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -173,14 +173,14 @@ static int share_hotadd_m2p_table(struct mem_hotadd_i= nfo *info) v +=3D n << PAGE_SHIFT ) { n =3D L2_PAGETABLE_ENTRIES * L1_PAGETABLE_ENTRIES; - l3e =3D l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[ - l3_table_offset(v)]; + l3e =3D l3e_from_l4e(idle_pg_table[l4_table_offset(v)], + l3_table_offset(v)); if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) ) continue; if ( !(l3e_get_flags(l3e) & _PAGE_PSE) ) { n =3D L1_PAGETABLE_ENTRIES; - l2e =3D l3e_to_l2e(l3e)[l2_table_offset(v)]; + l2e =3D l2e_from_l3e(l3e, l2_table_offset(v)); if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) ) continue; m2p_start_mfn =3D l2e_get_mfn(l2e); @@ -201,11 +201,11 @@ static int share_hotadd_m2p_table(struct mem_hotadd_i= nfo *info) v !=3D RDWR_COMPAT_MPT_VIRT_END; v +=3D 1 << L2_PAGETABLE_SHIFT ) { - l3e =3D l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[ - l3_table_offset(v)]; + l3e =3D l3e_from_l4e(idle_pg_table[l4_table_offset(v)], + l3_table_offset(v)); if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) ) continue; - l2e =3D l3e_to_l2e(l3e)[l2_table_offset(v)]; + l2e =3D l2e_from_l3e(l3e, l2_table_offset(v)); if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) ) continue; m2p_start_mfn =3D l2e_get_mfn(l2e); diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index c98d8f5ede..d4752a5925 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -196,6 +196,24 @@ static inline l4_pgentry_t l4e_from_paddr(paddr_t pa, = unsigned int flags) #define map_l2t_from_l3e(x) (l2_pgentry_t *)map_domain_page(l3e_get= _mfn(x)) #define map_l3t_from_l4e(x) (l3_pgentry_t *)map_domain_page(l4e_get= _mfn(x)) =20 +#define l1e_from_l2e(l2e, off) ({ \ + l1_pgentry_t *l1t =3D map_l1t_from_l2e(l2e); \ + l1_pgentry_t l1e =3D l1t[off]; \ + UNMAP_DOMAIN_PAGE(l1t); \ + l1e; }) + +#define l2e_from_l3e(l3e, off) ({ \ + l2_pgentry_t *l2t =3D map_l2t_from_l3e(l3e); \ + l2_pgentry_t l2e =3D l2t[off]; \ + UNMAP_DOMAIN_PAGE(l2t); \ + l2e; }) + +#define l3e_from_l4e(l4e, off) ({ \ + l3_pgentry_t *l3t =3D map_l3t_from_l4e(l4e); \ + l3_pgentry_t l3e =3D l3t[off]; \ + UNMAP_DOMAIN_PAGE(l3t); \ + l3e; }) + /* Given a virtual address, get an entry offset into a page table. */ #define l1_table_offset(a) \ (((a) >> L1_PAGETABLE_SHIFT) & (L1_PAGETABLE_ENTRIES - 1)) --=20 2.24.1.AMZN _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel