xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Hongyan Xia <hx242@xen.org>
To: xen-devel@lists.xenproject.org
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
	julien@xen.org, "Wei Liu" <wl@xen.org>,
	"Jan Beulich" <jbeulich@suse.com>,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH 2/6] x86_64/mm: map and unmap page tables in subarch_init_memory
Date: Fri, 17 Apr 2020 10:52:04 +0100	[thread overview]
Message-ID: <0e14533f516ee5ce410e2cd8050f085aec4b4961.1587116799.git.hongyxia@amazon.com> (raw)
In-Reply-To: <cover.1587116799.git.hongyxia@amazon.com>
In-Reply-To: <cover.1587116799.git.hongyxia@amazon.com>

From: Wei Liu <wei.liu2@citrix.com>

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
---
 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 18210405f4..5714e5ba62 100644
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -852,14 +852,14 @@ void __init subarch_init_memory(void)
           v += n << PAGE_SHIFT )
     {
         n = L2_PAGETABLE_ENTRIES * L1_PAGETABLE_ENTRIES;
-        l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[
-            l3_table_offset(v)];
+        l3e = 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 = L1_PAGETABLE_ENTRIES;
-            l2e = l3e_to_l2e(l3e)[l2_table_offset(v)];
+            l2e = l2e_from_l3e(l3e, l2_table_offset(v));
             if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) )
                 continue;
             m2p_start_mfn = l2e_get_pfn(l2e);
@@ -878,11 +878,11 @@ void __init subarch_init_memory(void)
           v != RDWR_COMPAT_MPT_VIRT_END;
           v += 1 << L2_PAGETABLE_SHIFT )
     {
-        l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[
-            l3_table_offset(v)];
+        l3e = l3e_from_l4e(idle_pg_table[l4_table_offset(v)],
+                           l3_table_offset(v));
         if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) )
             continue;
-        l2e = l3e_to_l2e(l3e)[l2_table_offset(v)];
+        l2e = l2e_from_l3e(l3e, l2_table_offset(v));
         if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) )
             continue;
         m2p_start_mfn = l2e_get_pfn(l2e);
-- 
2.24.1.AMZN



  parent reply	other threads:[~2020-04-17  9:52 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-17  9:52 [PATCH 0/6] convert more Xen page table code to the new API Hongyan Xia
2020-04-17  9:52 ` [PATCH 1/6] x86_64/mm: map and unmap page tables in cleanup_frame_table Hongyan Xia
2020-04-24  8:58   ` Julien Grall
2020-04-24  8:59     ` Julien Grall
2020-04-24  8:59   ` Julien Grall
2020-04-24  9:21     ` Hongyan Xia
2020-04-24  9:24       ` Julien Grall
2020-04-24  9:02   ` Julien Grall
2020-04-24 11:12     ` Jan Beulich
2020-04-28 15:11     ` Jan Beulich
2020-04-17  9:52 ` Hongyan Xia [this message]
2020-04-24  9:04   ` [PATCH 2/6] x86_64/mm: map and unmap page tables in subarch_init_memory Julien Grall
2020-04-28 15:12     ` Jan Beulich
2020-04-17  9:52 ` [PATCH 3/6] x86_64/mm: map and unmap page tables in subarch_memory_op Hongyan Xia
2020-04-24  9:06   ` Julien Grall
2020-04-28 15:23     ` Jan Beulich
2020-04-17  9:52 ` [PATCH 4/6] x86/smpboot: map and unmap page tables in cleanup_cpu_root_pgt Hongyan Xia
2020-04-24  9:13   ` Julien Grall
2020-04-28 15:26     ` Jan Beulich
2020-04-17  9:52 ` [PATCH 5/6] x86/pv: map and unmap page tables in mark_pv_pt_pages_rdonly Hongyan Xia
2020-04-24  9:16   ` Julien Grall
2020-04-28 15:33   ` Jan Beulich
2020-04-28 15:49     ` Wei Liu
2020-04-28 15:55     ` Hongyan Xia
2020-04-28 15:59       ` Hongyan Xia
2020-04-29  9:26         ` Hongyan Xia
2020-04-29 11:04           ` Jan Beulich
2020-04-29 12:29             ` Hongyan Xia
2020-04-29 13:31               ` Jan Beulich
2020-04-17  9:52 ` [PATCH 6/6] x86/pv: map and unmap page table in dom0_construct_pv Hongyan Xia
2020-04-24  9:18   ` Julien Grall
2020-04-28 15:34     ` Jan Beulich
2020-04-24  8:07 ` [PATCH 0/6] convert more Xen page table code to the new API Hongyan Xia

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0e14533f516ee5ce410e2cd8050f085aec4b4961.1587116799.git.hongyxia@amazon.com \
    --to=hx242@xen.org \
    --cc=andrew.cooper3@citrix.com \
    --cc=jbeulich@suse.com \
    --cc=julien@xen.org \
    --cc=roger.pau@citrix.com \
    --cc=wl@xen.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).