From nobody Sat Apr 20 03:11:16 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=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=lXVN/Zv4ObMHygFVrFzP3uLLCTvl4wHSwL9/ZOmhRG2T/ehVFsZkAioQFPN95vK5+kB/ny5Zlz+eOfvJgervVUksTNaaFV874q8OKruHhb7pl4LgoRLMK6j9Ac/knK9sW2ORckreOeqrY5kMe103NiReQYpYD5KT+GRrHDIBCCM= 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=6pzZNk/KEqfZKyBnfZue/dWfBJvT84qzfYxa1k3gP3M=; b=cMZoiV61kgZIqASAsDSyaB+aXIcvA3p4TSHwi9k0U/qwKpUQOOyo5EiZceIO0Kj2J5s0umA1aenfHr8okM0VvGHfjsW+xKXvq/TXdmSvyXmFvWz9qG7rcAny2tEv3CTp4JJSz1NlfaaztH9SueB1jlhVMHBArj+0jP/EKGdiaoY= 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 1584956558908137.86367461650616; 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 1jGJao-0004Hv-6c; Mon, 23 Mar 2020 09:41:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJam-0004HV-UF for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 09:41:56 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 88fb948a-6cea-11ea-b34e-bc764e2007e4; Mon, 23 Mar 2020 09:41:56 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJam-00006T-6i; Mon, 23 Mar 2020 09:41:56 +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 1jGJal-00041e-Sr; Mon, 23 Mar 2020 09:41:56 +0000 X-Inumbo-ID: 88fb948a-6cea-11ea-b34e-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=LO9Ux1uCue1Zi020/RhpT9BHvEBosZNq+XbjQWDoGr8=; b=P1mNf3sWCRHjMgsAfwmnm3kvoY au+rvCHyf4QUKNm8AnHZRZwk4El7h8/xcr1x/Ti3OLbpiNx8cCSwDmcapFDRj9wEFstzJ+iEme3hG NLp74R0bvYUC2pAKvKlAYKyrccw7DNRSM9rV+vbKDHIQqr6WLyRafRbcQK/Ja9kM2UU0=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Date: Mon, 23 Mar 2020 09:41:38 +0000 Message-Id: <1acfafbd8ebada1538c9e06323ef0b3bf3f6897c.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 1/5] x86/shim: map and unmap page tables in replace_va_mapping 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 Signed-off-by: Wei Liu Reviewed-by: Hongyan Xia --- xen/arch/x86/pv/shim.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index ed2ece8a8a..1229d5ffb3 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -169,15 +169,19 @@ static void __init replace_va_mapping(struct domain *= d, l4_pgentry_t *l4start, unsigned long va, mfn_t mfn) { l4_pgentry_t *pl4e =3D l4start + l4_table_offset(va); - l3_pgentry_t *pl3e =3D l4e_to_l3e(*pl4e) + l3_table_offset(va); - l2_pgentry_t *pl2e =3D l3e_to_l2e(*pl3e) + l2_table_offset(va); - l1_pgentry_t *pl1e =3D l2e_to_l1e(*pl2e) + l1_table_offset(va); + l3_pgentry_t *pl3e =3D map_l3t_from_l4e(*pl4e) + l3_table_offset(va); + l2_pgentry_t *pl2e =3D map_l2t_from_l3e(*pl3e) + l2_table_offset(va); + l1_pgentry_t *pl1e =3D map_l1t_from_l2e(*pl2e) + l1_table_offset(va); struct page_info *page =3D mfn_to_page(l1e_get_mfn(*pl1e)); =20 put_page_and_type(page); =20 *pl1e =3D l1e_from_mfn(mfn, (!is_pv_32bit_domain(d) ? L1_PROT : COMPAT_L1_PROT)); + + UNMAP_DOMAIN_PAGE(pl1e); + UNMAP_DOMAIN_PAGE(pl2e); + UNMAP_DOMAIN_PAGE(pl3e); } =20 static void evtchn_reserve(struct domain *d, unsigned int port) --=20 2.24.1.AMZN _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat Apr 20 03:11:16 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=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=1584956557; cv=none; d=zohomail.com; s=zohoarc; b=gByFfNuVtbMVTa6YU0z3tUnf8fdqnPdAwh6drxg8dZXA0zpdBWyxegA0t8PW8xC4yh24oXBeaqgSrJBP07Rot4mvLtONPity8wh1ZxDg5EblceBxX/ESj0H/+UWM43OGHl1w+17EHEOAAGNOYYMx/F2laBWSL6t83wsXw11WSLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584956557; 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=gqvc6wofIdg813K1ESxvy3R3cm2y3Q43H55R2Y9EZ8s=; b=WaZM+yEsVKu6HGal0HXyfIhpeJyStPOmilcQh3rLwzD+uZw/kHD0IwFE2jgePnT0GOdi5dFZoIe+2ymqh+y4PT1Kezq98egdrC/nwKiteVaR1EOun05EJbaV5thMkiCq3d2aeU5b6E/K63mRNV+lP20T7B6wUmcwJ0QODFVTkuI= 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 1584956557817979.354274058867; Mon, 23 Mar 2020 02:42:37 -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-0004JM-Fr; Mon, 23 Mar 2020 09:42:02 +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 1jGJaq-0004IZ-VH for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 09:42:00 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 89d5fe5e-6cea-11ea-8292-12813bfff9fa; Mon, 23 Mar 2020 09:41:58 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJan-00006Z-JH; Mon, 23 Mar 2020 09:41:57 +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 1jGJan-00041e-9M; Mon, 23 Mar 2020 09:41:57 +0000 X-Inumbo-ID: 89d5fe5e-6cea-11ea-8292-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=Op5RGEgTJYxinE1ReyG8HNPBZtOGMQ5zAHn/J1yOVxw=; b=Hcr9YcN2vHhvzpFR1m6ije9uQN 8M6D2Q36j7iUm6F3tnFM34Uzoz3bR1aVPmz8kGg9giBjLU1RFcKYtWTWxdrBOnQoNcBYdn6suxDQ8 qy5sODnVBS4n01z0ZegvG08CADEO+RBllFeKjKhZUBFXqnh1fANZdpDgsxeFjHvDsY+0=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Date: Mon, 23 Mar 2020 09:41:39 +0000 Message-Id: <9b46a0bae03107fcb192e6590234b9e882965f11.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 2/5] x86_64/mm: map and unmap page tables in m2p_mapped 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 Signed-off-by: Wei Liu Reviewed-by: Hongyan Xia --- xen/arch/x86/x86_64/mm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index b7ce833ffc..a440dac25e 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -131,27 +131,33 @@ static int m2p_mapped(unsigned long spfn) unsigned long va; l3_pgentry_t *l3_ro_mpt; l2_pgentry_t *l2_ro_mpt; + int rc =3D M2P_NO_MAPPED; =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)]); + l3_ro_mpt =3D map_l3t_from_l4e(idle_pg_table[l4_table_offset(va)]); =20 switch ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & (_PAGE_PRESENT |_PAGE_PSE)) { case _PAGE_PSE|_PAGE_PRESENT: - return M2P_1G_MAPPED; + rc =3D M2P_1G_MAPPED; + goto out; /* Check for next level */ case _PAGE_PRESENT: break; default: - return M2P_NO_MAPPED; + rc =3D M2P_NO_MAPPED; + goto out; } - l2_ro_mpt =3D l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2_ro_mpt =3D map_l2t_from_l3e(l3_ro_mpt[l3_table_offset(va)]); =20 if (l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT) - return M2P_2M_MAPPED; + rc =3D M2P_2M_MAPPED; + UNMAP_DOMAIN_PAGE(l2_ro_mpt); =20 - return M2P_NO_MAPPED; + out: + UNMAP_DOMAIN_PAGE(l3_ro_mpt); + return rc; } =20 static int share_hotadd_m2p_table(struct mem_hotadd_info *info) --=20 2.24.1.AMZN _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat Apr 20 03:11:16 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=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 From nobody Sat Apr 20 03:11:16 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=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=1584956561; cv=none; d=zohomail.com; s=zohoarc; b=DLUEX5Mwrtw3VPP/iSeb/kaBy66NBtlloyrubqLTXiic2NN+sgz2eBYReU3ZYHSB9tRinAjEG+UtCjd1upekTaddo5LT/wCacgeICr59JRTznxl6KvQwd7fvSGpnV7nIBgIry+qMPcgrQECIK6Xf2PVKaeFW7jClnNXwE4ukTmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584956561; 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=LX/D/LtXPN0yCoO3e++1I+ywaukK36KeszqUgAXaUJw=; b=JUoRW+A4AND2grYLygPj/xZknphZCu3lz8v0IZZmtwNdlPwXrPkG2HnVOU46YFpXM7Y3wvvgcsTRbJh59+ExeIwkZQCEYurwsM1gWbw/Lb3e9MEg9a5pVNi57hg+JBFtRv9BsSiHzE7X/hXeGThEAXWy1zK084OvSSliWGh0IGw= 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 1584956561529866.0227596892436; Mon, 23 Mar 2020 02:42:41 -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 1jGJay-0004MV-88; Mon, 23 Mar 2020 09:42:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJaw-0004Lz-V8 for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 09:42:06 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8b825d42-6cea-11ea-92cf-bc764e2007e4; Mon, 23 Mar 2020 09:42:00 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJaq-00006l-CR; Mon, 23 Mar 2020 09:42:00 +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 1jGJaq-00041e-2G; Mon, 23 Mar 2020 09:42:00 +0000 X-Inumbo-ID: 8b825d42-6cea-11ea-92cf-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=35Ho2Vf8lc3EW5Mfp7Rg/7Pi6yyhMW4WAgUBIdCtNyM=; b=Kg4EvGxMQsxpbEtnYZAa9B+Tb8 8t7TIv2/K840BLxDDTI/7tPzXtOAzCCssiWDO6a7EcY0rV7+vx+aUAAfR2dGCka799xhXveBPA21c XnMFKyQ/ERqnQFN1Kp90BTL/Drr5SQrlBSj/YzubMVKnXHzSOx7lpt7aFWt/rVDEfcWI=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Date: Mon, 23 Mar 2020 09:41:41 +0000 Message-Id: <67b6f30fb36b44f26aba8a5039d5b551addf206d.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 4/5] x86_64/mm: map and unmap page tables in destroy_compat_m2p_mapping 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 Signed-off-by: Wei Liu Reviewed-by: Hongyan Xia --- xen/arch/x86/x86_64/mm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 2680173fab..71c84ac593 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -235,11 +235,13 @@ static void destroy_compat_m2p_mapping(struct mem_hot= add_info *info) if ( emap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >= > 2) ) emap =3D (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >= > 2; =20 - l3_ro_mpt =3D l4e_to_l3e(idle_pg_table[l4_table_offset(HIRO_COMPAT_MPT= _VIRT_START)]); + l3_ro_mpt =3D map_l3t_from_l4e(idle_pg_table[ + l4_table_offset(HIRO_COMPAT_MPT_VIRT_START)]); =20 ASSERT(l3e_get_flags(l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIRT_ST= ART)]) & _PAGE_PRESENT); =20 - l2_ro_mpt =3D l3e_to_l2e(l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIR= T_START)]); + l2_ro_mpt =3D map_l2t_from_l3e( + l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIRT_START)]= ); =20 for ( i =3D smap; i < emap; ) { @@ -261,6 +263,9 @@ static void destroy_compat_m2p_mapping(struct mem_hotad= d_info *info) i +=3D 1UL << (L2_PAGETABLE_SHIFT - 2); } =20 + UNMAP_DOMAIN_PAGE(l2_ro_mpt); + UNMAP_DOMAIN_PAGE(l3_ro_mpt); + return; } =20 --=20 2.24.1.AMZN _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat Apr 20 03:11:16 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=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=1584956566; cv=none; d=zohomail.com; s=zohoarc; b=Slhw/MQd3FvsMTopHd2CV4eK0/wnY3/5yZWw52sFd3ZcORjFfBQV+h2BTLDGV1t9GjyBT/nOvWR9A5peZ2Ezm76HyzsSqGQOcCsIhtKtId0Tbh/QOS5CjYsas+J6aGhsK2VsCpDwoH0DHB1c6T05S4hQDErEKk7BCtQYM3hVdP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584956566; 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=MyibTQtO03tUB25uJyMumPr1y9dKxkR31hS62YRhPLM=; b=Y6ao6sEOzwbu5p/NCbeDv7w3tGVK2hNxpj1KlzI0WY8kZxPgPJeZkBAUfwpGn6AnikgQYUE1u18Khe1I/INf4B7Y3JiVAO2SP+fQzCUYc9PjIhXd3FL9mB2RmdP8Gfw4cz5DSG+r3E+ZSH3GLVtXEeBR+3T4kOyx6oWuTh6uJUY= 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 1584956566565391.29676969177183; Mon, 23 Mar 2020 02:42:46 -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 1jGJb3-0004PC-Hd; Mon, 23 Mar 2020 09:42:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJb1-0004OY-VM for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 09:42:11 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8c5993c0-6cea-11ea-bec1-bc764e2007e4; Mon, 23 Mar 2020 09:42:02 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJar-000074-P4; Mon, 23 Mar 2020 09:42:01 +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 1jGJar-00041e-FH; Mon, 23 Mar 2020 09:42:01 +0000 X-Inumbo-ID: 8c5993c0-6cea-11ea-bec1-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=5a3Tm+ua02C0EofKaTjbktPdNp8eHnU8nJjXQ4v8gnw=; b=48yBhW0hI9Cb1PQyDijNdVNZPU iLrdjl3qV5fRdHOMiUMHbXRhE+MYKrPtg6IWkTMs7RR44jMKbZRTkucM9r5hbBW6TO2Hq3J+8O+hd KKDT5s/iNLuEgcwYg1rLFTNgpSwPLzrR9OHIbk4QQAvJSs8a6Dbj0MJkHDCTQ4Vfy68c=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Date: Mon, 23 Mar 2020 09:41:42 +0000 Message-Id: <7143c2a1e0c7ca46b3ace329d7dcab85e0b5c87c.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 5/5] x86_64/mm: map and unmap page tables in destroy_m2p_mapping 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 Signed-off-by: Wei Liu Reviewed-by: Hongyan Xia --- xen/arch/x86/x86_64/mm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 71c84ac593..6a0ffe088b 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -275,7 +275,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 @@ -297,26 +298,33 @@ 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)]); + l2_ro_mpt =3D map_l2t_from_l3e(l3_ro_mpt[l3_table_offset(va)]); if (!(l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESEN= T)) { i =3D ( i & ~((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1)) + (1UL << (L2_PAGETABLE_SHIFT - 3)) ; + UNMAP_DOMAIN_PAGE(l2_ro_mpt); continue; } =20 pt_pfn =3D l2e_get_pfn(l2_ro_mpt[l2_table_offset(va)]); if ( hotadd_mem_valid(pt_pfn, info) ) { + l2_pgentry_t *l2t; + 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()); + l2t =3D map_l2t_from_l3e(l3_ro_mpt[l3_table_offset(va)]); + l2e_write(&l2t[l2_table_offset(va)], l2e_empty()); + UNMAP_DOMAIN_PAGE(l2t); } i =3D ( i & ~((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1)) + (1UL << (L2_PAGETABLE_SHIFT - 3)); + UNMAP_DOMAIN_PAGE(l2_ro_mpt); } =20 + UNMAP_DOMAIN_PAGE(l3_ro_mpt); + destroy_compat_m2p_mapping(info); =20 /* Brute-Force flush all TLB */ --=20 2.24.1.AMZN _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel