From nobody Thu May 2 01:37:23 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=1586975915; cv=none; d=zohomail.com; s=zohoarc; b=hbZ22/CqmEFvq1M574ZOmLI3nj2GlDN+L4HkVkCCagMxqaqB+pF2Dx3btezc5NnymZl/1ER4x6K5OqJzfbbjnzxl0scXiDr6aW4a5KYqPI1ZaYwtvi8YmPsbV+37t8z2rLsER58Ylo4iHnsOKe/BlIW0ZDH08EtMX59Xpn/FcFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586975915; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=OGUpue1cqSI1HPssYadS8eAIPmRW9EWPZGCXCE9dcVM=; b=Iv1VuBuoivQ51dMxDhOESbF1xff3l/lI7wFnvshYGdKEd0HIrZjIuBiTyQid0dxyQ63cZQ/bh0BMfmznjSgP4EujssEOPWOOfKeqWGxZQZnvI9eKl7Rno+cP8nqMG4jV0Yd2X5FPFYgJVvARhhvTDCWaOSsNaZZYxUCY0g4LMI8= 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 1586975915040815.5369980474234; Wed, 15 Apr 2020 11:38:35 -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 1jOmvG-0000FI-CS; Wed, 15 Apr 2020 18:38:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvF-0000FB-GL for xen-devel@lists.xenproject.org; Wed, 15 Apr 2020 18:38:05 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3e0d54f2-7f48-11ea-b58d-bc764e2007e4; Wed, 15 Apr 2020 18:38:04 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvE-00020Z-22; Wed, 15 Apr 2020 18:38:04 +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 1jOmvD-0005Md-O3; Wed, 15 Apr 2020 18:38:03 +0000 X-Inumbo-ID: 3e0d54f2-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=OGUpue1cqSI1HPssYadS8eAIPmRW9EWPZGCXCE9dcVM=; b=jSgcbfR6F4U6UthIr2iYcEdQU0 xT73P2rrPBS96AckwpUD4P63Y69k/Xn7NanJtNaINdz2Yd2bkSfjiUGfznFHOkFRN+lk/QkEwFgrC GA261dK3vkPNcQaiecneXyq+y9eqGVlrkNsY6mnqKffjPYAniOVp+FoVZra2DNtqMlQE=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Subject: [PATCH v4 1/4] x86/shim: map and unmap page tables in replace_va_mapping Date: Wed, 15 Apr 2020 19:37:49 +0100 Message-Id: <2401b53f39ae0aeb7fac6c207f5f89ff8687338b.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 Also, introduce lYe_from_lXe() macros which do not rely on the direct map when walking page tables. Unfortunately, they cannot be inline functions due to the header dependency on domain_page.h, so keep them as macros just like map_lYt_from_lXe(). Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- Changed in v4: - use _ suffixes instead of prefixes. Changed in v3: - use unmap_domain_page() instead of the macro in several places. - also introduce l1e_from_l2e(). - add _ prefix in macros to avoid aliasing. Changed in v2: - instead of map, map, map, read/write, unmap, unmap, unmap, do map, read PTE, unmap for each level instead. - use lYe_from_lXe() macros and lift them from a later patch to this patch. - const qualify pointers in new macros. --- xen/arch/x86/pv/shim.c | 9 +++++---- xen/include/asm-x86/page.h | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index ed2ece8a8a..31264582cc 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -168,16 +168,17 @@ const struct platform_bad_page *__init pv_shim_reserv= ed_pages(unsigned int *size static void __init replace_va_mapping(struct domain *d, l4_pgentry_t *l4st= art, 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); + l4_pgentry_t l4e =3D l4start[l4_table_offset(va)]; + l3_pgentry_t l3e =3D l3e_from_l4e(l4e, l3_table_offset(va)); + l2_pgentry_t l2e =3D l2e_from_l3e(l3e, l2_table_offset(va)); + l1_pgentry_t *pl1e =3D map_l1t_from_l2e(l2e) + 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); } =20 static void evtchn_reserve(struct domain *d, unsigned int port) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index eb73a0fc23..5acf3d3d5a 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -197,6 +197,25 @@ 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 +/* Unlike lYe_to_lXe(), lXe_from_lYe() do not rely on the direct map. */ +#define l1e_from_l2e(l2e_, offset_) ({ \ + const l1_pgentry_t *l1t_ =3D map_l1t_from_l2e(l2e_); \ + l1_pgentry_t l1e_ =3D l1t_[offset_]; \ + unmap_domain_page(l1t_); \ + l1e_; }) + +#define l2e_from_l3e(l3e_, offset_) ({ \ + const l2_pgentry_t *l2t_ =3D map_l2t_from_l3e(l3e_); \ + l2_pgentry_t l2e_ =3D l2t_[offset_]; \ + unmap_domain_page(l2t_); \ + l2e_; }) + +#define l3e_from_l4e(l4e_, offset_) ({ \ + const l3_pgentry_t *l3t_ =3D map_l3t_from_l4e(l4e_); \ + l3_pgentry_t l3e_ =3D l3t_[offset_]; \ + 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 From nobody Thu May 2 01:37:23 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=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 From nobody Thu May 2 01:37:23 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=1586975913; cv=none; d=zohomail.com; s=zohoarc; b=Wg2QrHsDPUPjHI3ffDaipQsH17/zGZAJ/gEF1+27ptVFcaXmnE2/HSb8+CHmH49z/ZuklqGjqPmnE13bReuLbhNOVPlSFBzAix09dlPA55xMcQVeuTcH2qlsgs4W+6icg4/JSeztSlGTv9cX3SlwA+q4nSbc0h1noS5vm4wePFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586975913; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=NjsU0mvN8f3Kkt58hhovqMgTFjoAL4EcJkT/EkRsASw=; b=jFOZicogurGqulOxJkHyyL3D2nrjJFFJVoOrZhYGNWsv7/0NPAwrtvr3mFcR/x+DQ356tlFrwszVK7VQMI8tQAmhr1ADJNnz00PTQPrvtZi8ApqGrDjwneajL6R5tKvGjIe88AWeA1DpfMFkxeaF6nW6+0NfR+MgKaNk1Iii8Bg= 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 1586975912943233.33462109393486; Wed, 15 Apr 2020 11:38:32 -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 1jOmvM-0000Fw-1T; Wed, 15 Apr 2020 18:38:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvK-0000Ff-Cm for xen-devel@lists.xenproject.org; Wed, 15 Apr 2020 18:38:10 +0000 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3fbf2870-7f48-11ea-b58d-bc764e2007e4; Wed, 15 Apr 2020 18:38:07 +0000 (UTC) Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOmvG-00020l-TD; Wed, 15 Apr 2020 18:38:06 +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 1jOmvG-0005Md-JN; Wed, 15 Apr 2020 18:38:06 +0000 X-Inumbo-ID: 3fbf2870-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=NjsU0mvN8f3Kkt58hhovqMgTFjoAL4EcJkT/EkRsASw=; b=c7BI++wLiuzUBdO51vXkFZaF1N GtK7GzkoHTVf1NNy4tip3XFLBWm8xW1eedEDpZzh0oZxjQKQTB6PF2iZ0GVysGvceERfJGj3zxaMc PF5JO63vX/WxoZ972Vo/epj51DNq00Jrh6HF/CiluJlFqboVYeWQ/83f25K8K2mY2YnY=; From: Hongyan Xia To: xen-devel@lists.xenproject.org Subject: [PATCH v4 3/4] x86_64/mm: map and unmap page tables in share_hotadd_m2p_table Date: Wed, 15 Apr 2020 19:37:51 +0100 Message-Id: <3e716bbf183f8ecd162c04e1c3f4c44fd292d082.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 Fetch lYe by mapping and unmapping lXe instead of using the direct map, which is now done via the lYe_from_lXe() helpers. Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- Changed in v2: - the introduction of the macros is now lifted to a previous patch. --- xen/arch/x86/x86_64/mm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 41755ded26..cfaeae84e9 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -166,14 +166,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); @@ -194,11 +194,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); --=20 2.24.1.AMZN From nobody Thu May 2 01:37:23 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=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